X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world.h;h=cfa3d6b79f51b4f16e690758c1ccf949b3748b9d;hb=e36cb7e44611855d39ba84710a7007ca659e9cd5;hp=9d419a6ee5a5f485c039716f5ef536d20639ba77;hpb=afa80c76d03f5e983092e9d7be33a9102a7ab25e;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world.h b/world.h
index 9d419a6..cfa3d6b 100644
--- a/world.h
+++ b/world.h
@@ -8,6 +8,8 @@
 #include "terrain.h"
 #include "render.h"
 #include "water.h"
+#include "rigidbody.h"
+#include "gate.h"
 
 #include "shaders/standard.h"
 
@@ -18,6 +20,16 @@ static struct gworld
    glmesh skybox;
 
    v3f tutorial;
+
+#if 0
+   rigidbody box;
+#endif
+
+   teleport_gate gates[16];
+   u32 gate_count;
+
+   rigidbody temp_rbs[32];
+   u32 rb_count;
 }
 world;
 
@@ -44,7 +56,6 @@ static void ray_world_get_tri( ray_hit *hit, v3f tri[3] )
       v3_copy( world.geo.verts[ hit->tri[i] ].co, tri[i] );
 }
 
-__attribute__((always_inline))
 static int ray_world( v3f pos, v3f dir, ray_hit *hit )
 {
    return bvh_raycast( &world.geo, pos, dir, hit );
@@ -61,49 +72,77 @@ static void world_load(void)
    scene_init( &world.geo );
    model *mworld = vg_asset_read( "models/mp_dev.mdl" );
 
-   scene_add_model( &world.geo, mworld, submodel_get( mworld, "mp_dev" ),
-         (v3f){0.0f,0.0f,0.0f}, 0.0f, 1.0f );
-   scene_copy_slice( &world.geo, &world.sm_road );
-
-   scene_add_model( &world.geo, mworld, submodel_get( mworld, "terrain" ),
-         (v3f){0.0f,0.0f,0.0f}, 0.0f, 1.0f );
-   scene_copy_slice( &world.geo, &world.sm_terrain );
-
-   v3_copy( model_marker_get( mworld, "mp_dev_tutorial" )->co, world.tutorial );
+   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 );
 
+   }
+   scene_copy_slice( &world.geo, &world.sm_road );
 
-   /* GATE DEV */
-#if 0
+   for( int i=0; i<mworld->layer_count; i++ )
    {
-      model_marker *ga = model_marker_get(mworld,"gate_a"),
-                   *gb = model_marker_get(mworld,"gate_a_recv");
+      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 );
+   }
 
-      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 );
+   scene_copy_slice( &world.geo, &world.sm_terrain );
 
-      gate_a.other = &gate_b;
-      gate_b.other = &gate_a;
+   /* 
+    * TODO: Parametric marker import
+    */
+   v3_copy( model_marker_get( mworld, "start" )->co, world.tutorial );
+   
+   /* 
+    * Initialize gates
+    */
+   
+   world.gate_count = 0;
+   for( int i=0; i<mworld->marker_count; i++ )
+   {
+      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_a );
-      gate_transform_update( &gate_b );
+            gate_transform_update( gate );
+         }
+      }
    }
-#endif
 
-   /* WATER DEV */
+   /*
+    * Load water mesh (1 per world)
+    */
+   for( int i=0; i<mworld->layer_count; i++ )
    {
-      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] );
+      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] );
+
+         break;
+      }
    }
 
-   free( mworld );
    scene_upload( &world.geo );
    bvh_create( &world.geo );
    
@@ -112,6 +151,47 @@ static void world_load(void)
    scene_init( &world.foliage );
    model *mfoliage = vg_asset_read("models/rs_foliage.mdl");
 
+   /*
+    * TODO: Load any other meshes into the foliage scene, and create rbs for
+    *       them.
+    *
+    *       then compute bvh
+    */
+#if 0
+   scene_add_foliage( &world.foliage, mworld, boxtest, world.box.to_world );
+#endif
+   
+
+#if 0
+   submodel *boxtest = submodel_get( mworld, "cubey" );
+
+#endif
+   
+   for( int i=0; i<mworld->layer_count; i++ )
+   {
+      submodel *sm = model_get_submodel( mworld, i );
+      if( !strcmp( sm->material, "surf" ) ||
+          !strcmp( sm->material, "terrain" ) ||
+          !strcmp( sm->material, "water" ) )
+         continue;
+
+      m4x3f transform;
+      q_m3x3( sm->q, transform );
+      v3_copy( sm->pivot, transform[3] );
+      scene_add_foliage( &world.foliage, mworld, sm, transform );
+
+      rigidbody *rb = &world.temp_rbs[ world.rb_count ++ ];
+
+      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 );
+   }
+
+
+   free( mworld );
+
    v3f volume;
    v3_sub( world.geo.bbx[1], world.geo.bbx[0], volume );
    volume[1] = 1.0f;
@@ -151,10 +231,10 @@ static void world_load(void)
             if( vg_randf() < 0.00000006f )
             {
                m3x3_identity( transform );
-               scene_add_foliage( &world.foliage, mfoliage, sm_tree, transform );
+               scene_add_foliage( &world.foliage, mfoliage, sm_tree, transform);
             }
             else
-               scene_add_foliage( &world.foliage, mfoliage, sm_blob, transform );
+               scene_add_foliage( &world.foliage, mfoliage, sm_blob, transform);
          }
       }
    }