#define FLAG_INPUT 0x10
#define FLAG_OUTPUT 0x20
#define FLAG_WALL 0x40
+#define FLAG_EMITTER 0x80
#define FLAG_FLIP_FLOP 0x100
#define FLAG_TRIGGERED 0x200
int is_linear;
v2f trigger_pos;
+ enum sprites_auto_combine_index trigger_sprite;
}
cell_descriptions[] =
{
// 0-3
{},
- { .start = { 1, 0 }, .end = { -1, 0 }, .trigger_pos = { 0.5f, 0.25f } },
- { .start = { 0, 1 }, .end = { 0, -1 }, .trigger_pos = { 0.25f, 0.5f } },
- { .start = { 0, 1 }, .end = { 1, 0 }, .trigger_pos = { 0.25f, 0.25f } },
+ { .start = { 1, 0 }, .end = { -1, 0 }, .trigger_pos = { 0.5f, 0.25f }, .trigger_sprite = k_sprite_brk_d },
+ { .start = { 0, 1 }, .end = { 0, -1 }, .trigger_pos = { 0.25f, 0.5f }, .trigger_sprite = k_sprite_brk_l },
+ { .start = { 0, 1 }, .end = { 1, 0 }, .trigger_pos = { 0.25f, 0.5f }, .trigger_sprite = k_sprite_brk_l },
// 4-7
- { .start = { -1, 0 }, .end = { 1, 0 }, .trigger_pos = { 0.5f, 0.25f } },
- { .start = { -1, 0 }, .end = { 1, 0 }, .trigger_pos = { 0.5f, 0.25f }, .is_linear = 1 },
- { .start = { 0, 1 }, .end = { -1, 0 }, .trigger_pos = { 0.5f, 0.25f } },
+ { .start = { -1, 0 }, .end = { 1, 0 }, .trigger_pos = { 0.5f, 0.25f }, .trigger_sprite = k_sprite_brk_d },
+ { .start = { -1, 0 }, .end = { 1, 0 }, .trigger_pos = { 0.5f, 0.25f }, .trigger_sprite = k_sprite_brk_d, .is_linear = 1 },
+ { .start = { 0, 1 }, .end = { -1, 0 }, .trigger_pos = { 0.5f, 0.25f }, .trigger_sprite = k_sprite_brk_d },
{ .start = { 0, 1 }, .is_special = 1 },
// 8-11
- { .start = { 0, -1 }, .end = { 0, 1 }, .trigger_pos = { 0.25f, 0.5f } },
- { .start = { 1, 0 }, .end = { 0, -1 }, .trigger_pos = { 0.25f, 0.75f } },
- { .start = { 0, 1 }, .end = { 0, -1 }, .trigger_pos = { 0.25f, 0.5f }, .is_linear = 1 },
+ { .start = { 0, -1 }, .end = { 0, 1 }, .trigger_pos = { 0.25f, 0.5f }, .trigger_sprite = k_sprite_brk_l },
+ { .start = { 1, 0 }, .end = { 0, -1 }, .trigger_pos = { 0.25f, 0.5f }, .trigger_sprite = k_sprite_brk_l },
+ { .start = { 0, 1 }, .end = { 0, -1 }, .trigger_pos = { 0.25f, 0.5f }, .trigger_sprite = k_sprite_brk_l, .is_linear = 1 },
{ },
// 12-15
- { .start = { -1, 0 }, .end = { 0, -1 }, .trigger_pos = { 0.75f, 0.75f } },
- { .end = { 0, -1 }, .is_special = 1, .trigger_pos = { 0.5f, 0.75f } },
+ { .start = { -1, 0 }, .end = { 0, -1 }, .trigger_pos = { 0.5f, 0.75f }, .trigger_sprite = k_sprite_brk_u },
+ { .end = { 0, -1 }, .is_special = 1, .trigger_pos = { 0.5f, 0.75f }, .trigger_sprite = k_sprite_brk_u },
{ },
{ }
};
}
st;
-#pragma pack(push,1)
struct cell
{
u16 state;
u16 links[2];
u8 config;
- u8 pad0;
+ i8 emit[2];
}
*data;
-#pragma pack(pop)
+
+ struct render_cmd
+ {
+ struct cell *ptr;
+ v2i pos;
+ }
+ *cmd_buf_tiles, *cmd_buf_specials;
+
+ u32 tile_count, tile_special_count, max_commands;
int initialzed;
int sim_run, max_runs;
{
struct terminal_run
{
- char conditions[8];
- char recieved[8];
+ i8 steps[8];
+ i8 recieved[8];
- int condition_count, recv_count;
+ int step_count, recv_count;
}
runs[8];
v2i pos;
v2i dir;
enum e_fish_state state;
- char payload;
+ i8 colour;
int flow_reversed;
float death_time;
v2f physics_v;
v2f physics_co;
}
- fishes[16];
+ fishes[64];
int num_fishes;
// Utility functions
// -----------------
-static void colour_code_v3( char const cc, v3f target );
+static void colour_code_v3( i8 cc, v3f target );
static int hash21i( v2i p, u32 umod );
// Mesh functions
static void map_free(void);
static void io_reset(void);
static struct cell *pcell( v2i pos );
+static void lcell( int id, v2i pos );
static void map_reclassify( v2i start, v2i end, int update_texbuffer );
static u32 gen_text_buffer( const char *str, struct sdf_font *font, v2f origin, float size, u32 start );
static void gen_level_text( struct cmp_level *pLevel );
// -------------
static void simulation_stop(void);
static void simulation_start(void);
-static int world_check_pos_ok( v2i co );
+static int world_check_pos_ok( v2i co, int dist );
static int cell_interactive( v2i co );
void vg_update(void);
-static void render_tiles( v2i start, v2i end, v4f const regular_colour, v4f const selected_colour );
+static void render_tiles( v4f const regular_colour, v4f const selected_colour );
+static void render_tile_block( v2i start, v2i end, v4f const regular_colour, v4f const selected_colour );
void vg_render(void);
void vg_ui(void);
// ===========================================================================================================
static int colour_set_id = 0;
+static int world_theme_id = 0;
static v3f colour_sets[][4] =
{
},
};
-static void colour_code_v3( char const cc, v3f target )
+static struct world_theme
{
- if( cc >= 'a' && cc <= 'z' )
- {
- int id = cc - 'a';
-
- if( id < vg_list_size( colour_sets[0] ) )
- {
- v3_copy( colour_sets[colour_set_id][ id ], target );
- return;
- }
- }
+ const char *name;
+ v3f col_shadow;
+
+ vg_tex2d *tex_tiles;
+}
+world_themes[] =
+{
+ {
+ "Wood",
+ { 0.89f, 0.8f, 0.7f },
+ &tex_tiles_wood
+ },
+ {
+ "Minimal",
+ { 0.8f, 0.8f, 0.8f },
+ &tex_tiles_min
+ },
+ {
+ "Lab",
+ { 0.7f, 0.7f, 0.7f },
+ &tex_tiles_lab
+ }
+};
+
+static void colour_code_v3( i8 cc, v3f target )
+{
+ if( (cc >= 0) && (cc < vg_list_size( colour_sets[0] )) )
+ {
+ v3_copy( colour_sets[colour_set_id][ cc ], target );
+ return;
+ }
+ vg_error( "Invalid colour code used '%d'\n", (int)cc );
v3_copy( (v3f){0.0f,0.0f,0.0f}, target );
}
{
arrfree( world.data );
arrfree( world.io );
-
+
+ free( world.cmd_buf_tiles );
+ world.cmd_buf_tiles = NULL;
+
world.w = 0;
world.h = 0;
world.data = NULL;
return &world.data[ pos[1]*world.w + pos[0] ];
}
+static void lcell( int id, v2i pos )
+{
+ pos[0] = id % world.w;
+ pos[1] = (id - pos[0]) / world.w;
+}
+
static void map_reclassify( v2i start, v2i end, int update_texbuffer )
{
v2i full_start = { 1,1 };
u8 height = 0;
u8 config = 0x00;
- if( cell->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT) )
+ if( cell->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT|FLAG_EMITTER) )
{
for( int i = 0; i < vg_list_size( dirs ); i ++ )
{
struct cell *neighbour = pcell((v2i){x+dirs[i][0], y+dirs[i][1]});
- if( neighbour->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT) )
+ if( neighbour->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT|FLAG_EMITTER) )
config |= 0x1 << i;
}
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))
+ ((cell->state & FLAG_TARGETED) && ((cell->config != k_cell_type_split) && !(cell->state & FLAG_EMITTER)))
) && update_texbuffer
){
cell->state &= ~(FLAG_TARGETED|FLAG_IS_TRIGGER);
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;
struct terminal_run *run = &terminal->runs[ terminal->run_count-1 ];
if( (*c >= 'a' && *c <= 'z') || *c == ' ' )
- {
- run->conditions[ run->condition_count ++ ] = *c;
+ {
+ i8 code = -1;
+ if( *c != ' ' )
+ code = *c - 'a';
+
+ run->steps[ run->step_count ++ ] = code;
}
else
{
}
else if( *c == ':' )
{
- terminal->runs[ terminal->run_count ].condition_count = 0;
+ terminal->runs[ terminal->run_count ].step_count = 0;
terminal->run_count ++;
world.max_runs = vg_max( world.max_runs, terminal->run_count );
}
struct cell *cell = &row[ cx ];
cell->config = 0xF;
- if( *c == '+' || *c == '-' )
+ cell->links[0] = 0;
+ cell->links[1] = 0;
+
+ if( *c == '+' || *c == '-' || *c == '*' )
{
struct cell_terminal *term = arraddnptr( world.io, 1 );
term->pos[0] = cx;
term->pos[1] = world.h;
term->run_count = 1;
- term->runs[0].condition_count = 0;
+ term->runs[0].step_count = 0;
+
+ switch( *c )
+ {
+ case '+': cell->state = FLAG_INPUT; break;
+ case '-': cell->state = FLAG_OUTPUT; break;
+ case '*': cell->state = FLAG_EMITTER; break;
+ }
- cell->state = *c == '+'? FLAG_INPUT: FLAG_OUTPUT;
reg_end ++;
}
else if( *c == '#' ) cell->state = FLAG_WALL;
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;
c ++;
}
+
+ // Assign emitter codes
+ for( int i = 0; i < arrlen( world.io ); i ++ )
+ {
+ struct cell_terminal *term = &world.io[i];
+ struct cell *cell = pcell( term->pos );
+
+ if( cell->state & FLAG_EMITTER )
+ {
+ if( (term->run_count > 0) && (term->runs[0].step_count >= 2) )
+ {
+ cell->emit[0] = term->runs[0].steps[0];
+ cell->emit[1] = term->runs[0].steps[1];
+ }
+ else
+ {
+ vg_error( "Emitter was not assigned emit values\n" );
+ goto IL_REG_ERROR;
+ }
+ }
+ }
// Update data texture to fill out the background
{
turtle[1] = 16+term->pos[1];
turtle_dir[0] = 0;
- turtle_dir[1] = pcell(term->pos)->state & FLAG_INPUT? 1: -1;
+ turtle_dir[1] = pcell(term->pos)->state & (FLAG_INPUT|FLAG_EMITTER)? 1: -1;
original_y = turtle_dir[1];
info_buffer[((turtle[1]*64)+turtle[0])*4] = 0;
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->state & FLAG_CANAL) && (target->config == k_cell_type_split))
+ || (target->state & FLAG_EMITTER) )
{
if( target->links[ link_id ] )
{
}
}
+ // ==========================================================
+ // Successful load
+
vg_success( "Map '%s' loaded! (%u:%u)\n", name, world.w, world.h );
io_reset();
btn->position[1] = world.h -i -2;
}
+ // Allocate buffers for render commands
+ world.cmd_buf_tiles = malloc( world.w*world.h* sizeof( struct render_cmd ) );
+ world.max_commands = world.w*world.h;
+
return 1;
IL_REG_ERROR:
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_EMITTER ) 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 );
{
struct terminal_run *run = &term->runs[j];
- for( int k = 0; k < run->condition_count; k ++ )
- fputc( run->conditions[k], stream );
+ for( int k = 0; k < run->step_count; k ++ )
+ {
+ i8 step = run->steps[k];
+ fputc( step == -1? ' ': ('a' + run->steps[k]), stream );
+ }
if( j < term->run_count-1 )
fputc( ':', stream );
}
}
-static int world_check_pos_ok( v2i co )
+static int world_check_pos_ok( v2i co, int dist )
{
- return (co[0] < 2 || co[0] >= world.w-2 || co[1] < 2 || co[1] >= world.h-2)? 0: 1;
+ return (co[0] < dist || co[0] >= world.w-dist || co[1] < dist || co[1] >= world.h-dist)? 0: 1;
}
static int cell_interactive( v2i co )
{
+ struct cell *cell;
+
// Bounds check
- if( !world_check_pos_ok( co ) )
+ if( world_check_pos_ok( co, 1 ) )
+ {
+ cell = pcell( co );
+ if( cell->state & FLAG_EMITTER )
+ return 1;
+ }
+
+ if( !world_check_pos_ok( co, 2 ) )
return 0;
// Flags check
- if( world.data[ world.w*co[1] + co[0] ].state & (FLAG_WALL|FLAG_INPUT|FLAG_OUTPUT) )
+ if( cell->state & (FLAG_WALL|FLAG_INPUT|FLAG_OUTPUT) )
return 0;
// List of 3x3 configurations that we do not allow
{
struct cell *cell = pcell((v2i){x,y});
- if( cell && (cell->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT)) )
+ if( cell && (cell->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT|FLAG_EMITTER)) )
blob |= 0x1 << ((y-(co[1]-2))*5 + x-(co[0]-2));
}
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") )
- modify_state = (cell_ptr->state & FLAG_CANAL) ^ FLAG_CANAL;
-
- if( vg_get_button("primary") && ((cell_ptr->state & FLAG_CANAL) != modify_state) )
+
+ if( !(cell_ptr->state & FLAG_EMITTER) )
{
- cell_ptr->state &= ~FLAG_CANAL;
- cell_ptr->state |= modify_state;
+ if( vg_get_button_down("primary") )
+ modify_state = (cell_ptr->state & FLAG_CANAL) ^ FLAG_CANAL;
- if( cell_ptr->state & FLAG_CANAL )
+ if( vg_get_button("primary") && ((cell_ptr->state & FLAG_CANAL) != modify_state) )
{
- cell_ptr->links[0] = 0;
- cell_ptr->links[1] = 0;
+ cell_ptr->state &= ~FLAG_CANAL;
+ cell_ptr->state |= modify_state;
- 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 --;
- }
+ 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 },
+ 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->state & FLAG_CANAL) && !(cell_ptr->config == k_cell_type_split) )
- {
- world.id_drag_from = world.selected;
-
- struct cell_description *desc = &cell_descriptions[ world.data[world.id_drag_from].config ];
- v2_add( desc->trigger_pos, (v2f){ world.tile_x, world.tile_y }, world.drag_from_co );
+ }
+
+ if( vg_get_button_down("secondary") && (cell_ptr->state & FLAG_CANAL) && !(cell_ptr->config == k_cell_type_split) )
+ {
+ world.id_drag_from = world.selected;
+
+ struct cell_description *desc = &cell_descriptions[ world.data[world.id_drag_from].config ];
+ v2_add( desc->trigger_pos, (v2f){ world.tile_x, world.tile_y }, world.drag_from_co );
+ }
}
float local_x = vg_mouse_ws[0] - (float)world.tile_x;
world.id_drag_from = 0;
}
- else if( world.id_drag_from && (cell_ptr->state & FLAG_CANAL) && (cell_ptr->config == k_cell_type_split) )
+ else if( world.id_drag_from && (cell_ptr->state & (FLAG_CANAL|FLAG_EMITTER)) &&
+ ((cell_ptr->config == k_cell_type_split) || (cell_ptr->state & FLAG_EMITTER)) )
{
world.drag_to_co[0] = (float)world.tile_x + (local_x > 0.5f? 0.75f: 0.25f);
world.drag_to_co[1] = (float)world.tile_y + 0.25f;
current_connection->state &= ~FLAG_IS_TRIGGER;
current_connection->links[ link_id ] = 0;
}
-
- if( drag_ptr->links[ link_id ^ 0x1 ] )
+
+ for( u32 i = 0; i < 2; i ++ )
{
- 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;
+ if( drag_ptr->links[ i ] )
+ {
+ vg_warn( "Destroying link %u (%hu)\n", i, drag_ptr->links[ i ] );
+
+ struct cell *current_connection = &world.data[ drag_ptr->links[ i ]];
+ if( current_connection->links[ i ^ 0x1 ] == 0 )
+ current_connection->state &= ~FLAG_TARGETED;
+
+ current_connection->links[ i ] = 0;
+ drag_ptr->links[ i ] = 0;
+ }
}
// Create the new connection
{
cell->state &= ~FLAG_FLIP_ROTATING;
}
- if( cell->state & FLAG_IS_TRIGGER )
+ if( cell->state & (FLAG_IS_TRIGGER|FLAG_EMITTER) )
cell->state &= ~FLAG_TRIGGERED;
}
struct terminal_run *run = &term->runs[ world.sim_run ];
if( run->recv_count < vg_list_size( run->recieved ) )
{
- if( fish->payload == run->conditions[ run->recv_count ] )
+ if( fish->colour == run->steps[ run->recv_count ] )
success_this_frame = 1;
else
failure_this_frame = 1;
- run->recieved[ run->recv_count ++ ] = fish->payload;
+ run->recieved[ run->recv_count ++ ] = fish->colour;
}
else
failure_this_frame = 1;
}
else
{
- if( world_check_pos_ok( fish->pos ) )
+ if( world_check_pos_ok( fish->pos, 2 ) )
fish->state = k_fish_state_bg;
else
{
{
v2i_add( fish->pos, fish->dir, fish->pos );
- if( !world_check_pos_ok( fish->pos ) )
+ if( !world_check_pos_ok( fish->pos, 2 ) )
{
fish->state = k_fish_state_dead;
fish->death_time = -1000.0f;
{
struct fish *fish = &world.fishes[i];
+ // Apply movement
if( fish->state == k_fish_state_alive )
- {
v2i_add( fish->pos, fish->dir, fish->pos );
+
+ if( fish->state == k_fish_state_alive || fish->state == k_fish_state_soon_alive )
+ {
struct cell *cell_current = pcell( fish->pos );
if( cell_current->state & FLAG_IS_TRIGGER )
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;
+ // Spawn new marble
+ if( (target_peice->state & FLAG_EMITTER) && !(target_peice->state & FLAG_TRIGGERED))
+ {
+ struct fish *fish = &world.fishes[ world.num_fishes ];
+ lcell( cell_current->links[trigger_id], fish->pos );
+
+ fish->state = k_fish_state_soon_alive;
+ fish->colour = target_peice->emit[ trigger_id ];
+
+ if( target_peice->config != k_cell_type_stub )
+ {
+ struct cell_description *desc = &cell_descriptions[ target_peice->config ];
+ v2i_copy( desc->start, fish->dir );
+ fish->flow_reversed = 1;
+
+ world.num_fishes ++;
+ alive_count ++;
+ }
+ }
else
- target_peice->state &= ~FLAG_FLIP_FLOP;
+ {
+ if( trigger_id )
+ target_peice->state |= FLAG_FLIP_FLOP;
+ else
+ target_peice->state &= ~FLAG_FLIP_FLOP;
+ }
+
+ cell_current->state |= FLAG_TRIGGERED;
}
}
}
if( is_input )
{
- if( world.sim_frame < term->runs[ world.sim_run ].condition_count )
+ if( world.sim_frame < term->runs[ world.sim_run ].step_count )
{
- char emit = term->runs[ world.sim_run ].conditions[ world.sim_frame ];
- if( emit == ' ' )
+ i8 emit = term->runs[ world.sim_run ].steps[ world.sim_frame ];
+ if( emit == -1 )
continue;
struct fish *fish = &world.fishes[ world.num_fishes ];
v2i_copy( term->pos, fish->pos );
fish->state = k_fish_state_alive;
- fish->payload = emit;
+ fish->colour = emit;
struct cell *cell_ptr = pcell( fish->pos );
for( int i = 0; i < arrlen( world.io ); i ++ )
{
struct cell_terminal *term = &world.io[ i ];
- int is_input = pcell(term->pos)->state & FLAG_INPUT;
- if( !is_input )
+ if( pcell(term->pos)->state & FLAG_OUTPUT )
{
struct terminal_run *run = &term->runs[ world.sim_run ];
- if( run->recv_count == run->condition_count )
+ if( run->recv_count == run->step_count )
{
- for( int j = 0; j < run->condition_count; j ++ )
+ for( int j = 0; j < run->step_count; j ++ )
{
- if( run->recieved[j] != run->conditions[j] )
+ if( run->recieved[j] != run->steps[j] )
{
world.completed = 0;
break;
}
}
-static void render_tiles( v2i start, v2i end, v4f const regular_colour, v4f const selected_colour )
+static void render_tile( v2i pos, struct cell *ptr, v4f const regular_colour, v4f const selected_colour )
+{
+ int selected = world.selected == pos[1]*world.w + pos[0];
+
+ int tile_offsets[][2] =
+ {
+ {2, 0}, {0, 3}, {0, 2}, {2, 2},
+ {1, 0}, {2, 3}, {3, 2}, {1, 3},
+ {3, 1}, {0, 1}, {1, 2}, {2, 1},
+ {1, 1}, {3, 3}, {2, 1}, {2, 1}
+ };
+
+ int uv[2];
+
+ uv[0] = tile_offsets[ ptr->config ][0];
+ uv[1] = tile_offsets[ ptr->config ][1];
+
+ glUniform4f( SHADER_UNIFORM( shader_tile_main, "uOffset" ),
+ (float)pos[0],
+ (float)pos[1],
+ uv[0],
+ uv[1]
+ );
+
+ if( selected )
+ {
+ glUniform4fv( SHADER_UNIFORM( shader_tile_main, "uColour" ), 1, selected_colour );
+ draw_mesh( 0, 2 );
+ glUniform4fv( SHADER_UNIFORM( shader_tile_main, "uColour" ), 1, regular_colour );
+ }
+ else
+ draw_mesh( 0, 2 );
+}
+
+// Renders specific chunk of tiles
+static void render_tile_block( v2i start, v2i end, v4f const regular_colour, v4f const selected_colour )
{
v2i full_start = { 0,0 };
v2i full_end = { world.w, world.h };
start = full_start;
end = full_end;
}
-
- glUniform4fv( SHADER_UNIFORM( shader_tile_main, "uColour" ), 1, regular_colour );
for( int y = start[1]; y < end[1]; y ++ )
{
for( int x = start[0]; x < end[0]; x ++ )
{
- struct cell *cell = pcell((v2i){x,y});
- int selected = world.selected == y*world.w + x;
-
- int tile_offsets[][2] =
- {
- {2, 0}, {0, 3}, {0, 2}, {2, 2},
- {1, 0}, {2, 3}, {3, 2}, {1, 3},
- {3, 1}, {0, 1}, {1, 2}, {2, 1},
- {1, 1}, {3, 3}, {2, 1}, {2, 1}
- };
-
- int uv[2] = { 3, 0 };
-
- if( cell->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT) )
- {
- uv[0] = tile_offsets[ cell->config ][0];
- uv[1] = tile_offsets[ cell->config ][1];
- } else continue;
-
- glUniform4f( SHADER_UNIFORM( shader_tile_main, "uOffset" ), (float)x, (float)y, uv[0], uv[1] );
- if( selected )
- {
- glUniform4fv( SHADER_UNIFORM( shader_tile_main, "uColour" ), 1, selected_colour );
- draw_mesh( 0, 2 );
- glUniform4fv( SHADER_UNIFORM( shader_tile_main, "uColour" ), 1, regular_colour );
- }
- else
- draw_mesh( 0, 2 );
+ v2i pos = { x, y };
+ struct cell *cell = pcell( pos );
+
+ if( cell->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT|FLAG_EMITTER) )
+ render_tile( pos, cell, regular_colour, selected_colour );
+ }
+ }
+}
+
+// Renders all tiles in the command list
+static void render_tiles( v4f const regular_colour, v4f const selected_colour )
+{
+ glUniform4fv( SHADER_UNIFORM( shader_tile_main, "uColour" ), 1, regular_colour );
+
+ struct render_list
+ {
+ struct render_cmd *arr;
+ u32 count;
+ }
+ render_lists[] = {
+ { world.cmd_buf_tiles, world.tile_count },
+ { world.cmd_buf_specials, world.tile_special_count }
+ };
+
+ for( int i = 0; i < vg_list_size( render_lists ); i ++ )
+ {
+ struct render_list *list = &render_lists[i];
+ for( int j = 0; j < list->count; j ++ )
+ {
+ struct render_cmd *cmd = &list->arr[j];
+ struct cell *cell = cmd->ptr;
+
+ render_tile( cmd->pos, cell, regular_colour, selected_colour );
}
}
}
}
}
+static void render_sprite( enum sprites_auto_combine_index id, v3f pos )
+{
+ struct vg_sprite *sp = &sprites_auto_combine[ id ];
+
+ glUniform4fv( SHADER_UNIFORM( shader_sprite, "uUv" ), 1, sp->uv_xywh );
+ glUniform3f( SHADER_UNIFORM( shader_sprite, "uPos" ), pos[0], pos[1], pos[2] * world.st.world_transition );
+
+ draw_mesh( 0, 2 );
+}
+
void vg_render(void)
{
glViewport( 0,0, vg_window_x, vg_window_y );
int const empty_start = circle_base+32;
int const empty_count = circle_base+32*2;
+ struct world_theme *theme = &world_themes[ world_theme_id ];
+
if( !world.initialzed )
return;
+
+ // Extract render commands
+ world.tile_count = 0;
+ world.tile_special_count = 0;
+
+ for( int y = 1; y < world.h-1; y ++ )
+ {
+ for( int x = 1; x < world.w-1; x ++ )
+ {
+ struct cell *cell = pcell((v2i){x,y});
+
+ if( cell->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT|FLAG_EMITTER) )
+ {
+ struct render_cmd *cmd;
+
+ if( cell->config == k_cell_type_split || (cell->state & FLAG_EMITTER || cell->state & FLAG_IS_TRIGGER) )
+ cmd = &world.cmd_buf_tiles[ world.max_commands - (++ world.tile_special_count) ];
+ else
+ cmd = &world.cmd_buf_tiles[ world.tile_count ++ ];
+
+ cmd->pos[0] = x;
+ cmd->pos[1] = y;
+ cmd->ptr = cell;
+ }
+ }
+ }
+
+ world.cmd_buf_specials = &world.cmd_buf_tiles[ world.max_commands - world.tile_special_count ];
// BACKGROUND
// ========================================================================================================
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glBlendEquation(GL_FUNC_ADD);
- // Bind textures
+ // rebind textures
vg_tex2d_bind( &tex_tile_data, 0 );
- glUniform1i( SHADER_UNIFORM( shader_tile_main, "uTexGlyphs" ), 0 );
-
- vg_tex2d_bind( &tex_wood, 1 );
- glUniform1i( SHADER_UNIFORM( shader_tile_main, "uTexWood" ), 1 );
-
- render_tiles( NULL, NULL, colour_default, colour_default );
+ vg_tex2d_bind( theme->tex_tiles, 1 );
+
+ glUniform3fv( SHADER_UNIFORM( shader_tile_main, "uShadowing" ), 1, theme->col_shadow );
+
+ render_tiles( colour_default, colour_default );
// MARBLES
// ========================================================================================================
v2_copy( fish->physics_co, render_pos );
v4f dot_colour = { 0.0f, 0.0f, 0.0f, 1.0f };
- colour_code_v3( fish->payload, dot_colour );
+ colour_code_v3( fish->colour, dot_colour );
glUniform3fv( SHADER_UNIFORM( shader_ball, "uColour" ), 1, dot_colour );
glUniform3fv( SHADER_UNIFORM( shader_ball, "uOffset" ), 1, render_pos );
vg_tex2d_bind( &tex_tile_data, 0 );
glUniform1i( SHADER_UNIFORM( shader_tile_main, "uTexGlyphs" ), 0 );
- vg_tex2d_bind( &tex_wood, 1 );
+ // TODO: is this needed to be rebinded?
+ vg_tex2d_bind( theme->tex_tiles, 1 );
glUniform1i( SHADER_UNIFORM( shader_tile_main, "uTexWood" ), 1 );
glUniform1f( SHADER_UNIFORM( shader_tile_main, "uForeground" ), 1.0f );
- render_tiles( NULL, NULL, colour_default, colour_selected );
+ render_tiles( colour_default, colour_selected );
// Draw splitters
- for( int y = 2; y < world.h-2; y ++ )
+ for( int i = 0; i < world.tile_special_count; i ++ )
{
- for( int x = 2; x < world.w-2; x ++ )
- {
- struct cell *cell = pcell((v2i){x,y});
+ struct render_cmd *cmd = &world.cmd_buf_specials[i];
+ struct cell *cell = cmd->ptr;
- if( cell->state & FLAG_CANAL )
+ 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( 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 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;
- }
+ 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;
}
-
- 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,
- cell->state & FLAG_TARGETED? 3.0f: 0.0f,
- 0.0f
- );
- draw_mesh( 0, 2 );
+ else
+ rotation *= -1.0f;
}
}
+
+ 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)cmd->pos[0],
+ (float)cmd->pos[1] + 0.125f,
+ cell->state & FLAG_TARGETED? 3.0f: 0.0f,
+ 0.0f
+ );
+ draw_mesh( 0, 2 );
}
}
glUniformMatrix2fv( SHADER_UNIFORM( shader_tile_main, "uSubTransform" ), 1, GL_FALSE, (float *)subtransform );
glUniform2fv( SHADER_UNIFORM( shader_tile_main, "uMousePos" ), 1, world.tile_pos );
- render_tiles( new_begin, new_end, colour_default, colour_default );
+ render_tile_block( new_begin, new_end, colour_default, colour_default );
world.data[ world.selected ].state ^= FLAG_CANAL;
map_reclassify( new_begin, new_end, 0 );
if( vg_get_button_up( "primary" ) )
world_button_exec( NULL, NULL, NULL, NULL );
-
- // TEXT ELEMENTS
- // ========================================================================================================
- SHADER_USE( shader_sdf );
- glBindVertexArray( text_buffers.vao );
- glUniformMatrix3fv( SHADER_UNIFORM( shader_sdf, "uPv" ), 1, GL_FALSE, (float *)vg_pv );
-
- vg_tex2d_bind( &tex_ubuntu, 0 );
- glUniform1i( SHADER_UNIFORM( shader_sdf, "uTexGlyphs" ), 0 );
-
- glUniform4f( SHADER_UNIFORM( shader_sdf, "uColour" ), 1.0f, 1.0f, 1.0f, 1.0f );
- glDrawElements( GL_TRIANGLES, text_buffers.title_count*6, GL_UNSIGNED_SHORT, (void*)( text_buffers.title_start*6*sizeof(u16) ) );
- glDrawElements( GL_TRIANGLES, text_buffers.desc_count*6, GL_UNSIGNED_SHORT, (void*)( text_buffers.desc_start*6*sizeof(u16) ) );
-
- glUniform4f( SHADER_UNIFORM( shader_sdf, "uColour" ), 1.0f, 1.0f, 1.0f, 0.17f );
- glDrawElements( GL_TRIANGLES, text_buffers.grid_count*6, GL_UNSIGNED_SHORT, (void*)( text_buffers.grid_start*6*sizeof(u16) ) );
-
- // WIRES
- // ========================================================================================================
- //glDisable(GL_BLEND);
-
- SHADER_USE( shader_wire );
- glBindVertexArray( world.wire.vao );
-
- glUniformMatrix3fv( SHADER_UNIFORM( shader_wire, "uPv" ), 1, GL_FALSE, (float *)vg_pv );
-
- v4f const wire_left_colour = { 0.5f, 0.5f, 0.5f, 1.0f };
- v4f const wire_right_colour = { 0.2f, 0.2f, 0.2f, 1.0f };
- v4f const wire_drag_colour = { 0.2f, 0.2f, 0.2f, 0.6f };
-
- glUniform1f( SHADER_UNIFORM( shader_wire, "uTime" ), world.frame_lerp );
- glUniform1f( SHADER_UNIFORM( shader_wire, "uGlow" ), 0.0f );
-
- if( world.id_drag_from )
- {
- glUniform4fv( SHADER_UNIFORM( shader_wire, "uColour" ), 1, wire_drag_colour );
- glUniform1f( SHADER_UNIFORM( shader_wire, "uCurve" ), 0.4f );
- glUniform3f( SHADER_UNIFORM( shader_wire, "uStart" ), world.drag_from_co[0], world.drag_from_co[1], 0.20f );
- glUniform3f( SHADER_UNIFORM( shader_wire, "uEnd" ), world.drag_to_co[0], world.drag_to_co[1], 0.20f );
- glDrawElements( GL_TRIANGLES, world.wire.em, GL_UNSIGNED_SHORT, (void*)(0) );
- }
-
- // Pulling animation
- float rp_x1 = world.frame_lerp*9.0f;
- float rp_xa = rp_x1*expf(1.0f-rp_x1)* 0.36f;
- float rp_x2 = 1.0f-rp_xa;
-
- 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 )
- {
- struct cell_description *desc = &cell_descriptions[ cell->config ];
-
- 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;
- endpoint[1] = y;
-
- v2_add( desc->trigger_pos, endpoint, endpoint );
-
- glUniform4fv( SHADER_UNIFORM( shader_wire, "uColour" ), 1, trigger_id? wire_right_colour: wire_left_colour );
- glUniform1f( SHADER_UNIFORM( shader_wire, "uCurve" ), cell->state & FLAG_TRIGGERED? rp_x2 * 0.4f: 0.4f );
- glUniform1f( SHADER_UNIFORM( shader_wire, "uGlow" ), cell->state & FLAG_TRIGGERED? rp_xa: 0.0f );
- glUniform3f( SHADER_UNIFORM( shader_wire, "uStart" ), startpoint[0], startpoint[1], 0.18f );
- glUniform3f( SHADER_UNIFORM( shader_wire, "uEnd" ), endpoint[0], endpoint[1], 0.18f );
- glDrawElements( GL_TRIANGLES, world.wire.em, GL_UNSIGNED_SHORT, (void*)(0) );
- }
- }
- }
- }
- // WIRE ENDPOINTS
+ // I/O ARRAYS
// ========================================================================================================
+ //glEnable(GL_BLEND);
SHADER_USE( shader_tile_colour );
glUniformMatrix3fv( SHADER_UNIFORM( shader_tile_colour, "uPv" ), 1, GL_FALSE, (float *)vg_pv );
- use_mesh( &world.shapes );
-
- 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 )
- {
- struct cell_description *desc = &cell_descriptions[ cell->config ];
-
- 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 pts[2];
-
- pts[0][0] = (float)x2 + (trigger_id? 0.75f: 0.25f);
- pts[0][1] = (float)y2 + 0.25f;
-
- pts[1][0] = x;
- pts[1][1] = y;
-
- v2_add( desc->trigger_pos, pts[1], pts[1] );
-
- glUniform4fv( SHADER_UNIFORM( shader_tile_colour, "uColour" ),
- 1, trigger_id? wire_right_colour: wire_left_colour );
-
- for( int i = 0; i < 2; i ++ )
- {
- glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ),
- pts[i][0],
- pts[i][1],
- 0.08f
- );
- draw_mesh( filled_start, filled_count );
- }
- }
- }
- }
- }
-
- // SUB SPLITTER DIRECTION
- // ========================================================================================================
-
- glUniform4f( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 0.9f, 0.35f, 0.1f, 0.75f );
-
- 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 && cell->state & FLAG_TARGETED && cell->config == k_cell_type_split )
- {
- glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ), x, y, 1.0f );
- draw_mesh( cell->state & FLAG_FLIP_FLOP? 5: 4, 1 );
- }
- }
- }
-
- // I/O ARRAYS
- // ========================================================================================================
-
- //glEnable(GL_BLEND);
-
for( int i = 0; i < arrlen( world.io ); i ++ )
{
struct cell_terminal *term = &world.io[ i ];
- int is_input = pcell(term->pos)->state & FLAG_INPUT;
+ struct cell *cell = pcell(term->pos);
+ int is_input = cell->state & FLAG_INPUT;
v4f dot_colour = { 0.0f, 0.0f, 0.0f, 1.0f };
+
+ if( cell->state & FLAG_EMITTER )
+ {
+ for( int j = 0; j < 2; j ++ )
+ {
+ if( cell->emit[j] != -1 )
+ {
+ colour_code_v3( cell->emit[j], dot_colour );
+
+ glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ),
+ term->pos[0] + 0.25f + (float)j * 0.5f,
+ term->pos[1] + 0.25f,
+ 0.12f
+ );
+
+ glUniform4fv( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 1, dot_colour );
+ draw_mesh( filled_start, filled_count );
+ }
+ }
+ continue;
+ }
for( int k = 0; k < term->run_count; k ++ )
{
if( bar_draw )
{
glUniform4fv( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 1, bar_colour );
- glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ), (float)term->pos[0], y_position - 0.1f, 1.0f );
+ glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ),
+ (float)term->pos[0], y_position - 0.1f, 1.0f );
+
draw_mesh( 2, 2 );
}
- for( int j = 0; j < term->runs[k].condition_count; j ++ )
+ for( int j = 0; j < term->runs[k].step_count; j ++ )
{
glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ),
(float)term->pos[0] + 0.2f + 0.2f * (float)j,
if( is_input )
{
- char cc = term->runs[k].conditions[j];
- if( cc != ' ' )
+ i8 colour = term->runs[k].steps[j];
+ if( colour != -1 )
{
- colour_code_v3( cc, dot_colour );
+ colour_code_v3( colour, dot_colour );
glUniform4fv( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 1, dot_colour );
// Draw filled if tick not passed, draw empty if empty
draw_mesh( filled_start, filled_count );
}
- colour_code_v3( term->runs[k].conditions[j], dot_colour );
+ colour_code_v3( term->runs[k].steps[j], dot_colour );
glUniform4fv( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 1, dot_colour );
draw_mesh( empty_start, empty_count );
}
}
}
+
+ // SPRITES
+ // ========================================================================================================
+ SHADER_USE( shader_sprite );
+ glUniformMatrix3fv( SHADER_UNIFORM( shader_sprite, "uPv" ), 1, GL_FALSE, (float *)vg_pv );
+
+ vg_tex2d_bind( &tex_sprites, 0 );
+ glUniform1i( SHADER_UNIFORM( shader_sprite, "uTexMain" ), 0 );
+
+ for( int i = 0; i < world.tile_special_count; i ++ )
+ {
+ struct render_cmd *cmd = &world.cmd_buf_specials[i];
+ struct cell *cell = cmd->ptr;
+
+ if( (cell->config == k_cell_type_split) || (cell->state & FLAG_EMITTER) )
+ {
+ v2f center = { cmd->pos[0] + 0.5f, cmd->pos[1] + 0.5f };
+
+ v3f p0 = { 0.0f, 0.0f, 4.0f };
+ v3f p1 = { 0.0f, 0.0f, 4.0f };
+
+ v2_add( center, (v2f){ -0.25f, -0.25f }, p0 );
+ v2_add( center, (v2f){ 0.25f, -0.25f }, p1 );
+
+ render_sprite( k_sprite_jack_1, p0 );
+ render_sprite( k_sprite_jack_2, p1 );
+ }
+ else if( cell->state & FLAG_IS_TRIGGER )
+ {
+ v3f p0 = { 0.0f, 0.0f, 4.0f };
+
+ struct cell_description *desc = &cell_descriptions[ cell->config ];
+
+ v2_add( (v2f){ cmd->pos[0], cmd->pos[1] }, desc->trigger_pos, p0 );
+ render_sprite( desc->trigger_sprite, p0 );
+ }
+ }
+
+ // TEXT ELEMENTS
+ // ========================================================================================================
+ SHADER_USE( shader_sdf );
+ glBindVertexArray( text_buffers.vao );
+ glUniformMatrix3fv( SHADER_UNIFORM( shader_sdf, "uPv" ), 1, GL_FALSE, (float *)vg_pv );
+
+ vg_tex2d_bind( &tex_ubuntu, 0 );
+ glUniform1i( SHADER_UNIFORM( shader_sdf, "uTexGlyphs" ), 0 );
+
+ glUniform4f( SHADER_UNIFORM( shader_sdf, "uColour" ), 1.0f, 1.0f, 1.0f, 1.0f );
+ glDrawElements( GL_TRIANGLES, text_buffers.title_count*6, GL_UNSIGNED_SHORT, (void*)( text_buffers.title_start*6*sizeof(u16) ) );
+ glDrawElements( GL_TRIANGLES, text_buffers.desc_count*6, GL_UNSIGNED_SHORT, (void*)( text_buffers.desc_start*6*sizeof(u16) ) );
+
+ glUniform4f( SHADER_UNIFORM( shader_sdf, "uColour" ), 1.0f, 1.0f, 1.0f, 0.17f );
+ glDrawElements( GL_TRIANGLES, text_buffers.grid_count*6, GL_UNSIGNED_SHORT, (void*)( text_buffers.grid_start*6*sizeof(u16) ) );
+
+ // WIRES
+ // ========================================================================================================
+ //glDisable(GL_BLEND);
+
+ SHADER_USE( shader_wire );
+ glBindVertexArray( world.wire.vao );
+
+ glUniformMatrix3fv( SHADER_UNIFORM( shader_wire, "uPv" ), 1, GL_FALSE, (float *)vg_pv );
+
+ v4f const wire_left_colour = { 0.5f, 0.5f, 0.5f, 1.0f };
+ v4f const wire_right_colour = { 0.2f, 0.2f, 0.2f, 1.0f };
+ v4f const wire_drag_colour = { 0.2f, 0.2f, 0.2f, 0.6f };
+
+ glUniform1f( SHADER_UNIFORM( shader_wire, "uTime" ), world.frame_lerp );
+ glUniform1f( SHADER_UNIFORM( shader_wire, "uGlow" ), 0.0f );
+
+ if( world.id_drag_from )
+ {
+ glUniform4fv( SHADER_UNIFORM( shader_wire, "uColour" ), 1, wire_drag_colour );
+ glUniform1f( SHADER_UNIFORM( shader_wire, "uCurve" ), 0.4f );
+ glUniform3f( SHADER_UNIFORM( shader_wire, "uStart" ), world.drag_from_co[0], world.drag_from_co[1], 0.20f*world.st.world_transition );
+ glUniform3f( SHADER_UNIFORM( shader_wire, "uEnd" ), world.drag_to_co[0], world.drag_to_co[1], 0.20f*world.st.world_transition );
+ glDrawElements( GL_TRIANGLES, world.wire.em, GL_UNSIGNED_SHORT, (void*)(0) );
+ }
+
+ // Pulling animation
+ float rp_x1 = world.frame_lerp*9.0f;
+ float rp_xa = rp_x1*expf(1.0f-rp_x1)* 0.36f;
+ float rp_x2 = 1.0f-rp_xa;
+
+ for( int i = 0; i < world.tile_special_count; i ++ )
+ {
+ struct render_cmd *cmd = &world.cmd_buf_specials[i];
+ struct cell *cell = cmd->ptr;
+
+ if( cell->state & FLAG_TARGETED )
+ {
+ for( int j = 0; j < 2; j ++ )
+ {
+ if( !cell->links[j] )
+ continue;
+
+ struct cell *other_cell = &world.data[ cell->links[ j ]];
+ struct cell_description *desc = &cell_descriptions[ other_cell->config ];
+
+ int x2 = cell->links[j] % world.w;
+ int y2 = (cell->links[j] - x2) / world.w;
+
+ v2f startpoint;
+ v2f endpoint;
+
+ endpoint[0] = (float)cmd->pos[0] + (j? 0.75f: 0.25f);
+ endpoint[1] = (float)cmd->pos[1] + 0.25f;
+
+ startpoint[0] = x2;
+ startpoint[1] = y2;
+
+ v2_add( desc->trigger_pos, startpoint, startpoint );
+
+ if( cmd->ptr->state & FLAG_EMITTER )
+ {
+ v4f wire_colour;
+ colour_code_v3( cmd->ptr->emit[j], wire_colour );
+ wire_colour[3] = 1.0f;
+
+ glUniform4fv( SHADER_UNIFORM( shader_wire, "uColour" ), 1, wire_colour );
+ }
+ else
+ glUniform4fv( SHADER_UNIFORM( shader_wire, "uColour" ), 1, j? wire_right_colour: wire_left_colour );
+
+ glUniform1f( SHADER_UNIFORM( shader_wire, "uCurve" ), other_cell->state & FLAG_TRIGGERED? rp_x2 * 0.4f: 0.4f );
+ glUniform1f( SHADER_UNIFORM( shader_wire, "uGlow" ), other_cell->state & FLAG_TRIGGERED? rp_xa: 0.0f );
+ glUniform3f( SHADER_UNIFORM( shader_wire, "uEnd" ), startpoint[0], startpoint[1], 0.18f*world.st.world_transition );
+ glUniform3f( SHADER_UNIFORM( shader_wire, "uStart" ), endpoint[0], endpoint[1], 0.18f*world.st.world_transition );
+ glDrawElements( GL_TRIANGLES, world.wire.em, GL_UNSIGNED_SHORT, (void*)(0) );
+ }
+ }
+ }
+
+ // WIRE ENDPOINTS
+ // ========================================================================================================
+
+ SHADER_USE( shader_tile_colour );
+ use_mesh( &world.shapes );
+
+ for( int i = 0; i < world.tile_special_count; i ++ )
+ {
+ struct render_cmd *cmd = &world.cmd_buf_specials[i];
+ struct cell *cell = cmd->ptr;
+
+ if( cell->state & FLAG_TARGETED )
+ {
+ for( int j = 0; j < 2; j ++ )
+ {
+ if( !cell->links[j] )
+ continue;
+
+ struct cell *other_cell = &world.data[ cell->links[ j ]];
+ struct cell_description *desc = &cell_descriptions[ other_cell->config ];
+
+ int x2 = cell->links[j] % world.w;
+ int y2 = (cell->links[j] - x2) / world.w;
+
+ v2f pts[2];
+
+ pts[0][0] = (float)cmd->pos[0] + (j? 0.75f: 0.25f);
+ pts[0][1] = (float)cmd->pos[1] + 0.25f;
+
+ pts[1][0] = x2;
+ pts[1][1] = y2;
+
+ v2_add( desc->trigger_pos, pts[1], pts[1] );
+
+ if( cell->state & FLAG_EMITTER )
+ {
+ v4f wire_colour;
+ colour_code_v3( cell->emit[j], wire_colour );
+
+ v3_muls( wire_colour, 0.8f, wire_colour );
+ wire_colour[3] = 1.0f;
+
+ glUniform4fv( SHADER_UNIFORM( shader_wire, "uColour" ), 1, wire_colour );
+ }
+ else
+ glUniform4fv( SHADER_UNIFORM( shader_wire, "uColour" ), 1,j?wire_right_colour: wire_left_colour );
+
+ for( int i = 0; i < 2; i ++ )
+ {
+ glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ),
+ pts[i][0],
+ pts[i][1],
+ 0.08f * world.st.world_transition
+ );
+ draw_mesh( filled_start, filled_count );
+ }
+ }
+ }
+ }
+
+ // SUB SPLITTER DIRECTION
+ // ========================================================================================================
+
+ /*
+ glUniform4f( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 0.9f, 0.35f, 0.1f, 0.75f );
+
+ for( int i = 0; i < world.tile_special_count; i ++ )
+ {
+ struct render_cmd *cmd = &world.cmd_buf_specials[i];
+ struct cell *cell = cmd->ptr;
+
+ if( cell->state & FLAG_TARGETED && cell->config == k_cell_type_split )
+ {
+ glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ), cmd->pos[0], cmd->pos[1], 1.0f );
+ draw_mesh( cell->state & FLAG_FLIP_FLOP? 5: 4, 1 );
+ }
+ }
+ */
+
+ // LIGHT FLARES
+ // ========================================================================================================
+ glBlendFunc(GL_ONE, GL_ONE);
+ glBlendEquation(GL_FUNC_ADD);
+
+ SHADER_USE( shader_sprite );
+
+ vg_tex2d_bind( &tex_sprites, 0 );
+ glUniform1i( SHADER_UNIFORM( shader_sprite, "uTexMain" ), 0 );
+
+ for( int i = 0; i < world.tile_special_count; i ++ )
+ {
+ struct render_cmd *cmd = &world.cmd_buf_specials[i];
+ struct cell *cell = cmd->ptr;
+
+ if( cell->config == k_cell_type_split )
+ {
+ v2f center = { cmd->pos[0] + 0.5f, cmd->pos[1] + 0.5f };
+
+ v3f p0 = { 0.0f, 0.0f, 12.0f };
+ v3f p1 = { 0.0f, 0.0f, 12.0f };
+
+ v2_add( center, (v2f){ -0.25f, -0.25f }, p0 );
+ v2_add( center, (v2f){ 0.25f, -0.25f }, p1 );
+
+ if( cell->state & FLAG_FLIP_FLOP )
+ render_sprite( k_sprite_flare_y, p1 );
+ else
+ render_sprite( k_sprite_flare_b, p0 );
+ }
+ }
+
+ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+ glBlendEquation(GL_FUNC_ADD);
+
glDisable(GL_BLEND);
gui_new_node();
{
- gui_text( "Settings", 3 );
+ gui_text( "SETTINGS", 2 );
}
gui_end();
// Colour scheme selection
ui_global_ctx.cursor[1] += 30;
- gui_text( "Colour Scheme", 2 );
+ gui_text( "Colour Scheme", 1 );
ui_global_ctx.cursor[1] += 25;
gui_new_node();
if( colour_set_id > 0 )
colour_set_id --;
}
- gui_text( "<", 2 );
+ gui_text( "<", 1 );
gui_end_right();
ui_global_ctx.cursor[2] = 150;
gui_new_node();
{
+ gui_fill_rect( ui_global_ctx.cursor, 0x33ffffff );
ui_global_ctx.cursor[0] += 45;
ui_global_ctx.cursor[1] += 6;
- gui_text( (const char *[]){ "Normal", "Extra1", "Extra2" }[ colour_set_id ], 2 );
+ gui_text( (const char *[]){ "Normal", "Extra1", "Extra2" }[ colour_set_id ], 1 );
}
gui_end_right();
if( colour_set_id < vg_list_size( colour_sets )-1 )
colour_set_id ++;
}
- gui_text( ">", 2 );
+ gui_text( ">", 1 );
+ gui_end_down();
+ }
+ gui_end_down();
+
+ // Theme select
+ // TODO: remove code dupe
+ ui_global_ctx.cursor[1] += 16;
+
+ gui_text( "Tile Theme", 1 );
+ ui_global_ctx.cursor[1] += 20;
+
+ gui_new_node();
+ {
+ ui_global_ctx.cursor[2] = 25;
+ if( gui_button( 0 ) == k_button_click )
+ {
+ if( world_theme_id > 0 )
+ world_theme_id --;
+ }
+ gui_text( "<", 1 );
+ gui_end_right();
+
+ ui_global_ctx.cursor[2] = 150;
+ gui_new_node();
+ {
+ gui_fill_rect( ui_global_ctx.cursor, 0x33ffffff );
+ ui_global_ctx.cursor[0] += 45;
+ ui_global_ctx.cursor[1] += 6;
+ gui_text( world_themes[ world_theme_id ].name, 1 );
+ }
+ gui_end_right();
+
+ ui_global_ctx.cursor[2] = 25;
+ if( gui_button( 1 ) == k_button_click )
+ {
+ if( world_theme_id < vg_list_size( world_themes )-1 )
+ world_theme_id ++;
+ }
+ gui_text( ">", 1 );
gui_end_down();
}
gui_end_down();
#if STEAM_LEADERBOARDS
void leaderboard_dispatch_score(void)
{
+
sw_upload_leaderboard_score(
ui_data.upload_request.level->steam_leaderboard,
k_ELeaderboardUploadScoreMethodKeepBest,
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 JustFredrik\n" );
vg_info( " Ubuntu Regular ubuntu.com\n" );
return 0;
}
.persistent = 1
});
+ vg_convar_push( (struct vg_convar){
+ .name = "theme",
+ .data = &world_theme_id,
+ .data_type = k_convar_dtype_i32,
+ .opt_i32 = { .min = 0, .max = vg_list_size( world_themes )-1, .clamp = 1 },
+ .persistent = 1,
+ });
+
// Combined quad, long quad / empty circle / filled circle mesh
{
float combined_mesh[6*6 + 32*6*3] = {
projects / fishladder.git / blobdiff