stepping

[carveJwlIkooP6JGAAIwe30JlM.git] / world_gen.h

diff --git a/world_gen.h b/world_gen.h
index 5120bd758fe6e2ff09c7ec6ce5051fdba5b756fc..63cb1ef98f1e91c38799f1f9d2e78a7a65e81b69 100644 (file)
--- a/world_gen.h
+++ b/world_gen.h
@@ -128,14 +128,6 @@ VG_STATIC void world_apply_procedural_foliage( world_instance *world,
 
 
 #if 0
-VG_STATIC void world_pct_spawn( world_instance *world, mdl_node *pnode )
-{
-   struct respawn_point *rp = &world->spawns[ world->spawn_count ++ ];
-
-   v3_copy( pnode->co, rp->co );
-   v4_copy( pnode->q, rp->q );
-   rp->name = mdl_pstr( world->meta, pnode->pstr_name );
-}
 
 VG_STATIC void world_pct_audio( world_instance *world, mdl_node *pnode )
 {
@@ -160,20 +152,6 @@ VG_STATIC void world_pct_audio( world_instance *world, mdl_node *pnode )
    world->audio_things_count ++;
 }
 
-VG_STATIC void world_pct_world_light( world_instance *world, mdl_node *pnode )
-{
-   struct world_light *light = &world->lights[ world->light_count ++ ];
-   light->node = pnode;
-   light->inf  = mdl_get_entdata( world->meta, pnode );
-
-   q_m3x3( pnode->q,   light->inverse_world );
-   v3_copy( pnode->co, light->inverse_world[3] );
-   m4x3_invert_affine( light->inverse_world, light->inverse_world );
-
-   light->angle_sin_cos[0] = sinf( light->inf->angle * 0.5f );
-   light->angle_sin_cos[1] = cosf( light->inf->angle * 0.5f );
-}
-
 VG_STATIC void world_pct_nonlocal_gate( world_instance *world, mdl_node *pnode )
 {
    struct nonlocal_gate *gate = &world->nonlocal_gates[ 
@@ -186,38 +164,6 @@ VG_STATIC void world_pct_nonlocal_gate( world_instance *world, mdl_node *pnode )
    v2_copy( inf->dims, gate->gate.dims );
 }
 
-VG_STATIC void world_entities_process( world_instance *world )
-{
-   struct entity_instruction
-   {
-      enum classtype ct;
-      void (*process)( world_instance *world, mdl_node *pnode );
-   }
-   entity_instructions[] = 
-   {
-      { k_classtype_spawn,    world_pct_spawn },
-      { k_classtype_water,    world_pct_water },
-      { k_classtype_audio,    world_pct_audio },
-      { k_classtype_world_light, world_pct_world_light },
-      { k_classtype_nonlocal_gate, world_pct_nonlocal_gate }
-   };
-
-   for( int i=0; i<world->meta->info.node_count; i++ )
-   {
-      mdl_node *pnode = mdl_node_from_id( world->meta, i );
-
-      for( int j=0; j<vg_list_size(entity_instructions); j++ )
-      {
-         struct entity_instruction *instr = &entity_instructions[j];
-
-         if( pnode->classtype == instr->ct )
-         {
-            instr->process( world, pnode );
-            break;
-         }
-      }
-   }
-}
 VG_STATIC void world_link_nonlocal_gates( int index_a, int index_b )
 {
    vg_info( "Linking non-local gates\n" );
@@ -273,48 +219,6 @@ VG_STATIC void world_link_nonlocal_gates( int index_a, int index_b )
 }
 #endif
 
-#if 0
-VG_STATIC float colour_luminance( v3f v )
-{
-   return v3_dot( v, (v3f){0.2126f, 0.7152f, 0.0722f} );
-}
-
-VG_STATIC float calc_light_influence( world_instance *world, v3f position, 
-                                      int light )
-{
-   struct world_light *world_light = &world->lights[ light ];
-   struct classtype_world_light *inf = world_light->inf;
-
-   v3f light_delta;
-   v3_sub( world_light->node->co, position, light_delta );
-   v3_muls( light_delta, 10.0f, light_delta );
-
-   float quadratic = v3_dot( light_delta, light_delta ),
-         attenuation = 1.0f/( 1.0f + quadratic );
-
-   float quadratic_light = attenuation * colour_luminance( inf->colour );
-
-   if( (inf->type == k_light_type_point) ||
-       (inf->type == k_light_type_point_nighttime_only) )
-   {
-      return quadratic_light;
-   }
-   else if( (inf->type == k_light_type_spot) ||
-            (inf->type == k_light_type_spot_nighttime_only) )
-   {
-      v3f dir;
-      q_mulv( world_light->node->q, (v3f){0.0f,1.0f,0.0f}, dir );
-
-      float spot_theta = vg_maxf( 0.0f, v3_dot( light_delta, dir ) ),
-            falloff    = spot_theta >= 0.0f? 1.0f: 0.0f;
-
-      return quadratic_light * falloff;
-   }
-   else
-      return 0.0f;
-}
-#endif
-
 VG_STATIC void world_generate( world_instance *world )
 {
    /*