"level3",
"level4",
"level5",
- "level6"
+ "level6",
+ "level7_combine",
+ "xor_small"
};
#pragma pack(push,1)
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_TARGETED 0x400
/*
0000 0 | 0001 1 | 0010 2 | 0011 3
struct world
{
+#pragma pack(push,1)
struct cell
{
- u32 state;
+ u16 state;
+ u16 links[2];
u8 config;
+ u8 pad0;
}
*data;
+#pragma pack(pop)
- u32 frame;
+ int frame;
- u32 sim_frame;
+ int initialzed;
+
+ int sim_frame;
float sim_start;
int simulating;
- u32 sim_run;
+ int sim_run, max_runs;
float frame_lerp;
world.score = 0;
world.time = 0;
world.completed = 0;
+ world.max_runs = 0;
+ world.initialzed = 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 ];
{
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
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 );
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 );
}
}
}
+ 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 );
}
}
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 )
{
+ vg_info( "Loading map: '%s'\n", map_path );
+ world.ptr_career_level = NULL;
+
if( !map_load( text_source, argv[0] ) )
- map_free();
+ {
+ free( text_source );
+ return 0;
+ }
free( text_source );
- // Update career link
- world.ptr_career_level = NULL;
-
for( int i = 0; i < vg_list_size( level_pack_1 ); i ++ )
{
if( !strcmp( level_pack_1[i], argv[0] ) )
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
});
}
}
+
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.8f},{0.5f,0.5f},{0.5f,0.3f},{0.5f,0.0f}};
world.tile_x = floorf( world.tile_pos[0] );
world.tile_y = floorf( world.tile_pos[1] );
+ static u16 id_drag_from = 0;
+ static v2f drag_from_co;
+ static v2f drag_to_co;
+
// 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;
{
cell_ptr->state &= ~FLAG_CANAL;
cell_ptr->state |= modify_state;
-
+
if( cell_ptr->state & FLAG_CANAL )
{
sfx_set_playrnd( &audio_tile_mod, &audio_system_sfx, 3, 6 );
}
else
{
+ if( cell_ptr->state & (FLAG_IS_TRIGGER|FLAG_TARGETED) )
+ {
+ cell_ptr->state &= ~(FLAG_IS_TRIGGER|FLAG_TARGETED);
+ for( u32 i = 0; i < 2; i ++ )
+ {
+ if( cell_ptr->links[i] )
+ {
+ struct cell *other_ptr = &world.data[ cell_ptr->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);
+ }
+ }
+ }
+
sfx_set_playrnd( &audio_tile_mod, &audio_system_sfx, 0, 3 );
world.score --;
}
+
+ cell_ptr->links[0] = 0;
+ cell_ptr->links[1] = 0;
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 )
+ {
+ vg_line2( drag_from_co, drag_to_co, 0xff00ff00, 0xffffff00 );
+ }
+ else
+ {
+ 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;
for( int i = 0; i < world.w*world.h; i ++ )
world.data[ i ].state &= ~FLAG_FLIP_FLOP;
fish->dir[0] = cell_current->state&FLAG_FLIP_FLOP?1:-1;
fish->dir[1] = 0;
- cell_current->state ^= FLAG_FLIP_FLOP;
+ if( !(cell_current->state & FLAG_TARGETED) )
+ cell_current->state ^= FLAG_FLIP_FLOP;
}
else if( cell_current->config == k_cell_type_merge )
{
{
// Try other directions for valid, so down, left, right..
v2i dirs[] = {{1,0},{-1,0},{0,-1}};
- vg_info( "Trying some other directions...\n" );
+ //vg_info( "Trying some other directions...\n" );
for( int j = 0; j < vg_list_size(dirs); j ++ )
{
sfx_set_playrnd( &audio_splitter, &audio_system_balls_important, 0, 1 );
cell_entry->state |= FLAG_FLIP_ROTATING;
}
+
+ if( cell_entry->state & FLAG_IS_TRIGGER )
+ {
+ int trigger_id = cell_entry->links[0]?0:1;
+ int connection_id = cell_entry->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_entry->links[trigger_id] ];
+
+ if( trigger_id )
+ target_peice->state |= FLAG_FLIP_FLOP;
+ else
+ target_peice->state &= ~FLAG_FLIP_FLOP;
+ }
}
if( fish->alive )
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;
+ 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
{
else
curve = curve_9;
break;
+ case 1: curve = curve_1; break;
+ case 4: curve = curve_4; break;
case 2: curve = curve_2; break;
case 8: curve = curve_8; break;
case 3: curve = curve_3; break;
{
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->state & FLAG_IS_TRIGGER )
{
- if( (world.frame_lerp > curve_7_linear_section) )
+ 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 midpoint;
+ 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;
+ v2_add( startpoint, endpoint, midpoint );
+ v2_muls( midpoint, 0.5f, midpoint );
+ midpoint[1] += -0.8f;
+
+ float t, ta;
+ v2f lastpoint; v2f curpoint;
+ v2_copy( startpoint, lastpoint );
+
+ for( int i = 0; i < 10; i ++ )
{
- float const rotation_speed = 0.4f;
- if( (world.frame_lerp < 1.0f-rotation_speed) )
+ t = ((float)i+1.f)/10.0f;
+ ta = 1.0f-t;
+
+ v2_muls( startpoint, ta*ta, curpoint );
+ v2_muladds( curpoint, midpoint, 2.0f*ta*t, curpoint );
+ v2_muladds( curpoint, endpoint, t*t, curpoint );
+
+ vg_line2( lastpoint, curpoint, 0xff444444, 0xff444444 );
+ v2_copy( curpoint, lastpoint );
+ }
+ }
+
+ if( cell->config == k_cell_type_split )
+ {
+ float rotation = cell->state & FLAG_FLIP_FLOP? vg_rad( -45.0f ): vg_rad( 45.0f );
+
+ if( cell->state & FLAG_FLIP_ROTATING )
+ {
+ 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 );
+ }
}
}
}
v4f dot_colour = { 0.0f, 0.0f, 0.0f, 1.0f };
- // TODO: Iterate runs
- for( int j = 0; j < term->runs[0].condition_count; 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->runs[0].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 )
+ draw_mesh( empty_start, empty_count );
+ else
+ draw_mesh( filled_start, filled_count );
+ }
else
- draw_mesh( filled_start, filled_count );
- }
- else
- {
- if( term->runs[0].recv_count > j )
{
- colour_code_v3( term->runs[0].recieved[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->runs[0].conditions[j], dot_colour );
- glUniform4fv( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 1, dot_colour );
-
- draw_mesh( empty_start, empty_count );
}
}
}
projects / fishladder.git / blobdiff