X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world.h;h=9d35d304be7e8c6682f73e5cdae665857cd43749;hb=ba5f879f85b9cab1e2b37241399d79709fe4f584;hp=b76086f8c152a798bbcd65022028ba43ae918747;hpb=5f4eb3866525724188461589485ac1aa50d08870;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world.h b/world.h index b76086f..9d35d30 100644 --- a/world.h +++ b/world.h @@ -86,6 +86,9 @@ static struct gworld * instance_cache; u32 instance_cache_count, instance_cache_cap; + + v3f render_gate_pos; + int active_route_board; } world; @@ -548,6 +551,8 @@ static void world_update(void) { world_routes_update(); world_routes_debug(); + + sfd_update( &world.sfd.tester ); #if 0 @@ -736,6 +741,10 @@ static void render_world_gates( m4x4f projection, m4x3f camera ) } render_gate( &world.routes.gates[id].gate, camera ); + v3_lerp( world.render_gate_pos, + world.routes.gates[id].gate.co[0], + 1.0f, + world.render_gate_pos ); } static void render_world( m4x4f projection, m4x3f camera ) @@ -746,15 +755,23 @@ static void render_world( m4x4f projection, m4x3f camera ) render_world_alphatest( projection, camera[3] ); render_terrain( projection, camera[3] ); - m4x3f identity_matrix; - m4x3_identity( identity_matrix ); - identity_matrix[3][1] = 125.0f; + int closest = 0; + float min_dist = INFINITY; - v4f t; - q_axis_angle( t, (v3f){0.0f,1.0f,0.0f}, 2.3f ); - q_m3x3( t, identity_matrix ); + for( int i=0; i