From 4f96bd0040e35ecb21d353ee2b895129682d22c1 Mon Sep 17 00:00:00 2001 From: hgn Date: Sat, 22 Oct 2022 16:27:39 +0100 Subject: [PATCH] moved some stuff --- player.h | 2 +- player_physics.h | 4 +- world.h | 217 +++++++++++++++++++------------------ world_gate.h | 2 - world_render.h | 14 +-- world_routes.h | 271 +++++++++++++++++++++++------------------------ world_water.h | 2 +- 7 files changed, 253 insertions(+), 259 deletions(-) diff --git a/player.h b/player.h index b4290af..a7831b7 100644 --- a/player.h +++ b/player.h @@ -289,7 +289,7 @@ static void player_update_pre(void) if( vg_get_button_down( "reset" ) ) { - double delta = world.routes.time - world.routes.last_use; + double delta = world_routes.time - world_routes.last_use; if( delta <= RESET_MAX_TIME ) { diff --git a/player_physics.h b/player_physics.h index 6c170c6..d5b112b 100644 --- a/player_physics.h +++ b/player_physics.h @@ -684,9 +684,9 @@ static void player_do_motion(void) /* * Gate intersection, by tracing a line over the gate planes */ - for( int i=0; igate; if( gate_intersect( gate, phys->rb.co, prevco ) ) diff --git a/world.h b/world.h index 3b30973..08fe437 100644 --- a/world.h +++ b/world.h @@ -42,12 +42,6 @@ enum { k_route_ui_max_indices = k_max_ui_elements*k_max_element_indices }; static struct gworld { - struct subworld_gen - { - - } - subworld_gen; - /* gameplay */ struct respawn_point { @@ -89,107 +83,6 @@ static struct gworld u32 achievement_zones_count, achievement_zones_cap; - struct subworld_routes - { - struct route_node - { - v3f co, right, up, h; - u32 next[2]; - - u32 special_type, special_id, current_refs, ref_count; - u32 route_ids[4]; /* Gates can be linked into up to four routes */ - } - *nodes; - - u32 node_count, - node_cap; - - struct route - { - u32 track_id; - v4f colour; - - u32 start; - mdl_submesh sm; - - int active; - float factive; - - double best_lap, latest_pass; /* Session */ - - struct - { - GLuint vao, vbo, ebo; - - u32 indices_head; - u32 vertex_head; - - float last_notch; - - struct route_ui_segment - { - float length; - u32 vertex_start, vertex_count, - index_start, index_count, notches; - } - segments[k_max_ui_segments]; - - u32 segment_start, segment_count, fade_start, fade_count; - double fade_timer_start; - float xpos; - } - ui; - - m4x3f scoreboard_transform; - } - *routes; - - double time, rewind_from, rewind_to, last_use; - - u32 route_count, - route_cap; - - struct route_gate - { - struct teleport_gate - { - v3f co[2]; - v4f q[2]; - v2f dims; - - m4x3f to_world, recv_to_world, transport; - } - gate; - - u32 node_id; - - struct route_timing - { - u32 version; /* Incremented on every teleport */ - double time; - } - timing; - } - *gates; - - struct route_collector - { - struct route_timing timing; - } - *collectors; - - u32 gate_count, - gate_cap, - collector_count, - collector_cap; - - u32 active_gate, - current_run_version; - - scene scene_lines; - } - routes; - struct subworld_sfd { scene mesh; @@ -249,6 +142,109 @@ static struct gworld } world ; +typedef struct teleport_gate teleport_gate; +struct teleport_gate +{ + v3f co[2]; + v4f q[2]; + v2f dims; + + m4x3f to_world, recv_to_world, transport; +}; + +struct subworld_routes +{ + struct route_node + { + v3f co, right, up, h; + u32 next[2]; + + u32 special_type, special_id, current_refs, ref_count; + u32 route_ids[4]; /* Gates can be linked into up to four routes */ + } + *nodes; + + u32 node_count, + node_cap; + + struct route + { + u32 track_id; + v4f colour; + + u32 start; + mdl_submesh sm; + + int active; + float factive; + + double best_lap, latest_pass; /* Session */ + + struct + { + GLuint vao, vbo, ebo; + + u32 indices_head; + u32 vertex_head; + + float last_notch; + + struct route_ui_segment + { + float length; + u32 vertex_start, vertex_count, + index_start, index_count, notches; + } + segments[k_max_ui_segments]; + + u32 segment_start, segment_count, fade_start, fade_count; + double fade_timer_start; + float xpos; + } + ui; + + m4x3f scoreboard_transform; + } + *routes; + + double time, rewind_from, rewind_to, last_use; + + u32 route_count, + route_cap; + + struct route_gate + { + teleport_gate gate; + u32 node_id; + + struct route_timing + { + u32 version; /* Incremented on every teleport */ + double time; + } + timing; + } + *gates; + + struct route_collector + { + struct route_timing timing; + } + *collectors; + + u32 gate_count, + gate_cap, + collector_count, + collector_cap; + + u32 active_gate, + current_run_version; + + scene scene_lines; +} +static world_routes; + + /* * API */ @@ -261,6 +257,7 @@ static int ray_world( v3f pos, v3f dir, ray_hit *hit ); /* * Submodules */ + #include "world_routes.h" #include "world_sfd.h" #include "world_render.h" @@ -346,9 +343,9 @@ static void world_update( v3f pos ) int closest = 0; float min_dist = INFINITY; - for( int i=0; itrack_id; diff --git a/world_gate.h b/world_gate.h index 21cabe9..39a1e78 100644 --- a/world_gate.h +++ b/world_gate.h @@ -20,8 +20,6 @@ #include "world_water.h" -typedef struct teleport_gate teleport_gate; - static struct { struct framebuffer fb; diff --git a/world_render.h b/world_render.h index 32a15ba..9693e81 100644 --- a/world_render.h +++ b/world_render.h @@ -202,9 +202,9 @@ static void render_world_gates( m4x4f projection, v3f playerco, m4x3f camera ) float closest = INFINITY; int id = 0; - for( int i=0; igate.co[0], camera[3] ); if( dist < closest ) @@ -214,9 +214,9 @@ static void render_world_gates( m4x4f projection, v3f playerco, m4x3f camera ) } } - render_gate( &world.routes.gates[id].gate, playerco, camera ); + render_gate( &world_routes.gates[id].gate, playerco, camera ); v3_lerp( world.render_gate_pos, - world.routes.gates[id].gate.co[0], + world_routes.gates[id].gate.co[0], 1.0f, world.render_gate_pos ); } @@ -232,9 +232,9 @@ static void render_world( m4x4f projection, m4x3f camera ) int closest = 0; float min_dist = INFINITY; - for( int i=0; inodes[stack[si-1]]; + struct route_node *rn = &world_routes.nodes[stack[si-1]]; u32 nextid = rn->next[stack_i[si-1]]; stack_i[si-1] ++; @@ -110,8 +109,7 @@ static u32 world_routes_get_path( u32 starter, u32 stack[64] ) */ static void world_routes_ui_popfirst( u32 route ) { - struct subworld_routes *r = &world.routes; - struct route *pr = &r->routes[route]; + struct route *pr = &world_routes.routes[route]; if( pr->ui.segment_count ) { @@ -129,8 +127,7 @@ static void world_routes_ui_popfirst( u32 route ) */ static void world_routes_ui_clear( u32 route ) { - struct subworld_routes *r = &world.routes; - struct route *pr = &r->routes[route]; + struct route *pr = &world_routes.routes[route]; pr->ui.segment_start = (pr->ui.segment_start + pr->ui.segment_count) % k_max_ui_segments; pr->ui.segment_count = 0; @@ -222,8 +219,7 @@ static struct route_ui_segment *world_routes_ui_curseg( struct route *pr ) */ static void world_routes_ui_newseg( u32 route ) { - struct subworld_routes *r = &world.routes; - struct route *pr = &r->routes[route]; + struct route *pr = &world_routes.routes[route]; pr->ui.last_notch = 0.0; @@ -280,8 +276,7 @@ static void world_routes_ui_newseg( u32 route ) */ static void world_routes_ui_updatetime( u32 route, float time ) { - struct subworld_routes *r = &world.routes; - struct route *pr = &r->routes[route]; + struct route *pr = &world_routes.routes[route]; v2f verts[2]; verts[0][0] = time; @@ -305,8 +300,7 @@ static void world_routes_ui_notch( u32 route, float time ) { return; /* FIXME: Temporarily disabled */ - struct subworld_routes *r = &world.routes; - struct route *pr = &r->routes[route]; + struct route *pr = &world_routes.routes[route]; if( (time - pr->ui.last_notch) > 1.0 ) { @@ -399,15 +393,14 @@ static void world_routes_ui_draw( u32 route, v4f colour, float offset ) float const k_bar_height = 0.05f, k_bar_scale_x = 0.005f; - struct subworld_routes *r = &world.routes; - struct route *pr = &r->routes[route]; + struct route *pr = &world_routes.routes[route]; float cx = pr->ui.xpos; shader_routeui_use(); glBindVertexArray( pr->ui.vao ); - float fade_amt = r->time - pr->ui.fade_timer_start; + float fade_amt = world_routes.time - pr->ui.fade_timer_start; fade_amt = vg_clampf( fade_amt / 1.0f, 0.0f, 1.0f ); float fade_block_size = 0.0f, @@ -428,7 +421,7 @@ static void world_routes_ui_draw( u32 route, v4f colour, float offset ) fade_colour[3] *= 1.0f-fade_amt; /* 1 minute timer */ - float timer_delta = (r->time - r->last_use) * (1.0/45.0), + float timer_delta = (world_routes.time - world_routes.last_use) * (1.0/45.0), timer_scale = 1.0f - vg_minf( timer_delta, 1.0f ); /* @@ -476,8 +469,7 @@ static void world_routes_local_set_record( u32 route, double lap_time ) { vg_success( " NEW LAP TIME: %f\n", lap_time ); - struct subworld_routes *r = &world.routes; - struct route *pr = &r->routes[route]; + struct route *pr = &world_routes.routes[route]; if( pr->track_id != 0xffffffff ) { @@ -517,11 +509,10 @@ static void world_routes_local_set_record( u32 route, double lap_time ) */ static void world_routes_verify_run( u32 route ) { - struct subworld_routes *r = &world.routes; - struct route *pr = &r->routes[route]; + struct route *pr = &world_routes.routes[route]; u32 stack[64]; - u32 si = world_routes_get_path( r->routes[route].start, stack ); + u32 si = world_routes_get_path( world_routes.routes[route].start, stack ); /* * we only care about gates that ref gates, so shuffle down the array @@ -530,10 +521,16 @@ static void world_routes_verify_run( u32 route ) u32 sj = 0, maxv = 0, begin = 0; for( u32 i=0; inodes[stack[i]].special_type == k_route_special_type_collector ) - timings[sj ++] = &r->collectors[r->nodes[stack[i]].special_id].timing; - else if( r->nodes[stack[i]].special_type == k_route_special_type_gate ) - timings[sj ++] = &r->gates[r->nodes[stack[i]].special_id].timing; + struct route_node *inode = &world_routes.nodes[stack[i]]; + + if( inode->special_type == k_route_special_type_collector ) + { + timings[sj ++] = &world_routes.collectors[ inode->special_id ].timing; + } + else if( inode->special_type == k_route_special_type_gate ) + { + timings[sj ++] = &world_routes.gates[inode->special_id].timing; + } } for( u32 i=0; icurrent_run_version ); + vg_info( " current version: %u\n", world_routes.current_run_version ); int verified = 0; - if( timings[begin]->version == r->current_run_version ) + if( timings[begin]->version == world_routes.current_run_version ) verified = 1; int valid_segment_count = 0; @@ -586,7 +583,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_timer_start = r->time; + pr->ui.fade_timer_start = world_routes.time; int orig_seg_count = pr->ui.segment_count; @@ -609,7 +606,7 @@ static void world_routes_verify_run( u32 route ) pr->ui.fade_count ++; } - r->routes[route].latest_pass = r->time; + world_routes.routes[route].latest_pass = world_routes.time; } /* @@ -617,21 +614,20 @@ static void world_routes_verify_run( u32 route ) */ static void world_routes_activate_gate( u32 id ) { - struct subworld_routes *r = &world.routes; - struct route_gate *rg = &r->gates[id]; - struct route_node *pnode = &r->nodes[rg->node_id], - *pdest = &r->nodes[pnode->next[0]]; + struct route_gate *rg = &world_routes.gates[id]; + struct route_node *pnode = &world_routes.nodes[rg->node_id], + *pdest = &world_routes.nodes[pnode->next[0]]; - r->last_use = r->time; + world_routes.last_use = world_routes.time; - struct route_collector *rc = &r->collectors[ pdest->special_id ]; + struct route_collector *rc = &world_routes.collectors[ pdest->special_id ]; - r->active_gate = id; - rg->timing.version = r->current_run_version; - rg->timing.time = r->time; - for( u32 i=0; iroute_count; i++ ) + world_routes.active_gate = id; + rg->timing.version = world_routes.current_run_version; + rg->timing.time = world_routes.time; + for( u32 i=0; iroutes[i]; + struct route *route = &world_routes.routes[i]; int was_active = route->active; @@ -650,7 +646,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_timer_start = r->time; + route->ui.fade_timer_start = world_routes.time; world_routes_ui_clear(i); vg_success( "CLEARING -> %u %u \n", route->ui.fade_start, @@ -658,11 +654,11 @@ static void world_routes_activate_gate( u32 id ) } } - r->current_run_version ++; + world_routes.current_run_version ++; - rc->timing.version = r->current_run_version; - rc->timing.time = r->time; - r->current_run_version ++; + rc->timing.version = world_routes.current_run_version; + rc->timing.time = world_routes.time; + world_routes.current_run_version ++; } /* @@ -670,9 +666,8 @@ static void world_routes_activate_gate( u32 id ) */ static void world_routes_notify_reset(void) { - struct subworld_routes *r = &world.routes; - r->rewind_from = r->time; - r->rewind_to = r->last_use; + world_routes.rewind_from = world_routes.time; + world_routes.rewind_to = world_routes.last_use; #if 0 for( int i=0; iroute_count; i++ ) @@ -685,25 +680,26 @@ static void world_routes_notify_reset(void) #endif } +/* Rewind between the saved points in time */ static void world_routes_rollback_time( double t ) { - struct subworld_routes *r = &world.routes; - r->time = vg_lerp( r->rewind_to, r->rewind_from, t ); + world_routes.time = + vg_lerp( world_routes.rewind_to, world_routes.rewind_from, t ); } +/* draw lines along the paths */ static void world_routes_debug(void) { - struct subworld_routes *r = &world.routes; - for( int i=0; inode_count; i++ ) + for( int i=0; inodes[i]; + struct route_node *rn = &world_routes.nodes[i]; vg_line_pt3( rn->co, 1.0f, rn->special_type? 0xffffff00: 0xff00b2ff ); } - for( int i=0; iroute_count; i++ ) + for( int i=0; iroutes[i]; + struct route *route = &world_routes.routes[i]; u32 stack[64]; u32 si = world_routes_get_path( route->start, stack ); @@ -716,21 +712,23 @@ static void world_routes_debug(void) for( int sj=0; sjnodes[stack[sj]], &r->nodes[stack[sk]], cc, - (float)i ); + + struct route_node *pj = &world_routes.nodes[stack[sj]], + *pk = &world_routes.nodes[stack[sk]]; + debug_sbpath( pj, pk, cc, (float)i ); } } - for( int i=0; inode_count; i++ ) + for( int i=0; inodes[i], + struct route_node *ri = &world_routes.nodes[i], *rj = NULL; for( int j=0; j<2; j++ ) { if( ri->next[j] != 0xffffffff ) { - rj = &r->nodes[ri->next[j]]; + rj = &world_routes.nodes[ri->next[j]]; vg_line( ri->co, rj->co, 0x20ffffff ); } } @@ -747,8 +745,7 @@ static void world_id_fixup( u32 *uid, mdl_header *mdl ) static void world_routes_create_mesh( u32 route_id ) { - struct subworld_routes *r = &world.routes; - struct route *route = &r->routes[ route_id ]; + struct route *route = &world_routes.routes[ route_id ]; u32 stack[64]; u32 si = world_routes_get_path( route->start, stack ); @@ -759,8 +756,8 @@ static void world_routes_create_mesh( u32 route_id ) { int sk=(sj+1)%si; - struct route_node *rnj = &r->nodes[ stack[sj] ], - *rnk = &r->nodes[ stack[sk] ], + struct route_node *rnj = &world_routes.nodes[ stack[sj] ], + *rnk = &world_routes.nodes[ stack[sk] ], *rnl; if( rnj->special_type && rnk->special_type ) @@ -774,7 +771,7 @@ static void world_routes_create_mesh( u32 route_id ) if( rnk->special_type ) { - rnl = &r->nodes[ rnk->next[0] ]; + rnl = &world_routes.nodes[ rnk->next[0] ]; base_x1 = (float)rnl->ref_count*-0.5f + (float)rnl->current_refs; } @@ -833,19 +830,19 @@ static void world_routes_create_mesh( u32 route_id ) v2_zero( va.uv ); v2_zero( vb.uv ); - scene_push_vert( &r->scene_lines, &va ); - scene_push_vert( &r->scene_lines, &vb ); + scene_push_vert( &world_routes.scene_lines, &va ); + scene_push_vert( &world_routes.scene_lines, &vb ); if( last_valid ) { /* Connect them with triangles */ - scene_push_tri( &r->scene_lines, (u32[3]){ + scene_push_tri( &world_routes.scene_lines, (u32[3]){ last_valid+0-2, last_valid+1-2, last_valid+2-2} ); - scene_push_tri( &r->scene_lines, (u32[3]){ + scene_push_tri( &world_routes.scene_lines, (u32[3]){ last_valid+1-2, last_valid+3-2, last_valid+2-2} ); } - last_valid = r->scene_lines.vertex_count; + last_valid = world_routes.scene_lines.vertex_count; } else last_valid = 0; @@ -863,7 +860,7 @@ static void world_routes_create_mesh( u32 route_id ) rnj->current_refs ++; } - scene_copy_slice( &r->scene_lines, &route->sm ); + scene_copy_slice( &world_routes.scene_lines, &route->sm ); } /* @@ -873,21 +870,20 @@ static int world_routes_create_all_meshes(void) { vg_info( "Generating route meshes\n" ); - struct subworld_routes *r = &world.routes; - scene_init( &r->scene_lines ); + scene_init( &world_routes.scene_lines ); - for( u32 i=0; iroute_count; i++ ) + for( u32 i=0; iscene_lines ); + scene_upload( &world_routes.scene_lines ); /* UI buffers */ - for( int i=0; iroute_count; i++ ) + for( int i=0; iroutes[i]; + struct route *route = &world_routes.routes[i]; glGenVertexArrays( 1, &route->ui.vao ); glGenBuffers( 1, &route->ui.vbo ); @@ -913,7 +909,7 @@ static int world_routes_create_all_meshes(void) } vg_release_thread_sync(); - scene_free_offline_buffers( &r->scene_lines ); + scene_free_offline_buffers( &world_routes.scene_lines ); return 1; } @@ -922,14 +918,15 @@ static void world_routes_loadfrom( mdl_header *mdl ) { vg_info( "Initializing routes\n" ); - struct subworld_routes *r = &world.routes; - r->nodes = NULL; - r->node_count = 0; r->node_cap = 0; r->routes = NULL; - r->route_count = 0; - r->route_cap = 0; - r->gates = NULL; - r->gate_count = 0; - r->gate_cap = 0; + world_routes.nodes = NULL; + world_routes.node_count = 0; + world_routes.node_cap = 0; + world_routes.routes = NULL; + world_routes.route_count = 0; + world_routes.route_cap = 0; + world_routes.gates = NULL; + world_routes.gate_count = 0; + world_routes.gate_cap = 0; /* TODO Break this up */ for( int i=0; inode_count; i++ ) @@ -941,12 +938,14 @@ static void world_routes_loadfrom( mdl_header *mdl ) pnode->classtype == k_classtype_gate ) { mdl_node_transform( pnode, transform ); - pnode->sub_uid = r->node_count; + pnode->sub_uid = world_routes.node_count; - r->nodes = buffer_reserve( r->nodes, r->node_count, &r->node_cap, 1, - sizeof( struct route_node ) ); + world_routes.nodes = buffer_reserve( world_routes.nodes, + world_routes.node_count, + &world_routes.node_cap, 1, + sizeof( struct route_node ) ); - struct route_node *rn = &r->nodes[r->node_count]; + struct route_node *rn = &world_routes.nodes[world_routes.node_count]; v3_copy( transform[0], rn->right ); v3_normalize( rn->right ); @@ -975,12 +974,15 @@ static void world_routes_loadfrom( mdl_header *mdl ) if( pother->classtype == k_classtype_gate ) { - r->gates = buffer_reserve( r->gates, r->gate_count, - &r->gate_cap, + world_routes.gates = buffer_reserve( world_routes.gates, + world_routes.gate_count, + &world_routes.gate_cap, 1, sizeof( struct route_gate ) ); - struct route_gate *rg = &r->gates[r->gate_count]; - rg->node_id = r->node_count; + struct route_gate *rg = + &world_routes.gates[world_routes.gate_count]; + + rg->node_id = world_routes.node_count; rg->timing.time = 0.0; rg->timing.version = 0; @@ -992,26 +994,29 @@ static void world_routes_loadfrom( mdl_header *mdl ) gate_transform_update( &rg->gate ); rn->special_type = k_route_special_type_gate; - rn->special_id = r->gate_count; + rn->special_id = world_routes.gate_count; - r->gate_count ++; + world_routes.gate_count ++; } } if( rn->special_type == 0 ) { - r->collectors = buffer_reserve( - r->collectors, r->collector_count, &r->collector_cap, + world_routes.collectors = buffer_reserve( + world_routes.collectors, + world_routes.collector_count, + &world_routes.collector_cap, 1, sizeof( struct route_collector )); - struct route_collector *rc = &r->collectors[r->collector_count]; + struct route_collector *rc = + &world_routes.collectors[world_routes.collector_count]; rc->timing.time = 0.0; rc->timing.version = 0; rn->special_type = k_route_special_type_collector; - rn->special_id = r->collector_count; + rn->special_id = world_routes.collector_count; - r->collector_count ++; + world_routes.collector_count ++; } } else @@ -1021,15 +1026,17 @@ static void world_routes_loadfrom( mdl_header *mdl ) rn->next[1] = inf->target1; } - r->node_count ++; + world_routes.node_count ++; } else if( pnode->classtype == k_classtype_route ) { struct classtype_route *inf = mdl_get_entdata( mdl, pnode ); - r->routes = buffer_reserve( r->routes, r->route_count, &r->route_cap, + world_routes.routes = buffer_reserve( world_routes.routes, + world_routes.route_count, + &world_routes.route_cap, 1, sizeof( struct route ) ); - struct route *route = &r->routes[r->route_count]; + struct route *route = &world_routes.routes[world_routes.route_count]; memset( route, 0, sizeof(struct route) ); v3_copy( inf->colour, route->colour ); @@ -1060,40 +1067,40 @@ static void world_routes_loadfrom( mdl_header *mdl ) route->ui.fade_count = 0; route->ui.fade_timer_start = 0.0; - r->route_count ++; + world_routes.route_count ++; } } /* * Apply correct system-local ids */ - for( int i=0; inode_count; i++ ) + for( int i=0; inodes[i]; + struct route_node *rn = &world_routes.nodes[i]; for( int j=0; j<2; j++ ) world_id_fixup( &rn->next[j], mdl ); } - for( int i=0; iroute_count; i++ ) + for( int i=0; iroutes[i]; + struct route *route = &world_routes.routes[i]; world_id_fixup( &route->start, mdl ); } /* * Gather references */ - for( int i=0; iroute_count; i++ ) + for( int i=0; iroutes[i]; + struct route *route = &world_routes.routes[i]; u32 stack[64]; u32 si = world_routes_get_path( route->start, stack ); for( int sj=0; sjnodes[ stack[sj] ]; + struct route_node *rn = &world_routes.nodes[ stack[sj] ]; rn->route_ids[ rn->ref_count ++ ] = i; if( rn->ref_count > 4 ) @@ -1112,10 +1119,9 @@ static void world_routes_loadfrom( mdl_header *mdl ) static void world_routes_init(void) { - struct subworld_routes *r = &world.routes; - r->current_run_version = 2; - r->time = RESET_MAX_TIME*2.0; - r->last_use = 0.0; + world_routes.current_run_version = 2; + world_routes.time = RESET_MAX_TIME*2.0; + world_routes.last_use = 0.0; shader_route_register(); shader_routeui_register(); @@ -1123,27 +1129,24 @@ static void world_routes_init(void) static void world_routes_free(void*_) { - struct subworld_routes *r = &world.routes; - - vg_free( r->nodes ); - vg_free( r->routes ); - vg_free( r->gates ); + vg_free( world_routes.nodes ); + vg_free( world_routes.routes ); + vg_free( world_routes.gates ); } static void world_routes_update(void) { - struct subworld_routes *r = &world.routes; - r->time += vg.time_delta; + world_routes.time += vg.time_delta; - for( int i=0; iroute_count; i++ ) + for( int i=0; iroutes[i]; + struct route *route = &world_routes.routes[i]; route->factive = vg_lerpf( route->factive, route->active, 0.6f*vg.time_delta ); if( route->active ) { - world_routes_ui_updatetime( i, r->time - route->latest_pass ); + world_routes_ui_updatetime(i, world_routes.time - route->latest_pass ); } } } @@ -1151,8 +1154,6 @@ static void world_routes_update(void) static void bind_terrain_textures(void); static void render_world_routes( m4x4f projection, v3f camera ) { - struct subworld_routes *r = &world.routes; - m4x3f identity_matrix; m4x3_identity( identity_matrix ); @@ -1165,11 +1166,11 @@ static void render_world_routes( m4x4f projection, v3f camera ) shader_route_uMdl( identity_matrix ); shader_route_uCamera( camera ); - scene_bind( &r->scene_lines ); + scene_bind( &world_routes.scene_lines ); - for( int i=0; iroute_count; i++ ) + for( int i=0; iroutes[i]; + struct route *route = &world_routes.routes[i]; v4f colour; v3_lerp( (v3f){0.7f,0.7f,0.7f}, route->colour, route->factive, colour ); @@ -1186,12 +1187,10 @@ static void render_world_routes_ui(void) glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendEquation(GL_FUNC_ADD); - struct subworld_routes *r = &world.routes; - float active_offset = 0.0f; - for( int i=0; iroute_count; i++ ) + for( int i=0; iroutes[i]; + struct route *route = &world_routes.routes[i]; world_routes_ui_draw( i, route->colour, active_offset ); active_offset += route->factive; } diff --git a/world_water.h b/world_water.h index 5b82b12..b799e4e 100644 --- a/world_water.h +++ b/world_water.h @@ -163,7 +163,7 @@ static void render_water_surface( m4x4f pv, m4x3f camera ) fb_bindtex( &wrender.fbdepth, 3 ); shader_water_uTexBack( 3 ); - shader_water_uTime( world.routes.time ); + shader_water_uTime( world_routes.time ); shader_water_uCamera( camera[3] ); shader_water_uSurfaceY( wrender.height ); -- 2.25.1