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

diff --git a/world.h b/world.h
index ea5a5c4..8b1b1dc 100644
--- a/world.h
+++ b/world.h
@@ -1,243 +1,513 @@
+/*
+ * Copyright (C) 2021-2022 Mt.ZERO Software, Harry Godden - All Rights Reserved
+ */
+
+#include "common.h"
+
+VG_STATIC int ray_world( v3f pos, v3f dir, ray_hit *hit );
+
 #ifndef WORLD_H
 #define WORLD_H
 
-#define VG_3D
-#include "vg/vg.h"
+#include "vg/vg_loader.h"
 
+#include "network.h"
+#include "network_msg.h"
 #include "scene.h"
-#include "terrain.h"
 #include "render.h"
-#include "water.h"
 #include "rigidbody.h"
-#include "gate.h"
 #include "bvh.h"
+#include "model.h"
 
+#include "shaders/terrain.h"
+#include "shaders/sky.h"
+#include "shaders/planeinf.h"
 #include "shaders/standard.h"
+#include "shaders/vblend.h"
+#include "shaders/gpos.h"
+#include "shaders/fscolour.h"
+#include "shaders/alphatest.h"
 
-static struct gworld
-{
-   scene geo, foliage;
-   submodel sm_road, sm_terrain;
-   glmesh skybox;
+typedef struct teleport_gate teleport_gate;
 
-   v3f tutorial;
+enum { k_max_ui_segments = 8 };
 
-#if 0
-   rigidbody box;
-#endif
+enum { k_max_ui_elements = k_max_ui_segments };
+enum { k_max_element_verts = 10 };
+enum { k_max_element_indices = 20 };
 
-   teleport_gate gates[16];
-   u32 gate_count;
-   
-   rigidbody temp_rbs[32];
-   u32 rb_count;
+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 };
 
-   bh_tree bhcubes;
-}
-world;
+enum logic_type
+{
+   k_logic_type_relay         = 1,
+   k_logic_type_chance        = 2,
+   k_logic_type_achievement   = 3
+};
 
-static void render_world( m4x4f projection, m4x3f camera )
+VG_STATIC struct gworld
 {
-   render_sky( camera );
+   /*
+    * Allocated as system memory
+    * --------------------------------------------------------------------------
+    */
 
-   m4x3f identity_matrix;
-   m4x3_identity( identity_matrix );
+   /* rendering */
+   glmesh skydome;
+   mdl_submesh dome_upper, dome_lower;
 
-   render_terrain( projection, camera[3] );
-   scene_bind( &world.geo );
-   scene_draw( &world.geo );
+   glmesh mesh_gate_surface;
 
-   glDisable(GL_CULL_FACE);
-   scene_bind( &world.foliage );
-   scene_draw( &world.foliage );
-   glEnable(GL_CULL_FACE);
-}
+   double sky_time, sky_rate, sky_target_rate;
 
-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] );
-}
+   /* water rendering */
+   struct
+   {
+      struct framebuffer fbreflect, fbdepth;
 
-static int ray_world( v3f pos, v3f dir, ray_hit *hit )
-{
-   return scene_raycast( &world.geo, pos, dir, hit );
-}
+      boxf depthbounds;
+      int depth_computed;
 
-static int ray_hit_is_ramp( ray_hit *hit )
-{
-   return hit->tri[0] < world.sm_road.vertex_count;
-}
+      float height;
+      int enabled;
+      v4f plane;
+   }
+   water;
 
-static bh_system bh_system_rigidbodies;
-static void world_load(void)
-{
-   /* Setup scene */
-   scene_init( &world.geo );
-   model *mworld = vg_asset_read( "models/mp_dev.mdl" );
+   /* split flap display */
+   struct
+   {
+      mdl_submesh *sm_module, *sm_card;
+      glmesh mesh_base, mesh_display;
+
+      u32 w, h;
+      float *buffer;
+   }
+   sfd;
 
-   for( int i=0; i<mworld->layer_count; i++ )
+   /* timing bars, fixed maximum amount */
+   struct route_ui_bar
    {
-      submodel *sm = model_get_submodel( mworld, i );
-      if( !strcmp( sm->material, "surf" ) )
-         scene_add_model( &world.geo, mworld, sm, sm->pivot, 0.0f, 1.0f );
+      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;
+      const char *name;
    }
-   scene_copy_slice( &world.geo, &world.sm_road );
+   * spawns;
+   u32 spawn_count;
 
-   for( int i=0; i<mworld->layer_count; i++ )
+   /*
+    * Audio player entities
+    */
+   struct world_audio_thing
    {
-      submodel *sm = model_get_submodel( mworld, i );
-      if( !strcmp( sm->material, "terrain" ) )
-         scene_add_model( &world.geo, mworld, sm, sm->pivot, 0.0f, 1.0f );
+      v3f pos;
+      float volume;
+      u32 flags;
+
+      audio_player player;
+      audio_clip temp_embedded_clip;
    }
+   * audio_things;
+   u32 audio_things_count;
 
-   scene_copy_slice( &world.geo, &world.sm_terrain );
+   /*
+    * Relays, random, etc
+    */
+   struct logic_entity
+   {
+      v3f pos;
+      enum logic_type logic_type;
+      int enabled;
 
-   /* 
-    * TODO: Parametric marker import
+      /* indexes the action array */
+      u32 action_start, action_count;
+   }
+   * logic_entities;
+   u32 logic_entity_count;
+
+   /*
+    * Action array
     */
-   v3_copy( model_marker_get( mworld, "start" )->co, world.tutorial );
-   
-   /* 
-    * Initialize gates
+   struct logic_action
+   {
+      u32 event,     /* on trigger, on enable, etc (TODO: Enum) */
+          target_id; /* thing to target, 0: self */
+
+   }
+   * logic_actions;
+   u32 logic_action_count;
+
+   /*
+    * Box trigger entities
     */
-   
-   world.gate_count = 0;
-   for( int i=0; i<mworld->marker_count; i++ )
+   struct trigger_zone
    {
-      model_marker *ga = model_get_marker( mworld, i );
-      
-      if( ga->classtype == k_classtype_gate )
-      {
-         struct classtype_gate *data = get_entdata_raw( mworld, ga );
-         
-         if( data->target )
-         {
-            model_marker *gb = model_get_marker( mworld, data->target );
-            
-            teleport_gate *gate = &world.gates[ world.gate_count ++ ];
-            
-            v3_copy( ga->co, gate->co[0] );
-            v3_copy( gb->co, gate->co[1] );
-            v4_copy( ga->q, gate->q[0] );
-            v4_copy( gb->q, gate->q[1] );
-            v2_copy( ga->s, gate->dims );
-
-            gate_transform_update( gate );
-         }
-      }
+      m4x3f transform, inv_transform;
+      u32   trigger_entity;
    }
+   * triggers;
+   u32 trigger_count;
+
 
    /*
-    * Load water mesh (1 per world)
+    * Routes (world_routes.h)
+    * --------------------------------------------------------------------------
     */
-   for( int i=0; i<mworld->layer_count; i++ )
+   struct route_node
    {
-      submodel *sm = model_get_submodel( mworld, i );
-      if( !strcmp( sm->material, "water" ) )
-      {
-         glmesh surf;
-         model_unpack_submodel( mworld, &surf, sm );
-               
-         water_init();
-         water_set_surface( &surf, sm->pivot[1] );
+      v3f co, right, up, h;
+      u32 next[2];
+
+      u32 special_type, special_id, current_refs, ref_count;
+      u32 route_ids[4];    /* Gates can be linked into up to four routes */
+   }
+   *nodes;
+   u32 node_count;
+
+   struct route
+   {
+      u32 track_id;
+      v4f colour;
+
+      u32 start;
+      mdl_submesh sm;
+      
+      int active;
+      float factive;
+
+      double best_lap, latest_pass; /* Session */
+
+      m4x3f scoreboard_transform;
+   }
+   *routes;
+   u32 route_count;
+
+   struct route_gate
+   {
+      struct teleport_gate
+      { 
+         v3f co[2];
+         v4f q[2];
+         v2f dims;
 
-         break;
+         m4x3f to_world, recv_to_world, transport;
       }
+      gate;
+
+      u32 node_id;
+
+      struct route_timing
+      {
+         u32 version; /* Incremented on every teleport */
+         double time;
+      } 
+      timing;
    }
+   *gates;
+   u32 gate_count;
 
-   scene_upload( &world.geo );
-   scene_bh_create( &world.geo );
-   
-   water_compute_depth( world.geo.bbx );
+   struct route_collector
+   {
+      struct route_timing timing;
+   }
+   *collectors;
+   u32 collector_count;
+
+
+   /* logic 
+    * ----------------------------------------------------
+    */
+
+   u32 active_gate,
+       current_run_version;
+   double time, rewind_from, rewind_to, last_use;
 
-   scene_init( &world.foliage );
-   model *mfoliage = vg_asset_read("models/rs_foliage.mdl");
+   /* 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;
 
    /*
-    * TODO: Load any other meshes into the foliage scene, and create rbs for
-    *       them.
-    *
-    *       then compute bvh
+    * Allocated AFTER all previous buffers are done
+    * --------------------------------------------------------------------------
     */
+
+   struct instance_cache
+   {
+      mdl_context *mdl;
+      u32 pstr_file;
+   }
+   instance_cache[32];
+   u32 instance_cache_count;
+}
+world;
+
+
+/*
+ * API
+ */
+
+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
+ */
+
+#include "world_routes.h"
+#include "world_sfd.h"
+#include "world_render.h"
+#include "world_water.h"
+#include "world_gen.h"
+#include "world_gate.h"
+
+/* 
+ * -----------------------------------------------------------------------------
+ *                                    Events
+ * -----------------------------------------------------------------------------
+ */
+
+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;
+
+   shader_terrain_register();
+   shader_sky_register();
+   shader_planeinf_register();
+   shader_gpos_register();
+   shader_fscolour_register();
+   shader_alphatest_register();
+
+   vg_info( "Loading world resources\n" );
+   
+   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" );
    
-   for( int i=0; i<mworld->layer_count; i++ )
+   world.dome_lower = *mdl_node_submesh( msky, nlower, 0 );
+   world.dome_upper = *mdl_node_submesh( msky, nupper, 0 );
+
+   vg_acquire_thread_sync();
    {
-      submodel *sm = model_get_submodel( mworld, i );
-      if( !strcmp( sm->material, "surf" ) ||
-          !strcmp( sm->material, "terrain" ) ||
-          !strcmp( sm->material, "water" ) )
-         continue;
+      mdl_unpack_glmesh( msky, &world.skydome );
+   }
+   vg_release_thread_sync();
+
+   /* Other systems */
+   vg_info( "Loading other world systems\n" );
+
+   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 );
+
+   /* Allocate dynamic world memory arena */
+   u32 max_size = 72*1024*1024;
+   world.dynamic_vgl = vg_create_linear_allocator( vg_mem.rtmemory, max_size );
+}
 
-      m4x3f transform;
-      q_m3x3( sm->q, transform );
-      v3_copy( sm->pivot, transform[3] );
-      scene_add_foliage( &world.foliage, mworld, sm, transform );
+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, 
+                                 vg.time_delta * 5.0 );
 
-      rigidbody *rb = &world.temp_rbs[ world.rb_count ++ ];
+   world_routes_update();
+#if 0
+   world_routes_debug();
+#endif
+   
+   int closest = 0;
+   float min_dist = INFINITY;
 
-      box_copy( sm->bbx, rb->bbx );
-      v3_copy( sm->pivot, rb->co );
-      rb_init( rb );
-      v4_copy( sm->q, rb->q );
-      rb_update_transform( rb );
+   for( int i=0; i<world.route_count; i++ )
+   {
+      float d = v3_dist2( world.routes[i].scoreboard_transform[3], pos );
+
+      if( d < min_dist )
+      {
+         min_dist = d;
+         closest = i;
+      }
    }
 
-   free( mworld );
+   if( (world.active_route_board != closest) || network_scores_updated )
+   {
+      network_scores_updated = 0;
+      world.active_route_board = closest;
+
+      struct route *route = &world.routes[closest];
+
+      u32 id = route->track_id;
 
-   v3f volume;
-   v3_sub( world.geo.bbx[1], world.geo.bbx[0], volume );
-   volume[1] = 1.0f;
+      if( id != 0xffffffff )
+      {
+         struct netmsg_board *local_board = &scoreboard_client_data.boards[id];
+
+         for( int i=0; i<13; i++ )
+         {
+            sfd_encode( i, &local_board->data[27*i] );
+         }
+      }
+   }
 
-   m4x3f transform;
+#if 0
+   VG_STATIC int in_zone = 0;
 
-   submodel *sm_blob = submodel_get( mfoliage, "blob" ),
-            *sm_tree = submodel_get( mfoliage, "tree" );
+   int in_zone_this_time = 0;
 
-   for( int i=0;i<100000;i++ )
+   for( int i=0; i<world.achievement_zones_count; i++ )
    {
-      v3f pos;
-      v3_mul( volume, (v3f){ vg_randf(), 1000.0f, vg_randf() }, pos );
-      v3_add( pos, world.geo.bbx[0], pos );
-      
-      ray_hit hit;
-      hit.dist = INFINITY;
+      struct achievement_zone *zone = &world.achievement_zones[i];
 
-      if( ray_world( pos, (v3f){0.0f,-1.0f,0.0f}, &hit ))
+      v3f local;
+      m4x3_mulv( zone->inv_transform, pos, local );
+      
+      if( (fabsf(local[0]) <= 1.0f) &&
+          (fabsf(local[1]) <= 1.0f) &&
+          (fabsf(local[2]) <= 1.0f) )
       {
-         if( hit.normal[1] > 0.8f && !ray_hit_is_ramp(&hit) &&
-             hit.pos[1] > wrender.height )
+         in_zone_this_time = 1;
+
+         if( !in_zone && zone->ptarget )
+         {
+            audio_lock();
+            audio_player_playclip( &zone->ptarget->player, 
+                                   &zone->ptarget->temp_embedded_clip );
+            audio_unlock();
+         }
+
+         if( !zone->triggered )
          {
-            v4f qsurface, qrandom;
-            v3f axis;
-
-            v3_cross( (v3f){0.0f,1.0f,0.0f}, hit.normal, axis );
-
-            float angle = v3_dot(hit.normal,(v3f){0.0f,1.0f,0.0f});
-            q_axis_angle( qsurface, axis, angle );
-            q_axis_angle( qrandom, (v3f){0.0f,1.0f,0.0f}, vg_randf()*VG_TAUf );
-            q_mul( qsurface, qrandom, qsurface );
-            q_m3x3( qsurface, transform );
-
-            v3_copy( hit.pos, transform[3] );
-            
-            if( vg_randf() < 0.00000006f )
-            {
-               m3x3_identity( transform );
-               scene_add_foliage( &world.foliage, mfoliage, sm_tree, transform);
-            }
-            else
-               scene_add_foliage( &world.foliage, mfoliage, sm_blob, transform);
+            steam_set_achievement( zone->name );
+            steam_store_achievements();
          }
+
+         zone->triggered = 1;
       }
+
+      vg_line_boxf_transformed( zone->transform, (boxf){{-1.0f,-1.0f,-1.0f},
+                                                        { 1.0f, 1.0f, 1.0f}}, 
+                                                        0xff00ff00 );
    }
 
-   free( mfoliage );
-   scene_upload( &world.foliage );
+   in_zone = in_zone_this_time;
+#endif
    
-   bh_create( &world.bhcubes, 
-         &bh_system_rigidbodies, world.temp_rbs, world.rb_count );
+   sfd_update();
+}
+
+/* 
+ * -----------------------------------------------------------------------------
+ *                              API implementation
+ * -----------------------------------------------------------------------------
+ */
+
+VG_STATIC void ray_world_get_tri( ray_hit *hit, v3f tri[3] )
+{
+   for( int i=0; i<3; i++ )
+      v3_copy( world.scene_geo->arrvertices[ hit->tri[i] ].co, tri[i] );
+}
+
+VG_STATIC int ray_world( v3f pos, v3f dir, ray_hit *hit )
+{
+   return scene_raycast( world.scene_geo, world.geo_bh, pos, dir, hit );
+}
+
+VG_STATIC int ray_hit_is_terrain( ray_hit *hit )
+{
+   u32 valid_start = 0,
+       valid_end   = world.sm_terrain.vertex_count;
+
+   return (hit->tri[0] >= valid_start) &&
+          (hit->tri[0]  < valid_end);
+}
+
+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;
+
+   return (hit->tri[0] >= valid_start) &&
+          (hit->tri[0]  < valid_end);
 }
 
 #endif /* WORLD_H */