projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
frame rate independence
[carveJwlIkooP6JGAAIwe30JlM.git]
/
world_routes.h
diff --git
a/world_routes.h
b/world_routes.h
index f98fb0d850ec7ffcac20e3fd096bc93b48fdc0dc..1a51102f08f39f1cbec769e27af032502bfe8e7d 100644
(file)
--- a/
world_routes.h
+++ b/
world_routes.h
@@
-21,7
+21,7
@@
enum route_special_type
static void world_routes_interact(void)
{
static void world_routes_interact(void)
{
- world.routes.last_interaction = vg
_
time;
+ world.routes.last_interaction = vg
.
time;
}
static void debug_sbpath( struct route_node *rna, struct route_node *rnb,
}
static void debug_sbpath( struct route_node *rna, struct route_node *rnb,
@@
-410,7
+410,7
@@
static void world_routes_ui_draw( u32 route, v4f colour, float offset )
shader_routeui_use();
glBindVertexArray( pr->ui.vao );
shader_routeui_use();
glBindVertexArray( pr->ui.vao );
- float fade_amt = vg
_
time - pr->ui.fade_timer_start;
+ float fade_amt = vg
.
time - pr->ui.fade_timer_start;
fade_amt = vg_clampf( fade_amt / 1.0f, 0.0f, 1.0f );
float fade_block_size = 0.0f,
fade_amt = vg_clampf( fade_amt / 1.0f, 0.0f, 1.0f );
float fade_block_size = 0.0f,
@@
-430,7
+430,7
@@
static void world_routes_ui_draw( u32 route, v4f colour, float offset )
v4_copy( colour, fade_colour );
fade_colour[3] *= 1.0f-fade_amt;
v4_copy( colour, fade_colour );
fade_colour[3] *= 1.0f-fade_amt;
- float timer_delta = (vg
_
time - world.routes.last_interaction) * (1.0/60.0),
+ float timer_delta = (vg
.
time - world.routes.last_interaction) * (1.0/60.0),
timer_scale = 1.0f - vg_minf( timer_delta, 1.0f );
/*
timer_scale = 1.0f - vg_minf( timer_delta, 1.0f );
/*
@@
-580,7
+580,7
@@
static void world_routes_verify_run( u32 route )
pr->ui.fade_start = pr->ui.segment_start;
pr->ui.fade_count = 0;
pr->ui.fade_start = pr->ui.segment_start;
pr->ui.fade_count = 0;
- pr->ui.fade_timer_start = vg
_
time;
+ pr->ui.fade_timer_start = vg
.
time;
int orig_seg_count = pr->ui.segment_count;
int orig_seg_count = pr->ui.segment_count;
@@
-603,7
+603,7
@@
static void world_routes_verify_run( u32 route )
pr->ui.fade_count ++;
}
pr->ui.fade_count ++;
}
- r->routes[route].latest_pass = vg
_
time;
+ r->routes[route].latest_pass = vg
.
time;
}
/*
}
/*
@@
-622,7
+622,7
@@
static void world_routes_activate_gate( u32 id )
r->active_gate = id;
rg->timing.version = r->current_run_version;
r->active_gate = id;
rg->timing.version = r->current_run_version;
- rg->timing.time = vg
_
time;
+ rg->timing.time = vg
.
time;
for( u32 i=0; i<r->route_count; i++ )
{
struct route *route = &r->routes[i];
for( u32 i=0; i<r->route_count; i++ )
{
struct route *route = &r->routes[i];
@@
-644,7
+644,7
@@
static void world_routes_activate_gate( u32 id )
{
route->ui.fade_start = route->ui.segment_start;
route->ui.fade_count = route->ui.segment_count;
{
route->ui.fade_start = route->ui.segment_start;
route->ui.fade_count = route->ui.segment_count;
- route->ui.fade_timer_start = vg
_
time;
+ route->ui.fade_timer_start = vg
.
time;
world_routes_ui_clear(i);
vg_success( "CLEARING -> %u %u \n", route->ui.fade_start,
world_routes_ui_clear(i);
vg_success( "CLEARING -> %u %u \n", route->ui.fade_start,
@@
-655,7
+655,7
@@
static void world_routes_activate_gate( u32 id )
r->current_run_version ++;
rc->timing.version = r->current_run_version;
r->current_run_version ++;
rc->timing.version = r->current_run_version;
- rc->timing.time = vg
_
time;
+ rc->timing.time = vg
.
time;
r->current_run_version ++;
}
r->current_run_version ++;
}
@@
-672,7
+672,7
@@
static void world_routes_notify_reset(void)
struct route *route = &r->routes[i];
if( route->active )
struct route *route = &r->routes[i];
if( route->active )
- world_routes_ui_notch( i, vg
_
time - route->latest_pass );
+ world_routes_ui_notch( i, vg
.
time - route->latest_pass );
}
}
}
}
@@
-1119,11
+1119,12
@@
static void world_routes_update(void)
for( int i=0; i<r->route_count; i++ )
{
struct route *route = &r->routes[i];
for( int i=0; i<r->route_count; i++ )
{
struct route *route = &r->routes[i];
- route->factive = vg_lerpf( route->factive, route->active, 0.01f );
+ route->factive = vg_lerpf( route->factive, route->active,
+ 0.6f*vg.time_delta );
if( route->active )
{
if( route->active )
{
- world_routes_ui_updatetime( i, vg
_
time - route->latest_pass );
+ world_routes_ui_updatetime( i, vg
.
time - route->latest_pass );
}
}
}
}
}
}