X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world.h;h=007d6721b93a0cf5294487ec667f9ab604b2cc26;hb=86dbcd5796ed674ca9433cce1ace8bef322cd121;hp=29e1e714b6453576dc9e510e5951fc6b0a227c83;hpb=eb6573694ca9292baaefee233dedb0b79f3ddc2e;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world.h b/world.h
index 29e1e71..007d672 100644
--- a/world.h
+++ b/world.h
@@ -1,182 +1,364 @@
+#include "common.h"
+
+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 "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 "lighting.h"
+#include "model.h"
+
+#include "traffic.h" /*TODO: -> world_traffic.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"
+
+enum { k_max_ui_segments = 32 };
+enum { k_route_ui_max_verts = 2000 };
+enum { k_route_ui_max_indices = 3000 };
 
 static struct gworld
 {
-   scene geo, foliage;
-   submodel sm_road, sm_terrain;
-   glmesh skybox;
+   /* gameplay */
+   struct respawn_point
+   {
+      v3f co;
+      v4f q;
+      char name[32];
+   }
+   spawns[32];
+   u32 spawn_count;
 
-   v3f tutorial;
-}
-world;
+   struct subworld_routes
+   {
+      struct route_node
+      {
+         v3f co, right, up, h;
+         u32 next[2];
 
-static void render_world( m4x4f projection, m4x3f camera )
-{
-   render_sky( camera );
+         u32 special_type, special_id, current_refs, ref_count;
+         u32 route_ids[4];    /* Gates can be linked into up to four routes */
+      }
+      *nodes;
 
-   m4x3f identity_matrix;
-   m4x3_identity( identity_matrix );
+      u32 node_count,
+          node_cap;
 
-   render_terrain( projection, camera[3] );
-   scene_bind( &world.geo );
-   scene_draw( &world.geo );
+      struct route
+      {
+         u32 track_id;
+         v4f colour;
 
-   glDisable(GL_CULL_FACE);
-   scene_bind( &world.foliage );
-   scene_draw( &world.foliage );
-   glEnable(GL_CULL_FACE);
+         u32 start;
+         mdl_submesh sm;
+         
+         int active;
+         float factive;
 
-   vg_line_boxf( world.geo.bbx, 0xff00ffff );
-}
+         double best_lap, latest_pass; /* Session */
 
-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] );
-}
+         struct 
+         {
+            GLuint vao, vbo, ebo;
 
-static int ray_world( v3f pos, v3f dir, ray_hit *hit )
-{
-   return bvh_raycast( &world.geo, pos, dir, hit );
-}
+            u32  indices_head;
+            u32  vertex_head;
 
-static int ray_hit_is_ramp( ray_hit *hit )
-{
-   return hit->tri[0] < world.sm_road.vertex_count;
-}
+            float last_notch;
 
-static void world_load(void)
-{
-   /* Setup scene */
-   scene_init( &world.geo );
-   model *mworld = vg_asset_read( "models/mp_dev.mdl" );
+            struct route_ui_segment
+            {
+               float length;
+               u32 vertex_start, vertex_count,
+                   index_start, index_count;
+            }
+            segments[k_max_ui_segments];
 
-   for( int i=0; i<mworld->layer_count; i++ )
-   {
-      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 );
+            u32 segment_start, segment_count, fade_start, fade_count;
+            double fade_timer_start;
+            float xpos;
+         }
+         ui;
+
+         m4x3f scoreboard_transform;
+      }
+      *routes;
+
+      u32 route_count,
+          route_cap;
+
+      struct route_gate
+      {
+         teleport_gate gate;
+         
+         u32 node_id;
+
+         struct route_timing
+         {
+            u32 version; /* Incremented on every teleport */
+            double time;
+         } 
+         timing;
+      }
+      *gates;
+
+      struct route_collector
+      {
+         struct route_timing timing;
+      }
+      *collectors;
 
+      u32 gate_count,
+          gate_cap,
+          collector_count,
+          collector_cap;
+
+      u32 active_gate,
+          current_run_version;
+
+      scene scene_lines;
    }
-   scene_copy_slice( &world.geo, &world.sm_road );
+   routes;
 
-   for( int i=0; i<mworld->layer_count; i++ )
+   struct subworld_sfd
    {
-      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 );
-   }
+      scene mesh;
+      mdl_submesh *sm_module, *sm_card;
+      glmesh temp;
 
-   scene_copy_slice( &world.geo, &world.sm_terrain );
+      struct sfd_instance
+      {
+         float *buffer;
 
-   /* 
-    * TODO: Parametric marker import
-    */
-   v3_copy( model_marker_get( mworld, "mp_dev_tutorial" )->co, world.tutorial );
+         u32 w,h;
+      } 
+      tester;
+   }
+   sfd;
 
+   /* Paths */
+   traffic_node traffic[128];
+   u32 traffic_count;
 
-   /* GATE DEV */
 #if 0
-   {
-      model_marker *ga = model_marker_get(mworld,"gate_a"),
-                   *gb = model_marker_get(mworld,"gate_a_recv");
+   traffic_driver van_man[6];
+#endif
+   
+   /* Physics */
+   
+   /* Rendering & geometry */
+   scene geo, foliage;
+   rigidbody rb_geo;
 
-      v3_copy( ga->co, gate_a.co );
-      v3_copy( gb->co, gate_b.co );
-      v4_copy( ga->q, gate_a.q );
-      v4_copy( gb->q, gate_b.q );
-      v2_copy( ga->s, gate_a.dims );
-      v2_copy( gb->s, gate_b.dims );
+   /* 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;
 
-      gate_a.other = &gate_b;
-      gate_b.other = &gate_a;
+   glmesh skybox, skydome;
+   mdl_submesh dome_upper, dome_lower;
 
-      gate_transform_update( &gate_a );
-      gate_transform_update( &gate_b );
-   }
-#endif
+   glmesh cars;
+   mdl_submesh car_holden;
+
+   rigidbody mr_ball;
+
+   /* Load time */
 
-   /* WATER DEV
-    * again, TODO: parametric import (material)
-    */
+   struct instance_cache
    {
-      glmesh surf;
-      submodel *sm = submodel_get(mworld,"mp_dev_water");
-      model_unpack_submodel( mworld, &surf, sm );
-            
-      water_init();
-      water_set_surface( &surf, sm->pivot[1] );
+      mdl_header *mdl;
+      u32 pstr_file;
    }
+   * instance_cache;
+   u32 instance_cache_count,
+       instance_cache_cap;
 
-   free( mworld );
-   scene_upload( &world.geo );
-   bvh_create( &world.geo );
-   
-   water_compute_depth( world.geo.bbx );
+   v3f render_gate_pos;
+   int active_route_board;
+}
+world;
 
-   scene_init( &world.foliage );
-   model *mfoliage = vg_asset_read("models/rs_foliage.mdl");
+/*
+ * 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 );
+
+/*
+ * Submodules
+ */
+#include "world_routes.h"
+#include "world_sfd.h"
+#include "world_audio.h"
+#include "world_render.h"
+#include "world_water.h"
+#include "world_gen.h"
+
+/* 
+ * -----------------------------------------------------------------------------
+ *                                    Events
+ * -----------------------------------------------------------------------------
+ */
+static void world_register(void)
+{
+   shader_terrain_register();
+   shader_sky_register();
+   shader_planeinf_register();
+   shader_gpos_register();
+   shader_fscolour_register();
+   shader_alphatest_register();
+
+   world_routes_register();
+   world_sfd_register();
+   world_water_register();
+}
 
-   v3f volume;
-   v3_sub( world.geo.bbx[1], world.geo.bbx[0], volume );
-   volume[1] = 1.0f;
+static void world_free(void)
+{
+   /* TODO.. */
 
-   m4x3f transform;
+   world_sfd_free();
+}
 
-   submodel *sm_blob = submodel_get( mfoliage, "blob" ),
-            *sm_tree = submodel_get( mfoliage, "tree" );
 
-   for( int i=0;i<100000;i++ )
+static void world_init(void)
+{
+   mdl_header *mcars = mdl_load( "models/rs_cars.mdl" );
+   mdl_unpack_glmesh( mcars, &world.cars );
+   mdl_node *nholden = mdl_node_from_name( mcars, "holden" );
+   world.car_holden = *mdl_node_submesh( mcars, nholden, 0 );
+   free(mcars);
+
+
+   mdl_header *msky = mdl_load("models/rs_skydome.mdl");
+   mdl_unpack_glmesh( msky, &world.skydome );
+
+   mdl_node *nlower = mdl_node_from_name( msky, "dome_lower" ),
+            *nupper = mdl_node_from_name( msky, "dome_upper" );
+   
+   world.dome_lower = *mdl_node_submesh( msky, nlower, 0 );
+   world.dome_upper = *mdl_node_submesh( msky, nupper, 0 );
+   free(msky);
+
+
+   /* Other systems */
+   world_render_init();
+   world_sfd_init();
+   world_audio_init();
+}
+
+static void world_update( v3f pos )
+{
+   world_routes_update();
+   world_routes_debug();
+   
+   int closest = 0;
+   float min_dist = INFINITY;
+
+   for( int i=0; i<world.routes.route_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;
-
-      if( ray_world( pos, (v3f){0.0f,-1.0f,0.0f}, &hit ))
+      float d = v3_dist2( world.routes.routes[i].scoreboard_transform[3], pos );
+
+      if( d < min_dist )
       {
-         if( hit.normal[1] > 0.8f && !ray_hit_is_ramp(&hit) &&
-             hit.pos[1] > wrender.height )
-         {
-            v4f qsurface, qrandom;
-            v3f axis;
+         min_dist = d;
+         closest = i;
+      }
+   }
 
-            v3_cross( (v3f){0.0f,1.0f,0.0f}, hit.normal, axis );
+   if( (world.active_route_board != closest) || network_scores_updated )
+   {
+      network_scores_updated = 0;
+      world.active_route_board = closest;
+      struct subworld_sfd *sfd = &world.sfd;
 
-            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 );
+      struct route *route = &world.routes.routes[closest];
 
-            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 );
+      u32 id = route->track_id;
+
+      if( id != 0xffffffff )
+      {
+         struct netmsg_board *local_board = &scoreboard_client_data.boards[id];
+
+         for( int i=0; i<13; i++ )
+         {
+            sfd_encode( &sfd->tester, i, &local_board->data[27*i] );
          }
       }
    }
+   
+   sfd_update( &world.sfd.tester );
+
+#if 0
+   rb_solver_reset();
+   rb_build_manifold_terrain_sphere( &world.mr_ball );
+   
+   for( int i=0; i<5; i++ )
+      rb_solve_contacts( rb_contact_buffer, rb_contact_count );
+
+   rb_iter( &world.mr_ball );
+   rb_update_transform( &world.mr_ball );
+   rb_debug( &world.mr_ball, 0 );
+
+   for( int i=0; i<vg_list_size(world.van_man); i++ )
+   {
+      traffic_drive( &world.van_man[i] );
+      traffic_visualize_car( &world.van_man[i] );
+   }
+#endif
+}
+
+/* 
+ * -----------------------------------------------------------------------------
+ *                              API implementation
+ * -----------------------------------------------------------------------------
+ */
+
+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] );
+}
+
+static int ray_world( v3f pos, v3f dir, ray_hit *hit )
+{
+   return scene_raycast( &world.geo, pos, dir, hit );
+}
+
+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);
+}
+
+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;
 
-   free( mfoliage );
-   scene_upload( &world.foliage );
+   return (hit->tri[0] >= valid_start) &&
+          (hit->tri[0]  < valid_end);
 }
 
 #endif /* WORLD_H */