int sim_frame, sim_target;
float sim_internal_time, // current tick-time
+ sim_internal_delta, // time delta
sim_internal_ref, // Reference point of internal time
sim_delta_ref, // Reference point of vg_time when we started at current sim_speed
sim_delta_speed, // Rate to apply time delta
turtle_dir[1] = pcell(term->pos)->state & FLAG_INPUT? 1: -1;
original_y = turtle_dir[1];
+ info_buffer[((turtle[1]*64)+turtle[0])*4] = 0;
+ v2i_add( turtle_dir, turtle, turtle );
+
for( int i = 0; i < 100; i ++ )
{
info_buffer[((turtle[1]*64)+turtle[0])*4] = 0;
// ========================================================================================================
if( is_simulation_running() )
{
+ float old_time = world.sim_internal_time;
+
if( !world.buttons[ k_world_button_pause ].pressed )
- {
world.sim_internal_time = world.sim_internal_ref + (vg_time-world.sim_delta_ref) * world.sim_delta_speed;
- }
else
- {
world.sim_internal_time = vg_lerpf( world.sim_internal_time, world.sim_internal_ref + world.pause_offset_target, vg_time_delta*15.0f );
- }
+ world.sim_internal_delta = world.sim_internal_time-old_time;
world.sim_target = (int)floorf(world.sim_internal_time);
while( world.sim_frame < world.sim_target )
{
- sfx_set_playrnd( &audio_random, &audio_system_balls_switching, 0, 9 );
+ sfx_set_playrnd( &audio_random, &audio_system_balls_switching, 0, 8 );
// Update splitter deltas
for( int i = 0; i < world.h*world.w; i ++ )
}
fish->state = k_fish_state_dead;
+ fish->death_time = -1000.0f;
continue;
}
if( cell_next->config == k_cell_type_merge )
{
if( fish->dir[0] == 0 )
+ {
fish->state = k_fish_state_dead;
+ fish->death_time = world.sim_internal_time;
+ }
else
fish->flow_reversed = 0;
}
fish->flow_reversed = 0;
}
else
+ {
fish->state = k_fish_state_dead;
+ fish->death_time = world.sim_internal_time;
+ }
}
else
fish->flow_reversed = ( fish->dir[0] != -desc->start[0] ||
}
}
else
- fish->state = world_check_pos_ok( fish->pos )? k_fish_state_bg: k_fish_state_dead;
+ {
+ if( world_check_pos_ok( fish->pos ) )
+ fish->state = k_fish_state_bg;
+ else
+ {
+ fish->state = k_fish_state_dead;
+ fish->death_time = world.sim_internal_time;
+ }
+ }
}
//v2i_add( fish->pos, fish->dir, fish->pos );
v2i_add( fish->pos, fish->dir, fish->pos );
if( !world_check_pos_ok( fish->pos ) )
+ {
fish->state = k_fish_state_dead;
+ fish->death_time = -1000.0f;
+ }
else
{
struct cell *cell_entry = pcell( fish->pos );
sw_set_achievement( "BANG" );
// Shatter death (+0.5s)
- float death_time = collide_this_frame? 0.0f: 0.5f;
+ float death_time = world.sim_internal_time + ( collide_this_frame? 0.0f: 0.5f );
fi->state = k_fish_state_soon_dead;
fj->state = k_fish_state_soon_dead;
if( fish->state == k_fish_state_dead )
continue;
- if( fish->state == k_fish_state_soon_dead && (world.frame_lerp > fish->death_time) )
+ if( fish->state == k_fish_state_soon_dead && (world.sim_internal_time > fish->death_time) )
continue; // Todo: particle thing?
struct cell *cell = pcell(fish->pos);
fish->physics_co[0] = origin[0] + (float)fish->dir[0]*t;
fish->physics_co[1] = origin[1] + (float)fish->dir[1]*t;
}
+
+ v2_sub( fish->physics_co, fish->physics_v, fish->physics_v );
+ v2_divs( fish->physics_v, world.sim_internal_delta, fish->physics_v );
}
}
}
{
btn->pressed ^= 0x1;
}
+
+ sfx_set_play( &audio_clicks, &audio_system_ui, btn->pressed?1:0 );
}
// Drawing
v4f const colour_default = {1.0f, 1.0f, 1.0f, 1.0f};
v4f const colour_selected = {0.90f, 0.92f, 1.0f, 1.0f};
+ int const circle_base = 4;
+ int const filled_start = circle_base+0;
+ int const filled_count = circle_base+32;
+ int const empty_start = circle_base+32;
+ int const empty_count = circle_base+32*2;
// BACKGROUND
// ========================================================================================================
for( int i = 0; i < world.num_fishes; i ++ )
{
struct fish *fish = &world.fishes[i];
+ v3f render_pos;
+ render_pos[2] = 1.0f;
- if( fish->state == k_fish_state_dead || fish->state == k_fish_state_bg )
+ if( fish->state == k_fish_state_dead || fish->state == k_fish_state_soon_dead )
+ {
+ float death_anim_time = world.sim_internal_time - fish->death_time;
+
+ // Death animation
+ if( death_anim_time > 0.0f && death_anim_time < 1.0f )
+ {
+ float amt = 1.0f-death_anim_time*death_anim_time;
+
+ v2_muladds( fish->physics_co, fish->physics_v, -1.0f * world.sim_internal_delta * amt, fish->physics_co );
+ render_pos[2] = amt;
+ }
+ else if( world.sim_internal_time > fish->death_time )
+ continue;
+ }
+ else if( fish->state == k_fish_state_bg )
continue;
- if( fish->state == k_fish_state_soon_dead && (world.frame_lerp > fish->death_time) )
- continue;
+ 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 );
glUniform3fv( SHADER_UNIFORM( shader_ball, "uColour" ), 1, dot_colour );
- glUniform2fv( SHADER_UNIFORM( shader_ball, "uOffset" ), 1, fish->physics_co );
+ glUniform3fv( SHADER_UNIFORM( shader_ball, "uOffset" ), 1, render_pos );
glUniform2f( SHADER_UNIFORM( shader_ball, "uTexOffset" ), (float)i * 1.2334, (float)i * -0.3579f );
draw_mesh( 0, 2 );
}
SHADER_USE( shader_tile_colour );
glUniformMatrix3fv( SHADER_UNIFORM( shader_tile_colour, "uPv" ), 1, GL_FALSE, (float *)vg_pv );
use_mesh( &world.shapes );
-
- int const circle_base = 4;
- int const filled_start = circle_base+0;
- int const filled_count = circle_base+32;
- int const empty_start = circle_base+32;
- int const empty_count = circle_base+32*2;
glEnable(GL_BLEND);
(arr_base + (float)term->pos[1] + (float)(term->run_count-1)*0.2f) - run_offset:
(float)term->pos[1] + arr_base + run_offset;
- if( k & 0x1 )
+ v4f bar_colour;
+ int bar_draw = 0;
+
+ if( is_simulation_running() )
{
- glUniform4f( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 1.0f, 1.0f, 1.0f, 0.1f );
+ if( k == world.sim_run )
+ {
+ float a = fabsf(sinf( vg_time * 2.0f )) * 0.075f + 0.075f;
+
+ v4_copy( (v4f){ 1.0f, 1.0f, 1.0f, a }, bar_colour );
+ }
+ else
+ v4_copy( (v4f){ 0.0f, 0.0f, 0.0f, 0.13f }, bar_colour );
+
+ bar_draw = 1;
+ }
+ else if( 1 || k & 0x1 )
+ {
+ if( k & 0x1 )
+ v4_copy( (v4f){ 1.0f, 1.0f, 1.0f, 0.07f }, bar_colour );
+ else
+ v4_copy( (v4f){ 0.0f, 0.0f, 0.0f, 0.13f }, bar_colour );
+
+ bar_draw = 1;
+ }
+
+ 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 );
draw_mesh( 2, 2 );
}
for( int i = 0; i < 3; i ++ )
{
- if( i == pack_selection )
+ int pack_is_unlocked = pack_infos[i].levels[0].unlocked;
+
+ if( i == pack_selection || !pack_is_unlocked )
gui_override_colours( &flcol_list_locked );
-
- if( gui_button( 2000 + i ) == k_button_click )
+
+ if( gui_button( 2000 + i ) == k_button_click && pack_is_unlocked )
pack_selection = i;
ui_global_ctx.cursor[1] += 2;
- gui_text( pack_infos[i].name, 4, 0 );
+ gui_text( pack_is_unlocked? pack_infos[i].name: "", 4, 0 );
gui_end_right();
gui_reset_colours();
projects / fishladder.git / blobdiff