X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_gen.h;h=ded2efefd4cabff9037c76e7560e5a8285eca592;hb=01e2535f8daaab0e3d46dcc61a08a9268babd47c;hp=64395bc513748d277613b358f7ffca9943624f6f;hpb=72c40f1bc7a732f6a628dbf8a4135ac0bf3efa4e;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world_gen.h b/world_gen.h
index 64395bc..ded2efe 100644
--- a/world_gen.h
+++ b/world_gen.h
@@ -126,99 +126,6 @@ VG_STATIC void world_apply_procedural_foliage( world_instance *world,
    vg_info( "%d foliage models added\n", count );
 }
 
-
-#if 0
-
-VG_STATIC void world_pct_audio( world_instance *world, mdl_node *pnode )
-{
-   struct world_audio_thing *thing = &world->audio_things[
-                                      world->audio_things_count ];
-
-   memset( thing, 0, sizeof(struct world_audio_thing) );
-   struct classtype_audio *aud = mdl_get_entdata( world->meta, pnode );
-
-   v3_copy( pnode->co, thing->pos );
-   
-   thing->volume = aud->volume;
-   thing->range = pnode->s[0];
-
-   thing->flags = aud->flags;
-   thing->temp_embedded_clip.path = mdl_pstr( world->meta, aud->pstr_file );
-   thing->temp_embedded_clip.flags = aud->flags;
-
-   audio_clip_load( &thing->temp_embedded_clip, world_global.generic_heap );
-
-   pnode->sub_uid = world->audio_things_count;
-   world->audio_things_count ++;
-}
-
-VG_STATIC void world_pct_nonlocal_gate( world_instance *world, mdl_node *pnode )
-{
-   struct nonlocal_gate *gate = &world->nonlocal_gates[ 
-                                       world->nonlocalgate_count ++ ];
-   struct classtype_gate *inf = mdl_get_entdata( world->meta, pnode );
-
-   gate->working = 0;
-   gate->node = pnode;
-   gate->target_map_index = 0;
-   v2_copy( inf->dims, gate->gate.dims );
-}
-
-VG_STATIC void world_link_nonlocal_gates( int index_a, int index_b )
-{
-   vg_info( "Linking non-local gates\n" );
-   world_instance *a = &world_global.worlds[ index_a ],
-                  *b = &world_global.worlds[ index_b ];
-
-   for( int i=0; i<a->nonlocalgate_count; i++ )
-   {
-      struct nonlocal_gate *ga = &a->nonlocal_gates[i];
-      struct classtype_gate *ga_inf = mdl_get_entdata( a->meta, ga->node );
-      const char *ga_name = mdl_pstr( a->meta, ga_inf->target );
-
-      for( int j=0; j<b->nonlocalgate_count; j++ )
-      {
-         struct nonlocal_gate *gb = &b->nonlocal_gates[j];
-         struct classtype_gate *gb_inf = mdl_get_entdata( b->meta, gb->node );
-         const char *gb_name = mdl_pstr( b->meta, gb_inf->target );
-
-         if( !strcmp( ga_name, gb_name ) )
-         {
-            vg_success( "Created longjump for ID '%s'\n", ga_name );
-
-            v4f qYflip;
-            q_axis_angle( qYflip, (v3f){0.0f,1.0f,0.0f}, VG_PIf );
-
-            /* TODO: Gates are created very wonkily. refactor. */
-            ga->target_map_index = index_b;
-            gb->target_map_index = index_a;
-            ga->working = 1;
-            gb->working = 1;
-
-            v4_copy( ga->node->q,  ga->gate.q[0] );
-            v4_copy( gb->node->q,  ga->gate.q[1] );
-            v3_copy( ga->node->co, ga->gate.co[0] );
-            v3_copy( gb->node->co, ga->gate.co[1] );
-
-            v4_copy( gb->node->q,  gb->gate.q[0] );
-            v4_copy( ga->node->q,  gb->gate.q[1] );
-            v3_copy( gb->node->co, gb->gate.co[0] );
-            v3_copy( ga->node->co, gb->gate.co[1] );
-
-            /* reverse B's direction */
-            q_mul( gb->gate.q[0], qYflip, gb->gate.q[0] );
-            q_mul( gb->gate.q[1], qYflip, gb->gate.q[1] );
-            q_normalize( gb->gate.q[0] );
-            q_normalize( gb->gate.q[1] );
-
-            gate_transform_update( &ga->gate );
-            gate_transform_update( &gb->gate );
-         }
-      }
-   }
-}
-#endif
-
 VG_STATIC void world_generate( world_instance *world )
 {
    /* 
@@ -259,13 +166,14 @@ VG_STATIC void world_generate( world_instance *world )
    world->geo_bh = scene_bh_create( world_global.generic_heap, 
                                     world->scene_geo );
 
-   v3_zero( world->rb_geo.co );
-   q_identity( world->rb_geo.q );
+   v3_zero( world->rb_geo.rb.co );
+   v3_zero( world->rb_geo.rb.v );
+   q_identity( world->rb_geo.rb.q );
+   v3_zero( world->rb_geo.rb.w );
 
    world->rb_geo.type = k_rb_shape_scene;
    world->rb_geo.inf.scene.bh_scene = world->geo_bh;
-   world->rb_geo.is_world = 1;
-   rb_init( &world->rb_geo );
+   rb_init_object( &world->rb_geo );
 
    /*
     * Generate scene: non-collidable geometry
@@ -591,7 +499,7 @@ VG_STATIC void world_post_process( world_instance *world )
       glDisable(GL_DEPTH_TEST);
       glDisable(GL_BLEND);
       glDisable(GL_CULL_FACE);
-      render_fb_bind( &world->heightmap );
+      render_fb_bind( &world->heightmap, 0 );
       shader_blitcolour_use();
       shader_blitcolour_uColour( (v4f){-9999.0f,-9999.0f,-9999.0f,-9999.0f} );
       render_fsquad();
@@ -612,13 +520,6 @@ VG_STATIC void world_post_process( world_instance *world )
    }
 
    vg_release_thread_sync();
-
-#if 0
-   /*
-    * Setup scene collider 
-    */
-   reset_player( 1, (const char *[]){"start"} );
-#endif
 }
 
 VG_STATIC void world_process_resources( world_instance *world )
@@ -713,17 +614,10 @@ VG_STATIC void world_unload( world_instance *world )
    vg_release_thread_sync();
 }
 
-VG_STATIC void world_clean( world_instance *world )
+VG_STATIC void world_init_blank( world_instance *world )
 {
    memset( &world->meta, 0, sizeof(mdl_context) );
 
-   /*
-    * TODO: Theres probably a better way to do this? */
-   /*       yep, find all members that can be memsetted to 0. this is probably
-    *       every member anyway, given the below is just setting to 0
-    *
-    *       also: rename clean to init? */
-
    world->textures = NULL;
    world->texture_count = 0;
    world->surfaces = NULL;
@@ -837,7 +731,7 @@ VG_STATIC void world_entities_init( world_instance *world )
 VG_STATIC void world_load( world_instance *world, const char *path )
 {
    world_unload( world );
-   world_clean( world );
+   world_init_blank( world );
 
    vg_info( "Loading world: %s\n", path );