X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world.h;h=2fa7ce4f5ada984e5e4059d477e3e9eeb0823be7;hb=4625f91b85d2badbb719a7f5bcaa2426af25911b;hp=3734dbf353963295c2b75eb8ec25aa4436509436;hpb=4a883ac1b2506032f9dddab342712de46f2ca734;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world.h b/world.h index 3734dbf..2fa7ce4 100644 --- a/world.h +++ b/world.h @@ -18,6 +18,7 @@ static int ray_world( v3f pos, v3f dir, ray_hit *hit ); #include "traffic.h" /*TODO: -> world_traffic.h */ #include "world_routes.h" #include "world_sfd.h" +#include "world_audio.h" #include "shaders/terrain.h" #include "shaders/sky.h" @@ -85,6 +86,8 @@ static struct gworld * instance_cache; u32 instance_cache_count, instance_cache_cap; + + v3f render_gate_pos; } world; @@ -540,6 +543,7 @@ static void world_init(void) /* Other systems */ world_sfd_init(); + world_audio_init(); } static void world_update(void) @@ -734,6 +738,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 )