X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world.h;h=8b1b1dc079ff159e06e6197837f0637e4a6a1e46;hb=47941822dae18a018c985847b052e70214a3ccc6;hp=08fe437fc8cdb9821ed7f7c1933c6dda7ffda79c;hpb=4f96bd0040e35ecb21d353ee2b895129682d22c1;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world.h b/world.h
index 08fe437..8b1b1dc 100644
--- a/world.h
+++ b/world.h
@@ -4,7 +4,7 @@
 
 #include "common.h"
 
-static int ray_world( v3f pos, v3f dir, ray_hit *hit );
+VG_STATIC int ray_world( v3f pos, v3f dir, ray_hit *hit );
 
 #ifndef WORLD_H
 #define WORLD_H
@@ -19,8 +19,6 @@ static int ray_world( v3f pos, v3f dir, ray_hit *hit );
 #include "bvh.h"
 #include "model.h"
 
-#include "traffic.h" /*TODO: -> world_traffic.h */
-
 #include "shaders/terrain.h"
 #include "shaders/sky.h"
 #include "shaders/planeinf.h"
@@ -30,28 +28,122 @@ static int ray_world( v3f pos, v3f dir, ray_hit *hit );
 #include "shaders/fscolour.h"
 #include "shaders/alphatest.h"
 
+typedef struct teleport_gate teleport_gate;
+
 enum { k_max_ui_segments = 8 };
-enum { k_max_ui_splits_per_segment = 16 };
 
-enum { k_max_ui_elements = k_max_ui_segments*k_max_ui_splits_per_segment };
+enum { k_max_ui_elements = k_max_ui_segments };
 enum { k_max_element_verts = 10 };
 enum { k_max_element_indices = 20 };
 
 enum { k_route_ui_max_verts = k_max_ui_elements*k_max_element_verts };
 enum { k_route_ui_max_indices = k_max_ui_elements*k_max_element_indices };
 
-static struct gworld
+enum logic_type
+{
+   k_logic_type_relay         = 1,
+   k_logic_type_chance        = 2,
+   k_logic_type_achievement   = 3
+};
+
+VG_STATIC struct gworld
 {
-   /* gameplay */
+   /*
+    * Allocated as system memory
+    * --------------------------------------------------------------------------
+    */
+
+   /* rendering */
+   glmesh skydome;
+   mdl_submesh dome_upper, dome_lower;
+
+   glmesh mesh_gate_surface;
+
+   double sky_time, sky_rate, sky_target_rate;
+
+   /* water rendering */
+   struct
+   {
+      struct framebuffer fbreflect, fbdepth;
+
+      boxf depthbounds;
+      int depth_computed;
+
+      float height;
+      int enabled;
+      v4f plane;
+   }
+   water;
+
+   /* split flap display */
+   struct
+   {
+      mdl_submesh *sm_module, *sm_card;
+      glmesh mesh_base, mesh_display;
+
+      u32 w, h;
+      float *buffer;
+   }
+   sfd;
+
+   /* timing bars, fixed maximum amount */
+   struct route_ui_bar
+   {
+      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_bars[16];
+
+   v3f render_gate_pos;
+   int active_route_board;
+
+   /*
+    * Dynamically allocated when world_load is called.
+    *
+    *                  the following arrays index somewhere into this linear 
+    *                  allocator
+    *
+    * (world_gen.h)
+    * --------------------------------------------------------------------------
+    */
+   void *dynamic_vgl;
+
+   /*
+    * Main world .mdl 
+    */
+   mdl_context *meta;
+
+   /*
+    * Named safe places to respawn
+    */
    struct respawn_point
    {
       v3f co;
       v4f q;
-      char name[32];
+      const char *name;
    }
-   spawns[32];
+   * spawns;
    u32 spawn_count;
 
+   /*
+    * Audio player entities
+    */
    struct world_audio_thing
    {
       v3f pos;
@@ -62,98 +154,51 @@ static struct gworld
       audio_clip temp_embedded_clip;
    }
    * audio_things;
-   
-   u32 audio_things_count,
-       audio_things_cap;
+   u32 audio_things_count;
 
-   struct achievement_zone
+   /*
+    * Relays, random, etc
+    */
+   struct logic_entity
    {
-      m4x3f transform, inv_transform;
-      char name[32];
-      int triggered;
+      v3f pos;
+      enum logic_type logic_type;
+      int enabled;
 
-      union
-      {
-         mdl_node *ptarget_delegated;
-         struct world_audio_thing *ptarget;
-      };
+      /* indexes the action array */
+      u32 action_start, action_count;
    }
-   * achievement_zones;
+   * logic_entities;
+   u32 logic_entity_count;
 
-   u32 achievement_zones_count,
-       achievement_zones_cap;
-
-   struct subworld_sfd
+   /*
+    * Action array
+    */
+   struct logic_action
    {
-      scene mesh;
-      mdl_submesh *sm_module, *sm_card;
-      glmesh temp;
+      u32 event,     /* on trigger, on enable, etc (TODO: Enum) */
+          target_id; /* thing to target, 0: self */
 
-      struct sfd_instance
-      {
-         float *buffer;
-
-         u32 w,h;
-      } 
-      tester;
    }
-   sfd;
-
-   /* Paths */
-   traffic_node traffic[128];
-   u32 traffic_count;
-
-#if 0
-   traffic_driver van_man[6];
-#endif
-
-   double sky_time, sky_rate, sky_target_rate;
-   
-   /* Physics */
-   
-   /* Rendering & geometry */
-   scene geo, foliage;
-   rigidbody rb_geo;
+   * logic_actions;
+   u32 logic_action_count;
 
-   /* TODO Maybe make this less hardcoded */
-   mdl_submesh sm_geo_std_oob, sm_geo_std, sm_geo_vb,
-               sm_foliage_main, sm_foliage_alphatest,
-               sm_graffiti, sm_subworld, sm_terrain;
-
-   glmesh skybox, skydome;
-   mdl_submesh dome_upper, dome_lower;
-
-   glmesh cars;
-   mdl_submesh car_holden;
-
-   /* Load time */
-
-   struct instance_cache
+   /*
+    * Box trigger entities
+    */
+   struct trigger_zone
    {
-      mdl_header *mdl;
-      u32 pstr_file;
+      m4x3f transform, inv_transform;
+      u32   trigger_entity;
    }
-   * instance_cache;
-   u32 instance_cache_count,
-       instance_cache_cap;
+   * triggers;
+   u32 trigger_count;
 
-   v3f render_gate_pos;
-   int active_route_board;
-}
-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
-{
+   /*
+    * Routes (world_routes.h)
+    * --------------------------------------------------------------------------
+    */
    struct route_node
    {
       v3f co, right, up, h;
@@ -163,9 +208,7 @@ struct subworld_routes
       u32 route_ids[4];    /* Gates can be linked into up to four routes */
    }
    *nodes;
-
-   u32 node_count,
-       node_cap;
+   u32 node_count;
 
    struct route
    {
@@ -180,41 +223,23 @@ struct subworld_routes
 
       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;
+   u32 route_count;
 
    struct route_gate
    {
-      teleport_gate 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
@@ -225,34 +250,71 @@ struct subworld_routes
       timing;
    }
    *gates;
+   u32 gate_count;
 
    struct route_collector
    {
       struct route_timing timing;
    }
    *collectors;
+   u32 collector_count;
+
 
-   u32 gate_count,
-       gate_cap,
-       collector_count,
-       collector_cap;
+   /* logic 
+    * ----------------------------------------------------
+    */
 
    u32 active_gate,
        current_run_version;
+   double time, rewind_from, rewind_to, last_use;
+
+   /* world geometry */
+   scene *scene_geo, 
+         *scene_no_collide,
+         *scene_lines;
+
+   /* spacial mappings */
+   bh_tree *audio_bh,
+           *trigger_bh,
+           *geo_bh;
+
+   /* graphics */
+   glmesh mesh_geo, 
+          mesh_no_collide,
+          mesh_route_lines,
+          mesh_water;
+
+   rigidbody rb_geo;
+
+   /* TODO Maybe make this less hardcoded */
+   mdl_submesh sm_geo_std_oob,   sm_geo_std, sm_geo_vb,
+               sm_foliage_main,  sm_foliage_alphatest,
+               sm_graffiti, sm_subworld, sm_terrain;
 
-   scene scene_lines;
+   /*
+    * Allocated AFTER all previous buffers are done
+    * --------------------------------------------------------------------------
+    */
+
+   struct instance_cache
+   {
+      mdl_context *mdl;
+      u32 pstr_file;
+   }
+   instance_cache[32];
+   u32 instance_cache_count;
 }
-static world_routes;
+world;
 
 
 /*
  * API
  */
 
-static int ray_hit_is_ramp( ray_hit *hit );
-static int ray_hit_is_terrain( ray_hit *hit );
-static void ray_world_get_tri( ray_hit *hit, v3f tri[3] );
-static int ray_world( v3f pos, v3f dir, ray_hit *hit );
+VG_STATIC int ray_hit_is_ramp( ray_hit *hit );
+VG_STATIC int ray_hit_is_terrain( ray_hit *hit );
+VG_STATIC void ray_world_get_tri( ray_hit *hit, v3f tri[3] );
+VG_STATIC int ray_world( v3f pos, v3f dir, ray_hit *hit );
 
 /*
  * Submodules
@@ -271,8 +333,16 @@ static int ray_world( v3f pos, v3f dir, ray_hit *hit );
  * -----------------------------------------------------------------------------
  */
 
-static void world_init(void)
+VG_STATIC void world_init(void)
 {
+   vg_convar_push( (struct vg_convar){
+      .name = "water_enable",
+      .data = &world.water.enabled,
+      .data_type = k_convar_dtype_i32,
+      .opt_i32 = { .min=0, .max=1, .clamp=1 },
+      .persistent = 0
+   });
+
    world.sky_rate = 1.0;
    world.sky_target_rate = 1.0;
 
@@ -284,12 +354,9 @@ static void world_init(void)
    shader_alphatest_register();
 
    vg_info( "Loading world resources\n" );
-
-   VG_REQUIRED_ASSET( mdl_header*, mcars, mdl_load, "models/rs_cars.mdl" );
-   VG_REQUIRED_ASSET( mdl_header*, msky,  mdl_load, "models/rs_skydome.mdl" );
-
-   mdl_node *nholden = mdl_node_from_name( mcars, "holden" );
-   world.car_holden = *mdl_node_submesh( mcars, nholden, 0 );
+   
+   vg_linear_clear( vg_mem.scratch );
+   mdl_context *msky = mdl_load_full( vg_mem.scratch, "models/rs_skydome.mdl" );
 
    mdl_node *nlower = mdl_node_from_name( msky, "dome_lower" ),
             *nupper = mdl_node_from_name( msky, "dome_upper" );
@@ -299,37 +366,25 @@ static void world_init(void)
 
    vg_acquire_thread_sync();
    {
-      mdl_unpack_glmesh( mcars, &world.cars );
       mdl_unpack_glmesh( msky, &world.skydome );
    }
    vg_release_thread_sync();
 
-   vg_free(mcars);
-   vg_free(msky);
-
    /* Other systems */
    vg_info( "Loading other world systems\n" );
 
-   vg_loader_highwater( world_render_init, world_render_free, NULL );
-   vg_loader_highwater( world_sfd_init, world_sfd_free, NULL );
-   vg_loader_highwater( world_water_init, world_water_free, NULL );
-   vg_loader_highwater( world_gates_init, world_gates_free, NULL );
-   vg_loader_highwater( world_routes_init, world_routes_free, NULL );
-}
-
-static void world_free( void *_ )
-{
-   mesh_free( &world.cars );
-   mesh_free( &world.skydome );
-   vg_free( world.achievement_zones );
+   vg_loader_highwater( world_render_init, NULL, NULL );
+   vg_loader_highwater( world_sfd_init, NULL, NULL );
+   vg_loader_highwater( world_water_init, NULL, NULL );
+   vg_loader_highwater( world_gates_init, NULL, NULL );
+   vg_loader_highwater( world_routes_init, NULL, NULL );
 
-   /* FIXME: This fucks with the audio player. Use-after-free */
-#if 0
-   vg_free( world.audio_things );
-#endif
+   /* Allocate dynamic world memory arena */
+   u32 max_size = 72*1024*1024;
+   world.dynamic_vgl = vg_create_linear_allocator( vg_mem.rtmemory, max_size );
 }
 
-static void world_update( v3f pos )
+VG_STATIC void world_update( v3f pos )
 {
    world.sky_time += world.sky_rate * vg.time_delta;
    world.sky_rate = vg_lerp( world.sky_rate, world.sky_target_rate, 
@@ -343,9 +398,9 @@ static void world_update( v3f pos )
    int closest = 0;
    float min_dist = INFINITY;
 
-   for( int i=0; i<world_routes.route_count; i++ )
+   for( int i=0; i<world.route_count; i++ )
    {
-      float d = v3_dist2( world_routes.routes[i].scoreboard_transform[3], pos );
+      float d = v3_dist2( world.routes[i].scoreboard_transform[3], pos );
 
       if( d < min_dist )
       {
@@ -358,9 +413,8 @@ static void world_update( v3f pos )
    {
       network_scores_updated = 0;
       world.active_route_board = closest;
-      struct subworld_sfd *sfd = &world.sfd;
 
-      struct route *route = &world_routes.routes[closest];
+      struct route *route = &world.routes[closest];
 
       u32 id = route->track_id;
 
@@ -370,12 +424,13 @@ static void world_update( v3f pos )
 
          for( int i=0; i<13; i++ )
          {
-            sfd_encode( &sfd->tester, i, &local_board->data[27*i] );
+            sfd_encode( i, &local_board->data[27*i] );
          }
       }
    }
 
-   static int in_zone = 0;
+#if 0
+   VG_STATIC int in_zone = 0;
 
    int in_zone_this_time = 0;
 
@@ -415,8 +470,9 @@ static void world_update( v3f pos )
    }
 
    in_zone = in_zone_this_time;
+#endif
    
-   sfd_update( &world.sfd.tester );
+   sfd_update();
 }
 
 /* 
@@ -425,18 +481,18 @@ static void world_update( v3f pos )
  * -----------------------------------------------------------------------------
  */
 
-static void ray_world_get_tri( ray_hit *hit, v3f tri[3] )
+VG_STATIC void ray_world_get_tri( ray_hit *hit, v3f tri[3] )
 {
    for( int i=0; i<3; i++ )
-      v3_copy( world.geo.verts[ hit->tri[i] ].co, tri[i] );
+      v3_copy( world.scene_geo->arrvertices[ hit->tri[i] ].co, tri[i] );
 }
 
-static int ray_world( v3f pos, v3f dir, ray_hit *hit )
+VG_STATIC int ray_world( v3f pos, v3f dir, ray_hit *hit )
 {
-   return scene_raycast( &world.geo, pos, dir, hit );
+   return scene_raycast( world.scene_geo, world.geo_bh, pos, dir, hit );
 }
 
-static int ray_hit_is_terrain( ray_hit *hit )
+VG_STATIC int ray_hit_is_terrain( ray_hit *hit )
 {
    u32 valid_start = 0,
        valid_end   = world.sm_terrain.vertex_count;
@@ -445,7 +501,7 @@ static int ray_hit_is_terrain( ray_hit *hit )
           (hit->tri[0]  < valid_end);
 }
 
-static int ray_hit_is_ramp( ray_hit *hit )
+VG_STATIC int ray_hit_is_ramp( ray_hit *hit )
 {
    u32 valid_start = world.sm_geo_std.vertex_start,
        valid_end   = world.sm_geo_vb.vertex_start;