X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world.h;h=642e7578b44a6d32ce042a36ba9be4ff2e4ca97e;hb=38514b4ba03412ad51df02dc2ba345e1be41005d;hp=c81d9ed63b67db7a62b81c3f45545686942f2c13;hpb=2c91a71533b4ce86b9e7fd708420ae05c74d8f52;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world.h b/world.h
index c81d9ed..642e757 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 */
 
@@ -57,13 +58,15 @@ static i32   k_debug_light_indices   = 0,
              k_debug_light_complexity= 0,
              k_light_preview         = 0;
 
+#define WORLD_SURFACE_HAS_TRAFFIC 0x1
+#define WORLD_SURFACE_HAS_PROPS   0x2
 
 struct world_instance {
    /* Fixed items
     * -------------------------------------------------------
     */
 
-   v4f player_co, player_angles;
+   v4f player_co;
 
    void *heap;
    enum world_status{
@@ -85,6 +88,7 @@ struct world_instance {
    water;
 
    f64 time;
+   f32 tar_min, tar_max;
 
    /* STD140 */
    struct ub_world_lighting{
@@ -153,6 +157,7 @@ struct world_instance {
       mdl_material info;
       mdl_submesh sm_geo,
                   sm_no_collide;
+      u32 flags;
    }
    * surfaces;
    u32 surface_count;
@@ -180,7 +185,14 @@ struct world_instance {
                  ent_challenge,
                  ent_relay,
                  ent_cubemap,
-                 ent_miniworld;
+                 ent_miniworld,
+                 ent_prop,
+                 ent_region;
+
+   enum skybox {
+      k_skybox_default,
+      k_skybox_space
+   } skybox;
 
    ent_gate *rendering_gate;
 
@@ -209,6 +221,9 @@ struct world_instance {
 
    /* leaderboards */
    struct leaderboard_cache *leaderboard_cache;
+
+   /* ui */
+   struct route_ui *routes_ui;
 };
 
 struct world_static {