// Copyright (C) 2021 Harry Godden (hgn) - All Rights Reserved
-//#define VG_STEAM
+#define VG_STEAM
+#define VG_STEAM_APPID 1218140U
#include "vg/vg.h"
#include "fishladder_resources.h"
"level2",
"level3",
"level4",
- "level5"
+ "level5",
+ "level6",
+ "level7_combine",
+ "xor_small",
+ "sort",
+ "thirds"
};
#pragma pack(push,1)
u32 const size_levels = sizeof(struct career_state)-size_header;
u32 const size_levels_input = sz - size_header;
- memcpy( (void*)career.levels, (void*)cr->levels, size_levels );
+ memcpy( (void*)career.levels, (void*)cr->levels, size_levels_input );
if( sz < sizeof( struct career_state ) )
{
m3x3f m_view;
m3x3f m_mdl;
-#define FLAG_INPUT 0x1
-#define FLAG_OUTPUT 0x2
-#define FLAG_CANAL 0x4
-#define FLAG_WALL 0x8
+#define FLAG_CANAL 0x1
+#define FLAG_IS_TRIGGER 0x2
+#define FLAG_RESERVED0 0x4
+#define FLAG_RESERVED1 0x8
+
+#define FLAG_INPUT 0x10
+#define FLAG_OUTPUT 0x20
+#define FLAG_WALL 0x40
+
#define FLAG_FLIP_FLOP 0x100
-#define FLAG_FLIP_ROTATING 0x200
+#define FLAG_TRIGGERED 0x200
+#define FLAG_FLIP_ROTATING 0x400
+#define FLAG_TARGETED 0x800
/*
0000 0 | 0001 1 | 0010 2 | 0011 3
| | | | | | |
*/
+struct cell_description
+{
+ v2i start;
+ v2i end;
+
+ int is_special;
+ int is_linear;
+}
+cell_descriptions[] =
+{
+ // 0-3
+ {},
+ { .start = { 1, 0 }, .end = { -1, 0 } },
+ { .start = { 0, 1 }, .end = { 0, -1 } },
+ { .start = { 0, 1 }, .end = { 1, 0 } },
+ // 4-7
+ { .start = { -1, 0 }, .end = { 1, 0 } },
+ { .start = { -1, 0 }, .end = { 1, 0 }, .is_linear = 1 },
+ { .start = { 0, 1 }, .end = { -1, 0 } },
+ { .start = { 0, 1 }, .is_special = 1 },
+ // 8-11
+ { .start = { 0, -1 }, .end = { 0, 1 } },
+ { .start = { 1, 0 }, .end = { 0, -1 } },
+ { .start = { 0, 1 }, .end = { 0, -1 }, .is_linear = 1 },
+ { },
+ // 12-15
+ { .start = { -1, 0 }, .end = { 0, -1 } },
+ { .end = { 0, -1 }, .is_special = 1 },
+ { },
+ { }
+};
+
enum cell_type
{
+ k_cell_type_stub = 0,
k_cell_type_ramp_right = 3,
k_cell_type_ramp_left = 6,
k_cell_type_split = 7,
- k_cell_type_merge = 13
+ k_cell_type_merge = 13,
+ k_cell_type_con_r = 1,
+ k_cell_type_con_u = 2,
+ k_cell_type_con_l = 4,
+ k_cell_type_con_d = 8
};
+v2f const curve_3[] = {{0.5f,1.0f},{0.5f,0.625f},{0.625f,0.5f},{1.0f,0.5f}};
+v2f const curve_6[] = {{0.5f,1.0f},{0.5f,0.625f},{0.375f,0.5f},{0.0f,0.5f}};
+v2f const curve_9[] = {{1.0f,0.5f},{0.625f,0.5f},{0.5f,0.375f},{0.5f,0.0f}};
+v2f const curve_12[]= {{0.0f,0.5f},{0.375f,0.5f},{0.5f,0.375f},{0.5f,0.0f}};
+
+v2f const curve_1[] = {{1.0f,0.5f},{0.8f,0.5f},{0.3f,0.5f},{0.2f,0.5f}};
+v2f const curve_4[] = {{0.0f,0.5f},{0.3f,0.5f},{0.5f,0.5f},{0.8f,0.5f}};
+v2f const curve_2[] = {{0.5f,1.0f},{0.5f,0.8f},{0.5f,0.3f},{0.5f,0.2f}};
+v2f const curve_8[] = {{0.5f,0.0f},{0.5f,0.3f},{0.5f,0.5f},{0.5f,0.8f}};
+
+v2f const curve_7[] = {{0.5f,0.8438f},{0.875f,0.8438f},{0.625f,0.5f},{1.0f,0.5f}};
+v2f const curve_7_1[] = {{0.5f,0.8438f},{1.0f-0.875f,0.8438f},{1.0-0.625f,0.5f},{0.0f,0.5f}};
+
+float const curve_7_linear_section = 0.1562f;
+
v3f colour_sets[] =
-{ { 0.9f, 0.6f, 0.20f },
+{ { 1.0f, 0.9f, 0.3f },
{ 0.2f, 0.9f, 0.14f },
{ 0.4f, 0.8f, 1.00f } };
glBindVertexArray( m->vao );
}
+enum e_fish_state
+{
+ k_fish_state_soon_dead = -1,
+ k_fish_state_dead = 0,
+ k_fish_state_alive,
+ k_fish_state_bg,
+ k_fish_state_soon_alive
+};
+
struct world
{
+#pragma pack(push,1)
struct cell
{
- u32 state;
+ u16 state;
+ u16 links[2];
u8 config;
+ u8 pad0;
}
*data;
+#pragma pack(pop)
+
+ int frame;
- u32 frame;
+ int initialzed;
- u32 sim_frame;
+ int sim_frame;
float sim_start;
int simulating;
+ int sim_run, max_runs;
+ float sim_speed;
float frame_lerp;
struct cell_terminal
{
- // TODO: Split into input/output structures
- char *conditions;
- char recv[12];
- int recv_count;
+ //char *conditions;
+ //char recv[12];
+
+ struct terminal_run
+ {
+ char conditions[8];
+ char recieved[8];
+
+ int condition_count, recv_count;
+ }
+ runs[8];
+
+ int run_count;
+
int id;
}
*io;
- u32 w, h;
+ int w, h;
struct mesh tile, circle, numbers;
+ struct mesh_wire
+ {
+ GLuint vao, vbo, ebo;
+ u32 em;
+ }
+ wire;
GLuint background_data;
GLuint random_samples;
{
v2i pos;
v2i dir;
- int alive;
+ enum e_fish_state state;
char payload;
+ int flow_reversed;
float death_time;
v2f physics_v;
v2f physics_co;
u32 score;
u32 completed;
u32 time;
-
} world = {};
static void map_free(void)
-{
- for( int i = 0; i < arrlen( world.io ); i ++ )
- arrfree( world.io[ i ].conditions );
-
+{
arrfree( world.data );
arrfree( world.io );
world.score = 0;
world.time = 0;
world.completed = 0;
+ world.max_runs = 0;
+ world.initialzed = 0;
+}
+
+static void io_reset(void)
+{
+ for( int i = 0; i < arrlen( world.io ); i ++ )
+ {
+ struct cell_terminal *term = &world.io[i];
+
+ for( int j = 0; j < term->run_count; j ++ )
+ term->runs[j].recv_count = 0;
+ }
}
static void map_reclassify( v2i start, v2i end, int update_texbuffer );
static int map_load( const char *str, const char *name )
{
+ //TODO: It may be worthwhile, at this point, to switch to binary encoding for save data
+
map_free();
char const *c = str;
int cx = 0;
int reg_start = 0, reg_end = 0;
+ u32 *links_to_make = NULL;
+ int links_satisfied = 0;
+
+ char link_id_buffer[32];
+ int link_id_n = 0;
+
for(;;)
{
if( !*c )
break;
+ if( *c == '\r' ) { c ++; continue; } // fuck off windows
+
if( *c == ';' )
{
c ++;
-
+
+ if( *c == '\r' ) c ++;
+
// Parse attribs
if( *c != '\n' )
{
while( *c )
{
+ if( *c == '\r' ) { c ++; continue; }
+
if( reg_start < reg_end )
{
+ struct cell_terminal *terminal = &world.io[ reg_start ];
+ struct terminal_run *run = &terminal->runs[ terminal->run_count-1 ];
+
if( *c >= 'a' && *c <= 'z' )
- {
- arrpush( world.io[ reg_start ].conditions, *c );
+ {
+ run->conditions[ run->condition_count ++ ] = *c;
}
else
{
if( *c == '\n' )
break;
}
+ else if( *c == ':' )
+ {
+ terminal->runs[ terminal->run_count ].condition_count = 0;
+ terminal->run_count ++;
+ world.max_runs = vg_max( world.max_runs, terminal->run_count );
+ }
else
{
vg_error( "Unkown attribute '%c' (row: %u)\n", *c, world.h );
- return 0;
+ goto IL_REG_ERROR;
}
}
}
else
{
- vg_error( "Too many values to assign (row: %u)\n", world.h );
- return 0;
+ if( links_satisfied < arrlen( links_to_make ) )
+ {
+ struct cell *target = &world.data[ links_to_make[ links_satisfied ] ];
+
+ if( (((u32)*c >= (u32)'0') && ((u32)*c <= (u32)'9')) || *c == '-' )
+ {
+ if( link_id_n >= vg_list_size( link_id_buffer )-1 )
+ {
+ vg_error( "Number was way too long to be parsed (row: %u)\n", world.h );
+ goto IL_REG_ERROR;
+ }
+
+ link_id_buffer[ link_id_n ++ ] = *c;
+ }
+ else if( *c == ',' || *c == '\n' )
+ {
+ link_id_buffer[ link_id_n ] = 0x00;
+ int value = atoi( link_id_buffer );
+
+ target->links[value >= 0? 1:0] = abs(value);
+ links_satisfied ++;
+ link_id_n = 0;
+
+ if( *c == '\n' )
+ break;
+ }
+ else
+ {
+ vg_error( "Invalid character '%c' (row: %u)\n", *c, world.h );
+ goto IL_REG_ERROR;
+ }
+ }
+ else
+ {
+ vg_error( "Too many values to assign (row: %u)\n", world.h );
+ goto IL_REG_ERROR;
+ }
}
c ++;
}
}
+ // Registry length-error checks
if( reg_start != reg_end )
{
- vg_error( "Not enough values assigned (row: %u, %u of %u)\n", world.h, reg_start, reg_end );
- return 0;
+ vg_error( "Not enough spawn values assigned (row: %u, %u of %u)\n", world.h, reg_start, reg_end );
+ goto IL_REG_ERROR;
+ }
+
+ if( links_satisfied != arrlen( links_to_make ) )
+ {
+ vg_error( "Not enough link values assigned (row: %u, %u of %u)\n", world.h, links_satisfied, arrlen( links_to_make ) );
+ goto IL_REG_ERROR;
}
if( cx != world.w )
{
vg_error( "Not enough cells to match previous row definition (row: %u, %u<%u)\n", world.h, cx, world.w );
- return 0;
+ goto IL_REG_ERROR;
}
row = arraddnptr( world.data, world.w );
cx = 0;
world.h ++;
reg_end = reg_start = arrlen( world.io );
+
+ arrsetlen( links_to_make, 0 );
+ links_satisfied = 0;
}
else
{
if( cx == world.w )
{
vg_error( "Too many cells to match previous row definition (row: %u, %u>%u)\n", world.h, cx, world.w );
- return 0;
+ goto IL_REG_ERROR;
}
// Tile initialization
// row[ cx ] .. etc
struct cell *cell = &row[ cx ];
+ cell->config = 0xF;
if( *c == '+' || *c == '-' )
{
- struct cell_terminal term = { .id = cx + world.h*world.w };
- arrpush( world.io, term );
+ struct cell_terminal *term = arraddnptr( world.io, 1 );
+ term->id = cx + world.h*world.w;
+ term->run_count = 1;
+ term->runs[0].condition_count = 0;
+
cell->state = *c == '+'? FLAG_INPUT: FLAG_OUTPUT;
reg_end ++;
}
else if( *c == '#' ) cell->state = FLAG_WALL;
- else if( *c == '*' ) { cell->state = FLAG_CANAL; world.score ++; }
+ else if( ((u32)*c >= (u32)'A') && ((u32)*c <= (u32)'A'+0xf) )
+ {
+ // Canal flag bits (4bit/16 value):
+ // 0: Canal present
+ // 1: Is trigger
+ // 2: Reserved
+ // 3: Reserved
+
+ cell->state = ((u32)*c - (u32)'A') & (FLAG_CANAL|FLAG_IS_TRIGGER);
+
+ if( cell->state & FLAG_IS_TRIGGER )
+ arrpush( links_to_make, cx + world.h*world.w );
+
+ cell->links[0] = 0;
+ cell->links[1] = 0;
+ world.score ++;
+ }
else cell->state = 0x00;
cx ++;
c ++;
}
-
+
// Update data texture to fill out the background
{
u8 info_buffer[64*64*4];
glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, 64, 64, GL_RGBA, GL_UNSIGNED_BYTE, info_buffer );
}
+ arrfree( links_to_make );
+
map_reclassify( NULL, NULL, 1 );
+
+ // Validate links
+ for( int i = 0; i < world.h*world.w; i ++ )
+ {
+ struct cell *src = &world.data[i];
+ if( src->state & FLAG_IS_TRIGGER )
+ {
+ int link_id = src->links[0]?0:1;
+ if( src->links[link_id] <= world.h*world.w )
+ {
+ struct cell *target = &world.data[ src->links[link_id] ];
+ if( (target->state & FLAG_CANAL) && (target->config == k_cell_type_split) )
+ {
+ if( target->links[ link_id ] )
+ {
+ vg_error( "Link target was already targeted\n" );
+ goto IL_REG_ERROR;
+ }
+ else
+ {
+ // Valid link
+ target->links[ link_id ] = i;
+ target->state |= FLAG_TARGETED;
+ }
+ }
+ else
+ {
+ vg_error( "Link target was invalid\n" );
+ goto IL_REG_ERROR;
+ }
+ }
+ else
+ {
+ vg_error( "Link target out of bounds\n" );
+ goto IL_REG_ERROR;
+ }
+ }
+ }
+
vg_success( "Map '%s' loaded! (%u:%u)\n", name, world.w, world.h );
+ io_reset();
+
strncpy( world.map_name, name, vg_list_size( world.map_name )-1 );
+ world.initialzed = 1;
return 1;
+
+IL_REG_ERROR:
+ arrfree( links_to_make );
+ map_free();
+ return 0;
}
static struct cell *pcell( v2i pos )
if( cell->state & FLAG_WALL ) fputc( '#', stream );
else if( cell->state & FLAG_INPUT ) fputc( '+', stream );
else if( cell->state & FLAG_OUTPUT ) fputc( '-', stream );
- else if( cell->state & FLAG_CANAL ) fputc( '*', stream );
+ else if( cell->state & (FLAG_CANAL|FLAG_IS_TRIGGER|FLAG_RESERVED0|FLAG_RESERVED1) )
+ {
+ fputc( (cell->state & (FLAG_CANAL|FLAG_IS_TRIGGER|FLAG_RESERVED0|FLAG_RESERVED1)) + (u32)'A', stream );
+ }
else fputc( ' ', stream );
}
fputc( ',', stream );
terminal_write_count ++;
- for( int j = 0; j < arrlen( term->conditions ); j ++ )
- fputc( term->conditions[j], stream );
+ for( int j = 0; j < term->run_count; j ++ )
+ {
+ struct terminal_run *run = &term->runs[j];
+
+ for( int k = 0; k < run->condition_count; k ++ )
+ fputc( run->conditions[k], stream );
+
+ if( j < term->run_count-1 )
+ fputc( ':', stream );
+ }
}
}
}
+ for( int x = 0; x < world.w; x ++ )
+ {
+ struct cell *cell = pcell( (v2i){ x,y } );
+ if( cell->state & FLAG_IS_TRIGGER )
+ {
+ if( terminal_write_count )
+ fputc( ',', stream );
+ terminal_write_count ++;
+
+ fprintf( stream, "%d", cell->links[0]? -cell->links[0]: cell->links[1] );
+ }
+ }
+
fputc( '\n', stream );
}
}
int main( int argc, char *argv[] )
{
- vg_init( argc, argv, "Fish (Marbles Computer) Ladder Simulator 2022 | N,M: change level | SPACE: Test | LeftClick: Toggle tile" );
+ vg_init( argc, argv, "Marble Computing | SPACE: Test | LeftClick: Toggle tile | RightClick: Drag wire" );
+ return 0;
+}
+
+static int console_credits( int argc, char const *argv[] )
+{
+ vg_info( "Aknowledgements:\n" );
+ vg_info( " GLFW zlib/libpng glfw.org\n" );
+ vg_info( " miniaudio MIT0 miniaud.io\n" );
+ vg_info( " QOI MIT phoboslab.org\n" );
+ vg_info( " STB library MIT nothings.org\n" );
+ vg_info( " Weiholmir font justfredrik.itch.io\n" );
+ return 0;
}
static int console_save_map( int argc, char const *argv[] )
{
+ if( !world.initialzed )
+ {
+ vg_error( "Tried to save uninitialized map!\n" );
+ return 0;
+ }
+
char map_path[ 256 ];
strcpy( map_path, "sav/" );
FILE *test_writer = fopen( map_path, "wb" );
if( test_writer )
{
+ vg_info( "Saving map to '%s'\n", map_path );
map_serialize( test_writer );
fclose( test_writer );
if( text_source )
{
- map_load( text_source, argv[0] );
- free( text_source );
-
- // Update career link
+ vg_info( "Loading map: '%s'\n", map_path );
world.ptr_career_level = NULL;
+ if( !map_load( text_source, argv[0] ) )
+ {
+ free( text_source );
+ return 0;
+ }
+
+ free( text_source );
+
for( int i = 0; i < vg_list_size( level_pack_1 ); i ++ )
{
if( !strcmp( level_pack_1[i], argv[0] ) )
world.simulating = 0;
world.num_fishes = 0;
world.sim_frame = 0;
+ world.sim_run = 0;
- for( int i = 0; i < arrlen( world.io ); i ++ )
- world.io[i].recv_count = 0;
+ io_reset();
sfx_system_fadeout( &audio_system_balls_rolling, 44100 );
if( argc >= 1 )
{
// Save current level
- if( console_save_map( 0, NULL ) )
- if( console_load_map( argc, argv ) )
- {
- simulation_stop();
- return 1;
- }
+ console_save_map( 0, NULL );
+ if( console_load_map( argc, argv ) )
+ {
+ simulation_stop();
+ return 1;
+ }
}
else
{
void vg_start(void)
{
vg_function_push( (struct vg_cmd){
- .name = "map_write",
+ .name = "_map_write",
.function = console_save_map
});
vg_function_push( (struct vg_cmd){
- .name = "map_load",
+ .name = "_map_load",
.function = console_load_map
});
vg_function_push( (struct vg_cmd){
- .name = "changelevel",
+ .name = "map",
.function = console_changelevel
});
+
+ vg_function_push( (struct vg_cmd){
+ .name = "credits",
+ .function = console_credits
+ });
// Quad mesh
{
}
}
+ // Create wire mesh
+ {
+ int const num_segments = 64;
+
+ struct mesh_wire *mw = &world.wire;
+
+ v2f wire_points[ num_segments * 2 ];
+ u16 wire_indices[ 6*(num_segments-1) ];
+
+ for( int i = 0; i < num_segments; i ++ )
+ {
+ float l = (float)i / (float)(num_segments-1);
+
+ v2_copy( (v2f){ l, -0.5f }, wire_points[i*2+0] );
+ v2_copy( (v2f){ l, 0.5f }, wire_points[i*2+1] );
+
+ if( i < num_segments-1 )
+ {
+ wire_indices[ i*6+0 ] = i*2 + 0;
+ wire_indices[ i*6+1 ] = i*2 + 1;
+ wire_indices[ i*6+2 ] = i*2 + 3;
+ wire_indices[ i*6+3 ] = i*2 + 0;
+ wire_indices[ i*6+4 ] = i*2 + 3;
+ wire_indices[ i*6+5 ] = i*2 + 2;
+ }
+ }
+
+ glGenVertexArrays( 1, &mw->vao );
+ glGenBuffers( 1, &mw->vbo );
+ glGenBuffers( 1, &mw->ebo );
+ glBindVertexArray( mw->vao );
+
+ glBindBuffer( GL_ARRAY_BUFFER, mw->vbo );
+
+ glBufferData( GL_ARRAY_BUFFER, sizeof( wire_points ), wire_points, GL_STATIC_DRAW );
+ glBindVertexArray( mw->vao );
+
+ glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, mw->ebo );
+ glBufferData( GL_ELEMENT_ARRAY_BUFFER, sizeof( wire_indices ), wire_indices, GL_STATIC_DRAW );
+
+ // XY
+ glVertexAttribPointer( 0, 2, GL_FLOAT, GL_FALSE, 2*sizeof(float), (void*)0 );
+ glEnableVertexAttribArray( 0 );
+
+ VG_CHECK_GL();
+
+ mw->em = vg_list_size( wire_indices );
+ }
+
// Create info data texture
{
glGenTextures( 1, &world.background_data );
glDeleteTextures( 1, &world.background_data );
glDeleteTextures( 1, &world.random_samples );
+ glDeleteVertexArrays( 1, &world.wire.vao );
+ glDeleteBuffers( 1, &world.wire.vbo );
+ glDeleteBuffers( 1, &world.wire.ebo );
+
free_mesh( &world.tile );
free_mesh( &world.circle );
free_mesh( &world.numbers );
map_free();
}
+static int world_check_pos_ok( v2i co )
+{
+ return (co[0] < 2 || co[0] >= world.w-2 || co[1] < 2 || co[1] >= world.h-2)? 0: 1;
+}
+
static int cell_interactive( v2i co )
{
// Bounds check
- if( co[0] < 2 || co[0] >= world.w-2 || co[1] < 2 || co[1] >= world.h-2 )
+ if( !world_check_pos_ok( co ) )
return 0;
// Flags check
for( int x = px0; x < px1; x ++ )
{
struct cell *cell = pcell((v2i){x,y});
-
+
v2i dirs[] = {{1,0},{0,1},{-1,0},{0,-1}};
u8 height = 0;
info_px[1] = cell->state & FLAG_WALL? 0: 255;
info_px[2] = 0;
info_px[3] = 0;
+
+ if(
+ (
+ ((cell->state & FLAG_IS_TRIGGER) && (cell->config == 0xF || cell->config == k_cell_type_split)) ||
+ ((cell->state & FLAG_TARGETED) && (cell->config != k_cell_type_split))
+ ) && update_texbuffer
+ ){
+ cell->state &= ~(FLAG_TARGETED|FLAG_IS_TRIGGER);
+ for( u32 i = 0; i < 2; i ++ )
+ {
+ if( cell->links[i] )
+ {
+ struct cell *other_ptr = &world.data[ cell->links[i] ];
+ other_ptr->links[ i ] = 0;
+ other_ptr->state &= ~FLAG_IS_TRIGGER;
+
+ if( other_ptr->links[ i ^ 0x1 ] == 0 )
+ other_ptr->state &= ~FLAG_TARGETED;
+ }
+ }
+
+ cell->links[0] = 0;
+ cell->links[1] = 0;
+ }
}
}
}
}
-v2f const curve_3[] = {{0.5f,1.0f},{0.5f,0.625f},{0.625f,0.5f},{1.0f,0.5f}};
-v2f const curve_6[] = {{0.5f,1.0f},{0.5f,0.625f},{0.375f,0.5f},{0.0f,0.5f}};
-v2f const curve_9[] = {{1.0f,0.5f},{0.625f,0.5f},{0.5f,0.375f},{0.5f,0.0f}};
-v2f const curve_12[]= {{0.0f,0.5f},{0.375f,0.5f},{0.5f,0.375f},{0.5f,0.0f}};
-
-v2f const curve_2[] = {{0.5f,1.0f},{0.5f,0.8f},{0.5f,0.3f},{0.5f,0.2f}};
-v2f const curve_8[] = {{0.5f,0.8f},{0.5f,0.5f},{0.5f,0.3f},{0.5f,0.0f}};
-
-v2f const curve_7[] = {{0.5f,0.8438f},{0.875f,0.8438f},{0.625f,0.5f},{1.0f,0.5f}};
-v2f const curve_7_1[] = {{0.5f,0.8438f},{1.0f-0.875f,0.8438f},{1.0-0.625f,0.5f},{0.0f,0.5f}};
-
-float const curve_7_linear_section = 0.1562f;
+u16 id_drag_from = 0;
+v2f drag_from_co;
+v2f drag_to_co;
void vg_update(void)
{
// Tilemap editing
if( !world.simulating )
{
+ v2_copy( vg_mouse_ws, drag_to_co );
+
if( cell_interactive( (v2i){ world.tile_x, world.tile_y } ))
{
world.selected = world.tile_y * world.w + world.tile_x;
+ static u32 modify_state = 0;
+
+ struct cell *cell_ptr = &world.data[world.selected];
+
if( vg_get_button_down("primary") )
{
- world.data[ world.selected ].state ^= FLAG_CANAL;
-
- if( world.data[ world.selected ].state & FLAG_CANAL )
+ modify_state = (cell_ptr->state & FLAG_CANAL) ^ FLAG_CANAL;
+ }
+
+ if( vg_get_button("primary") && ((cell_ptr->state & FLAG_CANAL) != modify_state) )
+ {
+ cell_ptr->state &= ~FLAG_CANAL;
+ cell_ptr->state |= modify_state;
+
+ if( cell_ptr->state & FLAG_CANAL )
{
+ cell_ptr->links[0] = 0;
+ cell_ptr->links[1] = 0;
+
sfx_set_playrnd( &audio_tile_mod, &audio_system_sfx, 3, 6 );
world.score ++;
}
else
- {
+ {
sfx_set_playrnd( &audio_tile_mod, &audio_system_sfx, 0, 3 );
world.score --;
}
-
+
map_reclassify( (v2i){ world.tile_x -2, world.tile_y -2 },
(v2i){ world.tile_x +2, world.tile_y +2 }, 1 );
}
+
+ if( vg_get_button_down("secondary") && !(cell_ptr->config == k_cell_type_split) )
+ {
+ id_drag_from = world.selected;
+ drag_from_co[0] = world.tile_x + 0.5f;
+ drag_from_co[1] = world.tile_y + 0.5f;
+ }
+
+ if( id_drag_from && (cell_ptr->config == k_cell_type_split) )
+ {
+ float local_x = vg_mouse_ws[0] - (float)world.tile_x;
+ drag_to_co[0] = (float)world.tile_x + (local_x > 0.5f? 0.75f: 0.25f);
+ drag_to_co[1] = (float)world.tile_y + 0.25f;
+
+ if( vg_get_button_up("secondary") )
+ {
+ struct cell *drag_ptr = &world.data[id_drag_from];
+ u32 link_id = local_x > 0.5f? 1: 0;
+
+ // Cleanup existing connections
+ if( cell_ptr->links[ link_id ] )
+ {
+ vg_warn( "Destroying existing connection on link %u (%hu)\n", link_id, cell_ptr->links[ link_id ] );
+
+ struct cell *current_connection = &world.data[ cell_ptr->links[ link_id ]];
+ current_connection->state &= ~FLAG_IS_TRIGGER;
+ current_connection->links[ link_id ] = 0;
+ }
+
+ if( drag_ptr->links[ link_id ^ 0x1 ] )
+ {
+ vg_warn( "Destroying alternate link %u (%hu)\n", link_id ^ 0x1, drag_ptr->links[ link_id ^ 0x1 ] );
+
+ struct cell *current_connection = &world.data[ drag_ptr->links[ link_id ^ 0x1 ]];
+ if( !current_connection->links[ link_id ] )
+ current_connection->state &= ~FLAG_TARGETED;
+
+ current_connection->links[ link_id ^ 0x1 ] = 0;
+ drag_ptr->links[ link_id ^ 0x1 ] = 0;
+ }
+
+ // Create the new connection
+ vg_success( "Creating connection on link %u (%hu)\n", link_id, id_drag_from );
+
+ cell_ptr->links[ link_id ] = id_drag_from;
+ drag_ptr->links[ link_id ] = world.selected;
+
+ cell_ptr->state |= FLAG_TARGETED;
+ drag_ptr->state |= FLAG_IS_TRIGGER;
+ id_drag_from = 0;
+ }
+ }
}
else
world.selected = -1;
+
+ if( !(vg_get_button("secondary") && id_drag_from) )
+ id_drag_from = 0;
+ }
+ else
+ {
+ world.selected = -1;
+ id_drag_from = 0;
}
- else world.selected = -1;
// Simulation stop/start
if( vg_get_button_down("go") )
world.num_fishes = 0;
world.sim_frame = 0;
world.sim_start = vg_time;
+ world.sim_run = 0;
+ world.sim_speed = 2.5f;
for( int i = 0; i < world.w*world.h; i ++ )
- {
world.data[ i ].state &= ~FLAG_FLIP_FLOP;
- }
- for( int i = 0; i < arrlen( world.io ); i ++ )
- world.io[i].recv_count = 0;
+ io_reset();
}
}
// Fish ticks
if( world.simulating )
{
- while( world.sim_frame < (int)((vg_time-world.sim_start)*2.0f) )
+ while( world.sim_frame < (int)((vg_time-world.sim_start)*world.sim_speed) )
{
//vg_info( "frame: %u\n", world.sim_frame );
sfx_set_playrnd( &audio_random, &audio_system_balls_switching, 0, 9 );
{
cell->state &= ~FLAG_FLIP_ROTATING;
}
+ if( cell->state & FLAG_IS_TRIGGER )
+ cell->state &= ~FLAG_TRIGGERED;
}
int alive_count = 0;
for( int i = 0; i < world.num_fishes; i ++ )
{
struct fish *fish = &world.fishes[i];
- struct cell *cell_current = pcell( fish->pos );
- if( fish->alive == -1 )
- fish->alive = 0;
+ if( fish->state == k_fish_state_soon_dead )
+ fish->state = k_fish_state_dead;
+
+ if( fish->state == k_fish_state_soon_alive )
+ fish->state = k_fish_state_alive;
- if( fish->alive != 1 )
+ if( fish->state < k_fish_state_alive )
continue;
- // Apply to output
- if( cell_current->state & FLAG_OUTPUT )
+ struct cell *cell_current = pcell( fish->pos );
+
+ if( fish->state == k_fish_state_alive )
{
- for( int j = 0; j < arrlen( world.io ); j ++ )
+ // Apply to output
+ if( cell_current->state & FLAG_OUTPUT )
+ {
+ for( int j = 0; j < arrlen( world.io ); j ++ )
+ {
+ struct cell_terminal *term = &world.io[j];
+
+ if( term->id == fish->pos[1]*world.w + fish->pos[0] )
+ {
+ struct terminal_run *run = &term->runs[ world.sim_run ];
+ if( run->recv_count < vg_list_size( run->recieved ) )
+ run->recieved[ run->recv_count ++ ] = fish->payload;
+
+ break;
+ }
+ }
+
+ fish->state = k_fish_state_dead;
+ continue;
+ }
+
+
+ if( cell_current->config == k_cell_type_merge )
{
- struct cell_terminal *term = &world.io[j];
+ // Can only move up
+ fish->dir[0] = 0;
+ fish->dir[1] = -1;
+ fish->flow_reversed = 0;
+ }
+ else
+ {
+ if( cell_current->config == k_cell_type_split )
+ {
+ // Flip flop L/R
+ fish->dir[0] = cell_current->state&FLAG_FLIP_FLOP?1:-1;
+ fish->dir[1] = 0;
+
+ if( !(cell_current->state & FLAG_TARGETED) )
+ cell_current->state ^= FLAG_FLIP_FLOP;
+ }
+ else
+ {
+ // Apply cell out-flow
+ struct cell_description *desc = &cell_descriptions[ cell_current->config ];
+
+ v2i_copy( fish->flow_reversed? desc->start: desc->end, fish->dir );
+ }
+
+ v2i pos_next;
+ v2i_add( fish->pos, fish->dir, pos_next );
+
+ struct cell *cell_next = pcell( pos_next );
- if( term->id == fish->pos[1]*world.w + fish->pos[0] )
+ if( cell_next->state & (FLAG_CANAL|FLAG_OUTPUT) )
{
- term->recv[ term->recv_count ++ ] = fish->payload;
- break;
+ struct cell_description *desc = &cell_descriptions[ cell_next->config ];
+
+ if( cell_next->config == k_cell_type_merge )
+ {
+ if( fish->dir[0] == 0 )
+ fish->state = k_fish_state_dead;
+ else
+ fish->flow_reversed = 0;
+ }
+ else
+ {
+ if( cell_next->config == k_cell_type_split )
+ {
+ if( fish->dir[0] == 0 )
+ {
+ sfx_set_playrnd( &audio_splitter, &audio_system_balls_important, 0, 1 );
+ cell_next->state |= FLAG_FLIP_ROTATING;
+
+ fish->flow_reversed = 0;
+ }
+ else
+ fish->state = k_fish_state_dead;
+ }
+ else
+ fish->flow_reversed = ( fish->dir[0] != -desc->start[0] ||
+ fish->dir[1] != -desc->start[1] )? 1: 0;
+ }
}
+ else
+ fish->state = world_check_pos_ok( fish->pos )? k_fish_state_bg: k_fish_state_dead;
}
- fish->alive = 0;
- continue;
+ //v2i_add( fish->pos, fish->dir, fish->pos );
}
-
- if( cell_current->config == k_cell_type_split )
+ else if( fish->state == k_fish_state_bg )
{
- // Flip flop L/R
- fish->dir[0] = cell_current->state&FLAG_FLIP_FLOP?1:-1;
- fish->dir[1] = 0;
+ v2i_add( fish->pos, fish->dir, fish->pos );
- cell_current->state ^= FLAG_FLIP_FLOP;
- }
- else if( cell_current->config == k_cell_type_merge )
- {
- // Can only move up
- fish->dir[0] = 0;
- fish->dir[1] = -1;
- }
- else
- {
- struct cell *cell_next = pcell( (v2i){ fish->pos[0]+fish->dir[0], fish->pos[1]+fish->dir[1] } );
- if( !(cell_next->state & (FLAG_CANAL|FLAG_OUTPUT)) )
+ if( !world_check_pos_ok( fish->pos ) )
+ fish->state = k_fish_state_dead;
+ else
{
- // Try other directions for valid, so down, left, right..
- v2i dirs[] = {{1,0},{-1,0},{0,-1}};
- vg_info( "Trying some other directions...\n" );
+ struct cell *cell_entry = pcell( fish->pos );
- for( int j = 0; j < vg_list_size(dirs); j ++ )
+ if( cell_entry->state & FLAG_CANAL )
{
- if( (dirs[j][0] == -fish->dir[0]) && (dirs[j][1] == -fish->dir[1]) )
- continue;
-
- if( pcell( (v2i){ fish->pos[0]+dirs[j][0], fish->pos[1]+dirs[j][1] } )->state & (FLAG_CANAL|FLAG_OUTPUT) )
+ if( cell_entry->config == k_cell_type_con_r || cell_entry->config == k_cell_type_con_u
+ || cell_entry->config == k_cell_type_con_l || cell_entry->config == k_cell_type_con_d )
{
- fish->dir[0] = dirs[j][0];
- fish->dir[1] = dirs[j][1];
+ sw_set_achievement( "CAN_DO_THAT" );
+
+ fish->state = k_fish_state_soon_alive;
+
+ fish->dir[0] = 0;
+ fish->dir[1] = 0;
+ fish->flow_reversed = 1;
+
+ switch( cell_entry->config )
+ {
+ case k_cell_type_con_r: fish->dir[0] = 1; break;
+ case k_cell_type_con_l: fish->dir[0] = -1; break;
+ case k_cell_type_con_u: fish->dir[1] = 1; break;
+ case k_cell_type_con_d: fish->dir[1] = -1; break;
+ }
}
}
}
}
+ else { vg_error( "fish behaviour unimplemented for behaviour type (%d)\n" ); }
- fish->pos[0] += fish->dir[0];
- fish->pos[1] += fish->dir[1];
-
- struct cell *cell_entry = pcell( fish->pos );
+ if( fish->state >= k_fish_state_alive )
+ alive_count ++;
+ }
+
+ // Second pass (triggers)
+ for( int i = 0; i < world.num_fishes; i ++ )
+ {
+ struct fish *fish = &world.fishes[i];
- if( !(cell_entry->state & (FLAG_INPUT|FLAG_CANAL|FLAG_OUTPUT) ))
- fish->alive = 0;
- else
+ if( fish->state == k_fish_state_alive )
{
- if( fish->dir[0] )
- {
- if( cell_entry->config == k_cell_type_split ||
- cell_entry->config == k_cell_type_ramp_right ||
- cell_entry->config == k_cell_type_ramp_left )
- {
- // Special death (FALL)
- v2_sub( fish->physics_co, fish->physics_v, fish->physics_v );
- v2_divs( fish->physics_v, vg_time_delta, fish->physics_v );
+ v2i_add( fish->pos, fish->dir, fish->pos );
+ struct cell *cell_current = pcell( fish->pos );
- fish->alive = -2;
- vg_warn( "Special death (fall)\n" );
- continue;
- }
- }
-
- if( cell_entry->config == k_cell_type_split )
+ if( cell_current->state & FLAG_IS_TRIGGER )
{
- sfx_set_playrnd( &audio_splitter, &audio_system_balls_important, 0, 1 );
- cell_entry->state |= FLAG_FLIP_ROTATING;
+ int trigger_id = cell_current->links[0]?0:1;
+ int connection_id = cell_current->links[trigger_id];
+ int target_px = connection_id % world.w;
+ int target_py = (connection_id - target_px)/world.w;
+
+ vg_line2( (v2f){ fish->pos[0], fish->pos[1] }, (v2f){ target_px, target_py }, 0xffffffff, 0xffffffff );
+
+ struct cell *target_peice = &world.data[ cell_current->links[trigger_id] ];
+
+ cell_current->state |= FLAG_TRIGGERED;
+
+ if( trigger_id )
+ target_peice->state |= FLAG_FLIP_FLOP;
+ else
+ target_peice->state &= ~FLAG_FLIP_FLOP;
}
}
-
- if( fish->alive )
- alive_count ++;
}
- // Check for collisions
+ // Third pass (collisions)
+ struct fish *fi, *fj;
+
for( int i = 0; i < world.num_fishes; i ++ )
{
- if( world.fishes[i].alive == 1 )
+ fi = &world.fishes[i];
+
+ if( fi->state == k_fish_state_alive )
{
+ int continue_again = 0;
+
for( int j = i+1; j < world.num_fishes; j ++ )
{
- if( (world.fishes[j].alive == 1) && (world.fishes[i].pos[0] == world.fishes[j].pos[0]) &&
- (world.fishes[i].pos[1] == world.fishes[j].pos[1]) )
+ fj = &world.fishes[j];
+
+ if( (fj->state == k_fish_state_alive) )
{
- // Shatter death (+0.5s)
- world.fishes[i].alive = -1;
- world.fishes[j].alive = -1;
- world.fishes[i].death_time = 0.5f;
- world.fishes[j].death_time = 0.5f;
+ v2i fi_prev;
+ v2i fj_prev;
+
+ v2i_sub( fi->pos, fi->dir, fi_prev );
+ v2i_sub( fj->pos, fj->dir, fj_prev );
+
+ int
+ collide_next_frame = (
+ (fi->pos[0] == fj->pos[0]) &&
+ (fi->pos[1] == fj->pos[1]))? 1: 0,
+ collide_this_frame = (
+ (fi_prev[0] == fj->pos[0]) &&
+ (fi_prev[1] == fj->pos[1]) &&
+ (fj_prev[0] == fi->pos[0]) &&
+ (fj_prev[1] == fi->pos[1])
+ )? 1: 0;
+
+ if( collide_next_frame || collide_this_frame )
+ {
+ // Shatter death (+0.5s)
+ float death_time = collide_this_frame? 0.0f: 0.5f;
+
+ fi->state = k_fish_state_soon_dead;
+ fj->state = k_fish_state_soon_dead;
+ fi->death_time = death_time;
+ fj->death_time = death_time;
+
+ continue_again = 1;
+ break;
+ }
}
}
+ if( continue_again )
+ continue;
}
}
if( is_input )
{
- if( world.sim_frame < arrlen( term->conditions ) )
+ if( world.sim_frame < term->runs[ world.sim_run ].condition_count )
{
- struct fish *fish = &world.fishes[world.num_fishes++];
+ struct fish *fish = &world.fishes[ world.num_fishes ];
fish->pos[0] = posx;
fish->pos[1] = posy;
- fish->alive = 1;
- fish->payload = term->conditions[world.sim_frame];
+ fish->state = k_fish_state_alive;
+ fish->payload = term->runs[ world.sim_run ].conditions[ world.sim_frame ];
- int can_spawn = 0;
+ struct cell *cell_ptr = pcell( fish->pos );
- v2i dirs[] = {{1,0},{-1,0},{0,-1}};
- for( int j = 0; j < vg_list_size(dirs); j ++ )
- if( pcell( (v2i){ posx+dirs[j][0], posy+dirs[j][1] } )->state & FLAG_CANAL )
- {
- fish->dir[0] = dirs[j][0];
- fish->dir[1] = dirs[j][1];
- can_spawn = 1;
- break;
- }
-
- if( !can_spawn )
- world.num_fishes--;
- else
+ if( cell_ptr->config != k_cell_type_stub )
+ {
+ struct cell_description *desc = &cell_descriptions[ cell_ptr->config ];
+
+ v2i_copy( desc->start, fish->dir );
+ fish->flow_reversed = 1;
+
+ world.num_fishes ++;
alive_count ++;
+ }
}
}
}
if( !is_input )
{
- if( term->recv_count == arrlen( term->conditions ) )
+ struct terminal_run *run = &term->runs[ world.sim_run ];
+
+ if( run->recv_count == run->condition_count )
{
- for( int j = 0; j < arrlen( term->conditions ); j ++ )
+ for( int j = 0; j < run->condition_count; j ++ )
{
- if( term->recv[j] != term->conditions[j] )
+ if( run->recieved[j] != run->conditions[j] )
{
world.completed = 0;
break;
if( world.completed )
{
- vg_success( "Level passed!\n" );
-
- u32 score = 0;
- for( int i = 0; i < world.w*world.h; i ++ )
- if( world.data[ i ].state & FLAG_CANAL )
- score ++;
-
- world.score = score;
- world.time = world.sim_frame;
+ if( world.sim_run < world.max_runs-1 )
+ {
+ vg_success( "Run passed, starting next\n" );
+ world.sim_run ++;
+ world.sim_frame = 0;
+ world.sim_start = vg_time;
+ world.num_fishes = 0;
+
+ for( int i = 0; i < world.w*world.h; i ++ )
+ world.data[ i ].state &= ~FLAG_FLIP_FLOP;
+
+ continue;
+ }
+ else
+ {
+ vg_success( "Level passed!\n" );
+
+ u32 score = 0;
+ for( int i = 0; i < world.w*world.h; i ++ )
+ if( world.data[ i ].state & FLAG_CANAL )
+ score ++;
+
+ world.score = score;
+ world.time = world.sim_frame;
+ }
}
else
{
}
float scaled_time = 0.0f;
- scaled_time = (vg_time-world.sim_start)*2.0f;
+ scaled_time = (vg_time-world.sim_start)*world.sim_speed;
world.frame_lerp = scaled_time - (float)world.sim_frame;
// Update positions
{
struct fish *fish = &world.fishes[i];
- if( fish->alive == 0 )
+ if( fish->state == k_fish_state_dead )
continue;
- if( fish->alive == -1 && (world.frame_lerp > fish->death_time) )
+ if( fish->state == k_fish_state_soon_dead && (world.frame_lerp > fish->death_time) )
continue; // Todo: particle thing?
+
+ struct cell *cell = pcell(fish->pos);
+ struct cell_description *desc = &cell_descriptions[ cell->config ];
+
+ v2f const *curve;
+
+ float t = world.frame_lerp;
+ if( fish->flow_reversed && !desc->is_linear )
+ t = 1.0f-t;
+
+ v2_copy( fish->physics_co, fish->physics_v );
- if( fish->alive == -2 )
+ switch( cell->config )
{
- v2_muladds( fish->physics_v, (v2f){ 0.0, -9.8f }, vg_time_delta, fish->physics_v );
- v2_muladds( fish->physics_co, fish->physics_v, vg_time_delta, fish->physics_co );
+ case k_cell_type_merge:
+ if( fish->dir[0] == 1 )
+ curve = curve_12;
+ else
+ curve = curve_9;
+ break;
+ case k_cell_type_con_r: curve = curve_1; break;
+ case k_cell_type_con_l: curve = curve_4; break;
+ case k_cell_type_con_u: curve = curve_2; break;
+ case k_cell_type_con_d: curve = curve_8; break;
+ case 3: curve = curve_3; break;
+ case 6: curve = curve_6; break;
+ case 9: curve = curve_9; break;
+ case 12: curve = curve_12; break;
+ case 7:
+ if( t > curve_7_linear_section )
+ {
+ t -= curve_7_linear_section;
+ t *= (1.0f/(1.0f-curve_7_linear_section));
+
+ curve = cell->state & FLAG_FLIP_FLOP? curve_7: curve_7_1;
+ }
+ else curve = NULL;
+ break;
+ default: curve = NULL; break;
}
- else
- {
- struct cell *cell = pcell(fish->pos);
- v2f const *curve;
-
- float t = world.frame_lerp;
-
- v2_copy( fish->physics_co, fish->physics_v );
-
- switch( cell->config )
- {
- case 13:
- if( fish->dir[0] == 1 )
- curve = curve_12;
- else
- curve = curve_9;
- break;
- case 2: curve = curve_2; break;
- case 8: curve = curve_8; break;
- case 3: curve = curve_3; break;
- case 6: curve = curve_6; break;
- case 9: curve = curve_9; break;
- case 12: curve = curve_12; break;
- case 7:
- if( t > curve_7_linear_section )
- {
- t -= curve_7_linear_section;
- t *= (1.0f/(1.0f-curve_7_linear_section));
-
- curve = cell->state & FLAG_FLIP_FLOP? curve_7: curve_7_1;
- }
- else curve = NULL;
- break;
- default: curve = NULL; break;
- }
- if( curve )
- {
- float t2 = t * t;
- float t3 = t * t * t;
+ if( curve )
+ {
+ float t2 = t * t;
+ float t3 = t * t * t;
- float cA = 3.0f*t2 - 3.0f*t3;
- float cB = 3.0f*t3 - 6.0f*t2 + 3.0f*t;
- float cC = 3.0f*t2 - t3 - 3.0f*t + 1.0f;
+ float cA = 3.0f*t2 - 3.0f*t3;
+ float cB = 3.0f*t3 - 6.0f*t2 + 3.0f*t;
+ float cC = 3.0f*t2 - t3 - 3.0f*t + 1.0f;
- fish->physics_co[0] = t3*curve[3][0] + cA*curve[2][0] + cB*curve[1][0] + cC*curve[0][0];
- fish->physics_co[1] = t3*curve[3][1] + cA*curve[2][1] + cB*curve[1][1] + cC*curve[0][1];
- fish->physics_co[0] += (float)fish->pos[0];
- fish->physics_co[1] += (float)fish->pos[1];
- }
- else
- {
- v2f origin;
- origin[0] = (float)fish->pos[0] + (float)fish->dir[0]*-0.5f + 0.5f;
- origin[1] = (float)fish->pos[1] + (float)fish->dir[1]*-0.5f + 0.5f;
-
- fish->physics_co[0] = origin[0] + (float)fish->dir[0]*t;
- fish->physics_co[1] = origin[1] + (float)fish->dir[1]*t;
- }
+ fish->physics_co[0] = t3*curve[3][0] + cA*curve[2][0] + cB*curve[1][0] + cC*curve[0][0];
+ fish->physics_co[1] = t3*curve[3][1] + cA*curve[2][1] + cB*curve[1][1] + cC*curve[0][1];
+ fish->physics_co[0] += (float)fish->pos[0];
+ fish->physics_co[1] += (float)fish->pos[1];
+ }
+ else
+ {
+ v2f origin;
+ origin[0] = (float)fish->pos[0] + (float)fish->dir[0]*-0.5f + 0.5f;
+ origin[1] = (float)fish->pos[1] + (float)fish->dir[1]*-0.5f + 0.5f;
+
+ fish->physics_co[0] = origin[0] + (float)fish->dir[0]*t;
+ fish->physics_co[1] = origin[1] + (float)fish->dir[1]*t;
}
}
}
SHADER_USE( shader_ball );
glUniformMatrix3fv( SHADER_UNIFORM( shader_ball, "uPv" ), 1, GL_FALSE, (float *)vg_pv );
- vg_tex2d_bind( &tex_ball, 0 );
+ vg_tex2d_bind( &tex_ball_noise, 0 );
glUniform1i( SHADER_UNIFORM( shader_ball, "uTexMain" ), 0 );
// Draw 'fish'
{
struct fish *fish = &world.fishes[i];
- if( fish->alive == 0 )
+ if( fish->state == k_fish_state_dead || fish->state == k_fish_state_bg )
continue;
- if( fish->alive == -1 && (world.frame_lerp > fish->death_time) )
+ if( fish->state == k_fish_state_soon_dead && (world.frame_lerp > fish->death_time) )
continue;
v4f dot_colour = { 0.0f, 0.0f, 0.0f, 1.0f };
glUniform3fv( SHADER_UNIFORM( shader_ball, "uColour" ), 1, dot_colour );
glUniform2fv( SHADER_UNIFORM( shader_ball, "uOffset" ), 1, fish->physics_co );
- draw_mesh( 0, 32 );
+ glUniform2f( SHADER_UNIFORM( shader_ball, "uTexOffset" ), (float)i * 1.2334, (float)i * -0.3579f );
+ draw_mesh( 0, 2 );
}
}
{
struct cell *cell = pcell((v2i){x,y});
- if( cell->config == k_cell_type_split )
+ if( cell->state & FLAG_CANAL )
{
- float rotation = cell->state & FLAG_FLIP_FLOP? vg_rad( -45.0f ): vg_rad( 45.0f );
-
- if( cell->state & FLAG_FLIP_ROTATING )
+ if( cell->config == k_cell_type_split )
{
- if( (world.frame_lerp > curve_7_linear_section) )
+ float rotation = cell->state & FLAG_FLIP_FLOP? vg_rad( -45.0f ): vg_rad( 45.0f );
+
+ if( cell->state & FLAG_FLIP_ROTATING )
{
- float const rotation_speed = 0.4f;
- if( (world.frame_lerp < 1.0f-rotation_speed) )
+ if( (world.frame_lerp > curve_7_linear_section) )
{
- float t = world.frame_lerp - curve_7_linear_section;
- t *= -2.0f * (1.0f/(1.0f-(curve_7_linear_section+rotation_speed)));
- t += 1.0f;
-
- rotation *= t;
+ float const rotation_speed = 0.4f;
+ if( (world.frame_lerp < 1.0f-rotation_speed) )
+ {
+ float t = world.frame_lerp - curve_7_linear_section;
+ t *= -2.0f * (1.0f/(1.0f-(curve_7_linear_section+rotation_speed)));
+ t += 1.0f;
+
+ rotation *= t;
+ }
+ else
+ rotation *= -1.0f;
}
- else
- rotation *= -1.0f;
}
- }
- m2x2_create_rotation( subtransform, rotation );
+ m2x2_create_rotation( subtransform, rotation );
- glUniformMatrix2fv( SHADER_UNIFORM( shader_tile_main, "uSubTransform" ), 1, GL_FALSE, (float *)subtransform );
- glUniform4f( SHADER_UNIFORM( shader_tile_main, "uOffset" ), (float)x, (float)y + 0.125f, 0.0f, 0.0f );
- draw_mesh( 0, 2 );
+ glUniformMatrix2fv( SHADER_UNIFORM( shader_tile_main, "uSubTransform" ), 1, GL_FALSE, (float *)subtransform );
+ glUniform4f( SHADER_UNIFORM( shader_tile_main, "uOffset" ), (float)x, (float)y + 0.125f, cell->state & FLAG_TARGETED? 3.0f: 0.0f, 0.0f );
+ draw_mesh( 0, 2 );
+ }
}
}
}
// Edit overlay
- if( world.selected != -1 && !(world.data[ world.selected ].state & FLAG_CANAL) )
+ if( world.selected != -1 && !(world.data[ world.selected ].state & FLAG_CANAL) && !id_drag_from )
{
v2i new_begin = { world.tile_x - 2, world.tile_y - 2 };
v2i new_end = { world.tile_x + 2, world.tile_y + 2 };
//glDisable(GL_BLEND);
+ // Draw connecting wires
glDisable(GL_BLEND);
+ SHADER_USE( shader_wire );
+ glBindVertexArray( world.wire.vao );
+
+ glUniformMatrix3fv( SHADER_UNIFORM( shader_wire, "uPv" ), 1, GL_FALSE, (float *)vg_pv );
+ glUniform4f( SHADER_UNIFORM( shader_wire, "uColour" ), 0.2f, 0.2f, 0.2f, 1.0f );
+
+ if( id_drag_from )
+ {
+ glUniform1f( SHADER_UNIFORM( shader_wire, "uCurve" ), 0.4f );
+ glUniform3f( SHADER_UNIFORM( shader_wire, "uStart" ), drag_from_co[0], drag_from_co[1], 0.06f );
+ glUniform3f( SHADER_UNIFORM( shader_wire, "uEnd" ), drag_to_co[0], drag_to_co[1], 0.06f );
+ glDrawElements( GL_TRIANGLES, world.wire.em, GL_UNSIGNED_SHORT, (void*)(0) );
+ }
+
+ float rp_x1 = world.frame_lerp*9.0f;
+ float rp_x2 = 1.0f-rp_x1*expf(1.0f-rp_x1)* 0.36f;
+
+ for( int y = 2; y < world.h-2; y ++ )
+ {
+ for( int x = 2; x < world.w-2; x ++ )
+ {
+ struct cell *cell = pcell((v2i){x,y});
+
+ if( cell->state & FLAG_CANAL )
+ {
+ if( cell->state & FLAG_IS_TRIGGER )
+ {
+ int trigger_id = cell->links[0]?0:1;
+
+ int x2 = cell->links[trigger_id] % world.w;
+ int y2 = (cell->links[trigger_id] - x2) / world.w;
+
+ v2f startpoint;
+ v2f endpoint;
+
+ startpoint[0] = (float)x2 + (trigger_id? 0.75f: 0.25f);
+ startpoint[1] = (float)y2 + 0.25f;
+
+ endpoint[0] = x+0.5f;
+ endpoint[1] = y+0.5f;
+
+ glUniform1f( SHADER_UNIFORM( shader_wire, "uCurve" ), cell->state & FLAG_TRIGGERED? rp_x2 * 0.4f: 0.4f );
+ glUniform3f( SHADER_UNIFORM( shader_wire, "uStart" ), startpoint[0], startpoint[1], 0.04f );
+ glUniform3f( SHADER_UNIFORM( shader_wire, "uEnd" ), endpoint[0], endpoint[1], 0.04f );
+ glDrawElements( GL_TRIANGLES, world.wire.em, GL_UNSIGNED_SHORT, (void*)(0) );
+ }
+ }
+ }
+ }
+
SHADER_USE( shader_tile_colour );
glUniformMatrix3fv( SHADER_UNIFORM( shader_tile_colour, "uPv" ), 1, GL_FALSE, (float *)vg_pv );
use_mesh( &world.circle );
v4f dot_colour = { 0.0f, 0.0f, 0.0f, 1.0f };
- for( int j = 0; j < arrlen( term->conditions ); j ++ )
+ for( int k = 0; k < term->run_count; k ++ )
{
- float y_offset = is_input? 1.2f: -0.2f;
- glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ), (float)posx + 0.2f + 0.2f * (float)j, (float)posy + y_offset, 0.1f );
-
- if( is_input )
+ for( int j = 0; j < term->runs[k].condition_count; j ++ )
{
- colour_code_v3( term->conditions[j], dot_colour );
- glUniform4fv( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 1, dot_colour );
-
- // Draw filled if tick not passed, draw empty if empty
- if( world.sim_frame > j )
- draw_mesh( empty_start, empty_count );
+ float y_offset = is_input? 1.2f: -0.2f;
+ y_offset += (is_input? 0.2f: -0.2f) * (float)k;
+
+ glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ), (float)posx + 0.2f + 0.2f * (float)j, (float)posy + y_offset, 0.1f );
+
+ if( is_input )
+ {
+ colour_code_v3( term->runs[k].conditions[j], dot_colour );
+ glUniform4fv( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 1, dot_colour );
+
+ // Draw filled if tick not passed, draw empty if empty
+ if( (world.sim_frame > j && world.sim_run >= k) || world.sim_run > k )
+ draw_mesh( empty_start, empty_count );
+ else
+ draw_mesh( filled_start, filled_count );
+ }
else
- draw_mesh( filled_start, filled_count );
- }
- else
- {
- if( term->recv_count > j )
{
- colour_code_v3( term->recv[j], dot_colour );
- v3_muls( dot_colour, 0.8f, dot_colour );
+ if( term->runs[k].recv_count > j )
+ {
+ colour_code_v3( term->runs[k].recieved[j], dot_colour );
+ v3_muls( dot_colour, 0.8f, dot_colour );
+ glUniform4fv( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 1, dot_colour );
+
+ draw_mesh( filled_start, filled_count );
+ }
+
+ colour_code_v3( term->runs[k].conditions[j], dot_colour );
glUniform4fv( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 1, dot_colour );
- draw_mesh( filled_start, filled_count );
+ draw_mesh( empty_start, empty_count );
}
-
- colour_code_v3( term->conditions[j], dot_colour );
- glUniform4fv( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 1, dot_colour );
-
- draw_mesh( empty_start, empty_count );
}
}
}
draw_mesh( empty_start, empty_count );
}
+ // Level scores
+ glUniform4f( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 0.4f*1.25f, 0.39f*1.25f, 0.45f*1.25f, 1.0f );
+
+ use_mesh( &world.numbers );
+ for( int i = 0; i < level_count; i ++ )
+ {
+ struct career_level *clevel = &career.levels[i];
+
+ v3f level_ui_space = {
+ -0.94f,
+ ((float)level_count - (float)i * 2.0f ) * selection_scale * 0.6f + selection_scale * 0.5f,
+ 0.02f
+ };
+
+ if( clevel->completed )
+ draw_numbers( level_ui_space, clevel->score );
+
+ level_ui_space[0] = -0.975f;
+ level_ui_space[1] -= 0.01f;
+ draw_numbers( level_ui_space, i );
+ }
+
//use_mesh( &world.numbers );
//draw_numbers( (v3f){ 0.0f, -0.5f, 0.1f }, 128765 );
}
void vg_ui(void)
{
- //ui_test();
+ ui_test();
}
projects / fishladder.git / blobdiff