scene_add_submesh( pscene, mdl, sm, transform2 );
}
}
-
-#if 0
- if( pnode->classtype == k_classtype_instance )
- {
- if( pnode->sub_uid )
- {
- u32 instance_id = pnode->sub_uid -1;
- struct instance_cache *cache = &world.instance_cache[instance_id];
- mdl_context *mdl2 = cache->mdl;
-
- m4x3f transform2;
- mdl_node_transform( pnode, transform2 );
- m4x3_mul( transform, transform2, transform2 );
-
- world_add_all_if_material( transform2, pscene, mdl2, id );
- }
- }
-#endif
}
}
k_classtype_trigger,
(void*)&world.triggers,
sizeof(struct trigger_zone)
+ },
+ {
+ k_classtype_logic_relay,
+ (void*)&world.logic_relays,
+ sizeof(struct logic_relay)
+ },
+ {
+ k_classtype_logic_achievement,
+ (void*)&world.logic_achievements,
+ sizeof(struct logic_achievement)
}
};
{
if( pnode->classtype == entity_counts[j].ct )
{
+ pnode->sub_uid = entity_counts[j].count;
entity_counts[j].count ++;
break;
}
}
}
-VG_STATIC void world_pct_instance( mdl_node *pnode )
-{
- struct classtype_instance *inst = mdl_get_entdata( world.meta, pnode );
- pnode->sub_uid = 0;
-
- int cache_entry = 0;
- for( int i=0; i<world.instance_cache_count; i++ )
- {
- struct instance_cache *cache = &world.instance_cache[i];
- if( inst->pstr_file == cache->pstr_file )
- {
- cache_entry = 1;
- pnode->sub_uid = i+1;
- break;
- }
- }
-
- if( !cache_entry )
- {
- if( world.instance_cache_count == vg_list_size(world.instance_cache) )
- vg_fatal_exit_loop( "Instance cache is full!" );
-
- struct instance_cache *cache =
- &world.instance_cache[world.instance_cache_count ++ ];
-
- cache->pstr_file = inst->pstr_file;
-
-#if 0
- cache->mdl = mdl_load( filename );
-
- if( cache->mdl )
- {
- world.instance_cache_count ++;
- pnode->sub_uid = world.instance_cache_count;
- mdl_link_materials( mworld, cache->mdl );
- vg_success( "Cached %s\n", filename );
- }
- else
- {
- vg_warn( "Failed to cache %s\n", filename );
- }
-#endif
- }
-}
-
VG_STATIC void world_pct_audio( mdl_node *pnode )
{
struct world_audio_thing *thing = &world.audio_things[
thing->flags = aud->flags;
thing->temp_embedded_clip.path = mdl_pstr( world.meta, aud->pstr_file );
- audio_clip_load( &thing->temp_embedded_clip );
+ thing->temp_embedded_clip.source_mode = k_audio_source_mono;
+
+ audio_clip_load( &thing->temp_embedded_clip, world.audio_vgl );
thing->player.name = mdl_pstr( world.meta, pnode->pstr_name );
thing->player.enqued = 0;
world.audio_things_count ++;
}
+
+VG_STATIC void world_pct_trigger( mdl_node *pnode )
+{
+ struct trigger_zone *trigger = &world.triggers[ world.trigger_count ];
+ struct classtype_trigger *inf = mdl_get_entdata( world.meta, pnode );
+
+ if( inf->target )
+ {
+ mdl_node *target_node = mdl_node_from_id( world.meta, inf->target );
+
+ trigger->target.sub_id = target_node->sub_uid;
+ trigger->target.classtype = target_node->classtype;
+ }
+ else
+ {
+ vg_warn( "Trigger with no target...\n" );
+ return;
+ }
+
+ mdl_node_transform( pnode, trigger->transform );
+ m4x3_invert_full( trigger->transform, trigger->inv_transform );
+
+ world.trigger_count ++;
+}
+
+
+VG_STATIC void world_pct_relay( mdl_node *pnode )
+{
+ struct logic_relay *relay = &world.logic_relays[ world.relay_count ];
+ struct classtype_logic_relay *inf = mdl_get_entdata( world.meta, pnode );
+
+ relay->target_count = 0;
+
+ for( int i=0; i<vg_list_size(relay->targets); i++ )
+ {
+ if( inf->targets[i] )
+ {
+ struct relay_target *target = &relay->targets[relay->target_count ++];
+ mdl_node *other = mdl_node_from_id( world.meta, inf->targets[i] );
+
+ target->classtype = other->classtype;
+ target->sub_id = other->sub_uid;
+ }
+ }
+
+ v3_copy( pnode->co, relay->pos );
+ world.relay_count ++;
+}
+
+
+VG_STATIC void world_pct_achievement( mdl_node *pnode )
+{
+ struct logic_achievement *ach =
+ &world.logic_achievements[ world.achievement_count ];
+ struct classtype_logic_achievement *inf =
+ mdl_get_entdata( world.meta, pnode );
+
+ v3_copy( pnode->co, ach->pos );
+ ach->achievement_id = mdl_pstr( world.meta, inf->pstr_name );
+ ach->achieved = 0;
+
+ world.achievement_count ++;
+}
+
+
VG_STATIC void world_entities_process(void)
{
struct entity_instruction
{
{ k_classtype_spawn, world_pct_spawn },
{ k_classtype_water, world_pct_water },
- { k_classtype_instance, world_pct_instance },
{ k_classtype_audio, world_pct_audio },
+ { k_classtype_trigger, world_pct_trigger },
+ { k_classtype_logic_relay, world_pct_relay },
+ { k_classtype_logic_achievement, world_pct_achievement }
};
for( int i=0; i<world.meta->info.node_count; i++ )
break;
}
}
-
-#if 0
- else if( pnode->classtype == k_classtype_achievement_box )
- {
- world.achievement_zones =
- buffer_reserve( world.achievement_zones,
- world.achievement_zones_count,
- &world.achievement_zones_cap, 1,
- sizeof(struct achievement_zone) );
-
- struct achievement_zone *zone = &world.achievement_zones[
- world.achievement_zones_count ++ ];
-
-
- struct classtype_achievement_box *box = mdl_get_entdata(mworld,pnode);
-
- mdl_node_transform( pnode, zone->transform );
- m4x3_invert_full( zone->transform, zone->inv_transform );
- vg_strncpy( mdl_pstr(mworld, box->pstr_name), zone->name, 31 );
- zone->name[31] = 0x00;
- zone->triggered = 0;
-
- if( box->trigger )
- zone->ptarget_delegated = mdl_node_from_id( mworld, box->trigger );
- else
- zone->ptarget_delegated = NULL;
- }
-#endif
- }
-
-#if 0
- /* fixup links */
- for( int i=0; i<world.achievement_zones_count; i ++ )
- {
- struct achievement_zone *ach = &world.achievement_zones[ i ];
- if( ach->ptarget_delegated )
- {
- u32 id = ach->ptarget_delegated->sub_uid;
- ach->ptarget = &world.audio_things[ id ];
- }
- else
- ach->ptarget = NULL;
- }
-#endif
-}
-
-VG_STATIC void world_load_instance_cache(void)
-{
- vg_linear_clear( vg_mem.scratch );
-
- for( int i=0; i<world.instance_cache_count; i++ )
- {
- struct instance_cache *inst = &world.instance_cache[i];
-
- const char *filename = mdl_pstr( world.meta, inst->pstr_file );
- inst->mdl = mdl_load_full( vg_mem.scratch, filename );
}
}
/*
* Compile meshes into the world scenes
*/
- world.scene_geo = scene_init( world.dynamic_vgl, 500000, 1200000 );
+ world.scene_geo = scene_init( world.dynamic_vgl, 350000, 1200000 );
/*
* TODO: System to dynamically allocate these
m4x3f midentity;
m4x3_identity( midentity );
- world_load_instance_cache();
-
/*
* Generate scene: collidable geometry
* ----------------------------------------------------------------
world.scene_no_collide = scene_init( world.dynamic_vgl, 200000, 500000 );
vg_info( "Applying foliage\n" );
+ srand(0);
world_apply_procedural_foliage();
scene_copy_slice( world.scene_no_collide, &world.sm_foliage_main );
world.scene_no_collide = NULL;
}
+VG_STATIC int reset_player( int argc, char const *argv[] );
VG_STATIC void world_post_process(void)
{
/* initialize audio if need be */
/*
* Setup scene collider
*/
+
+ reset_player( 1, (const char *[]){"start"} );
}
}
/* delete the entire block of memory */
- memset( world.dynamic_vgl, 0xff, 72*1024*1024 );
-
vg_linear_clear( world.dynamic_vgl );
-
- for( u32 i=0; i<72*1024*1024; i++ )
- ((u8 *)world.dynamic_vgl)[i] = 0xff^i;
+ vg_linear_clear( world.audio_vgl );
/* clean dangling pointers */
world.meta = NULL;
world.audio_things = NULL;
world.audio_things_count = 0;
- world.logic_entities = NULL;
- world.logic_entity_count = 0;
-
- world.logic_actions = NULL;
- world.logic_action_count = 0;
-
world.triggers = NULL;
world.trigger_count = 0;
+ world.logic_relays = NULL;
+ world.relay_count = 0;
+
+ world.logic_achievements = NULL;
+ world.achievement_count = 0;
+
world.nodes = NULL;
world.node_count = 0;
world.collectors = NULL;
world.collector_count = 0;
- world.instance_cache_count = 0;
world.water.enabled = 0;
}
projects / carveJwlIkooP6JGAAIwe30JlM.git / blobdiff