X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world.h;h=9d8cd4970dc8c037d98b30eb03ce5f4d48e844ff;hb=c0e4a67ba2f001179df6e2cde97370a946669c22;hp=0efe185087d5b5087098117ad86397a5a2eeb6e3;hpb=7f4c71033c06954f3094c9d51219628438b80ac8;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world.h b/world.h index 0efe185..9d8cd49 100644 --- a/world.h +++ b/world.h @@ -49,6 +49,7 @@ static void skaterift_world_get_save_path( enum world_purpose which, #include "world_water.h" #include "world_audio.h" #include "world_routes.h" +#include "world_routes_ui.h" /* console variables */ @@ -63,8 +64,7 @@ struct world_instance { * ------------------------------------------------------- */ - v4f player_co, player_angles; - v3f cam_co; + v4f player_co; void *heap; enum world_status{ @@ -86,6 +86,7 @@ struct world_instance { water; f64 time; + f32 tar_min, tar_max; /* STD140 */ struct ub_world_lighting{ @@ -182,7 +183,8 @@ struct world_instance { ent_relay, ent_cubemap, ent_miniworld, - ent_prop; + ent_prop, + ent_region; enum skybox { k_skybox_default, @@ -216,6 +218,9 @@ struct world_instance { /* leaderboards */ struct leaderboard_cache *leaderboard_cache; + + /* ui */ + struct route_ui *routes_ui; }; struct world_static {