Fix major overstep with last commit

[carveJwlIkooP6JGAAIwe30JlM.git] / world.h

diff --git a/world.h b/world.h
index 007d6721b93a0cf5294487ec667f9ab604b2cc26..9ae654e27937333728d5db924b404edb88723176 100644 (file)
--- a/world.h
+++ b/world.h
@@ -5,13 +5,14 @@ static int ray_world( v3f pos, v3f dir, ray_hit *hit );
 #ifndef WORLD_H
 #define WORLD_H
 
+#include "vg/vg_loader.h"
+
 #include "network.h"
 #include "network_msg.h"
 #include "scene.h"
 #include "terrain.h"
 #include "render.h"
 #include "rigidbody.h"
-#include "gate.h"
 #include "bvh.h"
 #include "lighting.h"
 #include "model.h"
@@ -27,12 +28,24 @@ static int ray_world( v3f pos, v3f dir, ray_hit *hit );
 #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 };
+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_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
 {
+   struct subworld_gen
+   {
+      
+   }
+   subworld_gen;
+
    /* gameplay */
    struct respawn_point
    {
@@ -84,7 +97,7 @@ static struct gworld
             {
                float length;
                u32 vertex_start, vertex_count,
-                   index_start, index_count;
+                   index_start, index_count, notches;
             }
             segments[k_max_ui_segments];
 
@@ -98,12 +111,22 @@ static struct gworld
       }
       *routes;
 
+      double last_interaction;
+
       u32 route_count,
           route_cap;
 
       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;
 
@@ -175,8 +198,6 @@ static struct gworld
    glmesh cars;
    mdl_submesh car_holden;
 
-   rigidbody mr_ball;
-
    /* Load time */
 
    struct instance_cache
@@ -207,17 +228,18 @@ static int ray_world( v3f pos, v3f dir, ray_hit *hit );
  */
 #include "world_routes.h"
 #include "world_sfd.h"
-#include "world_audio.h"
 #include "world_render.h"
 #include "world_water.h"
 #include "world_gen.h"
+#include "world_gate.h"
 
 /* 
  * -----------------------------------------------------------------------------
  *                                    Events
  * -----------------------------------------------------------------------------
  */
-static void world_register(void)
+
+static void world_init(void)
 {
    shader_terrain_register();
    shader_sky_register();
@@ -226,43 +248,44 @@ static void world_register(void)
    shader_fscolour_register();
    shader_alphatest_register();
 
-   world_routes_register();
-   world_sfd_register();
-   world_water_register();
-}
+   vg_info( "Loading world resources\n" );
 
-static void world_free(void)
-{
-   /* TODO.. */
+   VG_REQUIRED_ASSET( mdl_header*, mcars, mdl_load, "models/rs_cars.mdl" );
+   VG_REQUIRED_ASSET( mdl_header*, msky,  mdl_load, "models/rs_skydome.mdl" );
 
-   world_sfd_free();
-}
-
-
-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);
 
+   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 */
-   world_render_init();
-   world_sfd_init();
-   world_audio_init();
+   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 );
 }
 
 static void world_update( v3f pos )
@@ -306,24 +329,6 @@ static void world_update( v3f pos )
    }
    
    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
 }
 
 /*