X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_gen.h;h=89fea39c9f5068227257a806da896f1aad23db4a;hb=3e8fda9c7cbc50d1ae95195905c953bdeedf71b9;hp=ccd3eda875feb36294f81108447610e2ecf730b2;hpb=47941822dae18a018c985847b052e70214a3ccc6;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world_gen.h b/world_gen.h index ccd3eda..89fea39 100644 --- a/world_gen.h +++ b/world_gen.h @@ -8,8 +8,7 @@ #include "world.h" /* load world TODO: Put back vg back in loading state while this happens */ -VG_STATIC void world_load( const char *mdl_file ); - +VG_STATIC void world_load(void); VG_STATIC void world_add_all_if_material( m4x3f transform, scene *pscene, @@ -28,33 +27,76 @@ VG_STATIC void world_add_all_if_material( m4x3f transform, scene *pscene, mdl_node_transform( pnode, transform2 ); m4x3_mul( transform, transform2, transform2 ); - scene_add_submesh( pscene, mdl, sm, transform2 ); + scene_add_mdl_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; +VG_STATIC void world_add_blob( scene *pscene, ray_hit *hit ) +{ + m4x3f transform; + v4f qsurface, qrandom; + v3f axis; - m4x3f transform2; - mdl_node_transform( pnode, transform2 ); - m4x3_mul( transform, transform2, transform2 ); + v3_cross( (v3f){0.0f,1.0f,0.0f}, hit->normal, axis ); - world_add_all_if_material( transform2, pscene, mdl2, id ); - } - } -#endif + float angle = v3_dot(hit->normal,(v3f){0.0f,1.0f,0.0f}); + q_axis_angle( qsurface, axis, angle ); + q_axis_angle( qrandom, (v3f){0.0f,1.0f,0.0f}, vg_randf()*VG_TAUf ); + q_mul( qsurface, qrandom, qsurface ); + q_m3x3( qsurface, transform ); + v3_copy( hit->pos, transform[3] ); + + scene_vert verts[] = + { + { .co = { -1.00f, 0.0f, 0.0f } }, + { .co = { 1.00f, 0.0f, 0.0f } }, + { .co = { -1.00f, 1.2f, 0.0f } }, + { .co = { 1.00f, 1.2f, 0.0f } }, + { .co = { -0.25f, 2.0f, 0.0f } }, + { .co = { 0.25f, 2.0f, 0.0f } } + }; + + const u32 indices[] = { 0,1,3, 0,3,2, 2,3,5, 2,5,4 }; + + if( pscene->vertex_count + vg_list_size(verts) > pscene->max_vertices ) + vg_fatal_exit_loop( "Scene vertex buffer overflow" ); + + if( pscene->indice_count + vg_list_size(indices) > pscene->max_indices ) + vg_fatal_exit_loop( "Scene index buffer overflow" ); + + scene_vert *dst_verts = &pscene->arrvertices[ pscene->vertex_count ]; + u32 *dst_indices = &pscene->arrindices [ pscene->indice_count ]; + + scene_vert *ref = &world.scene_geo->arrvertices[ hit->tri[0] ]; + + for( u32 i=0; ico, pvert->co ); + scene_vert_pack_norm( pvert, transform[1] ); + + v2_copy( ref->uv, pvert->uv ); } + + for( u32 i=0; ivertex_count; + + pscene->vertex_count += vg_list_size(verts); + pscene->indice_count += vg_list_size(indices); } /* Sprinkle foliage models over the map on terrain material */ -VG_STATIC void world_apply_procedural_foliage(void) +VG_STATIC void world_apply_procedural_foliage( struct world_material *mat ) { + if( vg.quality_profile == k_quality_profile_low ) + return; + + vg_info( "Applying foliage (%u)\n", mat->info.pstr_name ); + vg_linear_clear( vg_mem.scratch ); mdl_context *mfoliage = @@ -64,11 +106,17 @@ VG_STATIC void world_apply_procedural_foliage(void) v3_sub( world.scene_geo->bbx[1], world.scene_geo->bbx[0], volume ); volume[1] = 1.0f; - m4x3f transform; mdl_node *mblob = mdl_node_from_name( mfoliage, "blob" ); mdl_submesh *sm_blob = mdl_node_submesh( mfoliage, mblob, 0 ); - for( int i=0;i<100000;i++ ) + int count = 0; + + float area = volume[0]*volume[2]; + u32 particles = 0.08f * area; + + vg_info( "Map area: %f. Max particles: %u\n", area, particles ); + + for( int i=0;i 0.8f) && ray_hit_is_terrain(&hit) && - (hit.pos[1] > 0.0f+10.0f) ) + struct world_material *m1 = ray_hit_material( &hit ); + if((hit.normal[1] > 0.8f) && (m1 == mat) && (hit.pos[1] > 0.0f+10.0f)) { - v4f qsurface, qrandom; - v3f axis; - - v3_cross( (v3f){0.0f,1.0f,0.0f}, hit.normal, axis ); - - float angle = v3_dot(hit.normal,(v3f){0.0f,1.0f,0.0f}); - q_axis_angle( qsurface, axis, angle ); - q_axis_angle( qrandom, (v3f){0.0f,1.0f,0.0f}, vg_randf()*VG_TAUf ); - q_mul( qsurface, qrandom, qsurface ); - q_m3x3( qsurface, transform ); - - v3_copy( hit.pos, transform[3] ); - scene_add_submesh( world.scene_no_collide, mfoliage, - sm_blob, transform); + world_add_blob( world.scene_no_collide, &hit ); + count ++; } } } + + vg_info( "%d foliage models added\n", count ); } VG_STATIC void world_ents_allocate(void) @@ -134,6 +172,16 @@ VG_STATIC void world_ents_allocate(void) 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) } }; @@ -148,6 +196,7 @@ VG_STATIC void world_ents_allocate(void) { if( pnode->classtype == entity_counts[j].ct ) { + pnode->sub_uid = entity_counts[j].count; entity_counts[j].count ++; break; } @@ -181,67 +230,8 @@ VG_STATIC void world_pct_water( mdl_node *pnode ) return; } - mdl_submesh *sm = mdl_node_submesh( world.meta, pnode, 0 ); - - if( sm ) - { - vg_acquire_thread_sync(); - { - mdl_unpack_submesh( world.meta, &world.mesh_water, sm ); - world.water.enabled = 1; - water_set_surface( pnode->co[1] ); - } - vg_release_thread_sync(); - } - else - { - vg_warn( "Water entity has no submeshes!\n" ); - } -} - -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; ipstr_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 - } + world.water.enabled = 1; + water_set_surface( pnode->co[1] ); } VG_STATIC void world_pct_audio( mdl_node *pnode ) @@ -261,7 +251,9 @@ VG_STATIC void world_pct_audio( mdl_node *pnode ) 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; @@ -269,6 +261,71 @@ VG_STATIC void world_pct_audio( mdl_node *pnode ) 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; itargets); 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 @@ -280,8 +337,10 @@ VG_STATIC void world_entities_process(void) { { 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; iinfo.node_count; i++ ) @@ -298,62 +357,6 @@ VG_STATIC void world_entities_process(void) 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; iptarget_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; ipstr_file ); - inst->mdl = mdl_load_full( vg_mem.scratch, filename ); } } @@ -362,79 +365,31 @@ VG_STATIC void world_generate(void) /* * Compile meshes into the world scenes */ - world.scene_geo = scene_init( world.dynamic_vgl, 500000, 1200000 ); - - /* - * TODO: System to dynamically allocate these - */ - u32 mat_surf = 0, - mat_surf_oob = 0, - mat_vertex_blend = 0, - mat_alphatest = 0, - mat_graffiti = 0, - mat_subworld = 0, - mat_terrain = 0; - - for( int i=1; iinfo.material_count; i++ ) - { - mdl_material *mat = &world.meta->material_buffer[ i ]; - const char *mat_name = mdl_pstr( world.meta, mat->pstr_name ); - - if( !strcmp( "surf", mat_name )) - mat_surf = i; - else if( !strcmp( "surf_oob", mat_name )) - mat_surf_oob = i; - else if( !strcmp( "vertex_blend", mat_name )) - mat_vertex_blend = i; - else if( !strcmp( "alphatest", mat_name )) - mat_alphatest = i; - else if( !strcmp( "graffitibox", mat_name )) - mat_graffiti = i; - else if( !strcmp( "terrain", mat_name ) ) - mat_terrain = i; - } + world.scene_geo = scene_init( world.dynamic_vgl, 320000, 1200000 ); m4x3f midentity; m4x3_identity( midentity ); - world_load_instance_cache(); - /* * Generate scene: collidable geometry * ---------------------------------------------------------------- */ vg_info( "Generating collidable geometry\n" ); - vg_info( "terrain...\n" ); - /* terrain */ - if( mat_terrain ) - world_add_all_if_material( midentity, world.scene_geo, - world.meta, mat_terrain ); - scene_copy_slice( world.scene_geo, &world.sm_terrain ); - - /* oob */ - vg_info( "oob...\n" ); - if( mat_surf_oob ) - world_add_all_if_material( midentity, world.scene_geo, - world.meta, mat_surf_oob ); - else - vg_warn( "No OOB surface\n" ); - scene_copy_slice( world.scene_geo, &world.sm_geo_std_oob ); - - - /* surface */ - vg_info( "surface...\n" ); - if( mat_surf ) - world_add_all_if_material( midentity, world.scene_geo, - world.meta, mat_surf ); - scene_copy_slice( world.scene_geo, &world.sm_geo_std ); - - /* vertex_blend */ - vg_info( "vertex blend...\n" ); - if( mat_vertex_blend ) - world_add_all_if_material( midentity, world.scene_geo, - world.meta, mat_vertex_blend); - scene_copy_slice( world.scene_geo, &world.sm_geo_vb ); + + + for( int i=0; iinfo.flags & k_material_flag_collision ) + world_add_all_if_material( midentity, world.scene_geo, world.meta, i ); + + scene_copy_slice( world.scene_geo, &mat->sm_geo ); + } + + + /* compress that bad boy */ world.scene_geo = scene_fix( world.dynamic_vgl, world.scene_geo ); @@ -464,20 +419,21 @@ VG_STATIC void world_generate(void) world.scene_no_collide = scene_init( world.dynamic_vgl, 200000, 500000 ); - vg_info( "Applying foliage\n" ); - world_apply_procedural_foliage(); - scene_copy_slice( world.scene_no_collide, &world.sm_foliage_main ); + for( int i=0; iinfo.flags & k_material_flag_collision) ) + { + world_add_all_if_material( midentity, world.scene_no_collide, + world.meta, i ); + } - vg_info( "graffiti...\n" ); - world_add_all_if_material( midentity, world.scene_no_collide, - world.meta, mat_graffiti ); - scene_copy_slice( world.scene_no_collide, &world.sm_graffiti ); + if( mat->info.flags & k_material_flag_grow_grass ) + world_apply_procedural_foliage( mat ); + scene_copy_slice( world.scene_no_collide, &mat->sm_no_collide ); + } /* upload and free that */ vg_acquire_thread_sync(); @@ -490,6 +446,7 @@ VG_STATIC void world_generate(void) 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 */ @@ -516,8 +473,7 @@ VG_STATIC void world_post_process(void) /* * Rendering the depth map */ - m4x4f ortho; - m4x3f camera; + camera ortho; v3f extent; v3_sub( world.scene_geo->bbx[1], world.scene_geo->bbx[0], extent ); @@ -529,30 +485,34 @@ VG_STATIC void world_post_process(void) rl = 1.0f / (fr-fl), tb = 1.0f / (ft-fb); - m4x4_zero( ortho ); - ortho[0][0] = 2.0f * rl; - ortho[2][1] = 2.0f * tb; - ortho[3][0] = (fr + fl) * -rl; - ortho[3][1] = (ft + fb) * -tb; - ortho[3][3] = 1.0f; - m4x3_identity( camera ); + m4x4_zero( ortho.mtx.p ); + ortho.mtx.p[0][0] = 2.0f * rl; + ortho.mtx.p[2][1] = 2.0f * tb; + ortho.mtx.p[3][0] = (fr + fl) * -rl; + ortho.mtx.p[3][1] = (ft + fb) * -tb; + ortho.mtx.p[3][3] = 1.0f; + m4x3_identity( ortho.transform ); + camera_update_view( &ortho ); + camera_finalize( &ortho ); - glViewport( 0, 0, 1024, 1024 ); glDisable(GL_DEPTH_TEST); - glBindFramebuffer( GL_FRAMEBUFFER, gpipeline.fb_depthmap ); - shader_fscolour_use(); - shader_fscolour_uColour( (v4f){-9999.0f,-9999.0f,-9999.0f,-9999.0f} ); + glDisable(GL_BLEND); + glDisable(GL_CULL_FACE); + render_fb_bind( gpipeline.fb_heightmap ); + shader_blitcolour_use(); + shader_blitcolour_uColour( (v4f){-9999.0f,-9999.0f,-9999.0f,-9999.0f} ); render_fsquad(); + /* todo: hmm?? */ glEnable(GL_BLEND); glBlendFunc(GL_ONE, GL_ONE); glBlendEquation(GL_MAX); - render_world_depth( ortho, camera ); + + render_world_depth( &ortho ); glDisable(GL_BLEND); glEnable(GL_DEPTH_TEST); glBindFramebuffer( GL_FRAMEBUFFER, 0 ); - /* * TODO: World settings entity */ @@ -576,29 +536,120 @@ VG_STATIC void world_post_process(void) vg_release_thread_sync(); +#if 0 /* * Setup scene collider */ + reset_player( 1, (const char *[]){"start"} ); +#endif } +VG_STATIC void world_process_resources(void) +{ + vg_info( "Loading textures\n" ); + world.texture_count = world.meta->info.texture_count; + world.textures = + vg_linear_alloc( world.dynamic_vgl, sizeof(GLuint)*world.texture_count ); + + vg_acquire_thread_sync(); + { + /* error texture */ + world.textures[0] = vg_tex2d_new(); + vg_tex2d_set_error(); + vg_tex2d_nearest(); + vg_tex2d_repeat(); + + for( int i=1; itexture_buffer[i]; + + if( !tex->pack_offset ) + { + vg_release_thread_sync(); + vg_fatal_exit_loop( "World models must have packed textures!" ); + } + + vg_linear_clear( vg_mem.scratch ); + world.textures[i] = vg_tex2d_new(); + vg_tex2d_set_error(); + vg_tex2d_qoi( world.meta->pack + tex->pack_offset, tex->pack_length, + mdl_pstr( world.meta, tex->pstr_name )); + vg_tex2d_nearest(); + vg_tex2d_repeat(); + } + } + vg_release_thread_sync(); + + vg_info( "Loading materials\n" ); + + u32 size = sizeof(struct world_material) * world.meta->info.material_count; + world.materials = vg_linear_alloc( world.dynamic_vgl, size ); + + world.material_count = world.meta->info.material_count; + memset( world.materials, 0, size ); + + for( int i=1; imaterial_buffer[i]; + + /* error material */ + struct world_material *errmat = &world.materials[0]; + v4_copy( (v4f){ 1.0f,0.0f,0.0f,1.0f }, errmat->info.colour ); + v4_copy( (v4f){ 1.0f,0.0f,0.0f,1.0f }, errmat->info.colour1 ); + errmat->info.flags = 0x00; + errmat->info.pstr_name = 0; /* useless? */ + errmat->info.shader = -1; + errmat->info.tex_decal = 0; + errmat->info.tex_diffuse = 0; + errmat->info.tex_normal = 0; +} VG_STATIC void world_unload(void) { + vg_acquire_thread_sync(); + /* free meshes */ + mesh_free( &world.mesh_route_lines ); mesh_free( &world.mesh_geo ); mesh_free( &world.mesh_no_collide ); - mesh_free( &world.mesh_route_lines ); - mesh_free( &world.mesh_water ); + + world.time = 0.0; + world.rewind_from = 0.0; + world.rewind_to = 0.0; + world.last_use = 0.0; + world.active_gate = 0; + world.current_run_version = 2; + world.active_route_board = 0; + v3_zero( world.render_gate_pos ); + + for( int i=0; isegment_start = 0; + uib->segment_count = 0; + uib->fade_start = 0; + uib->fade_count = 0; + uib->fade_timer_start = 0.0; + uib->xpos = 0.0f; + } + + /* delete textures and meshes */ + glDeleteTextures( world.texture_count, world.textures ); /* delete the entire block of memory */ vg_linear_clear( world.dynamic_vgl ); + vg_linear_clear( world.audio_vgl ); /* clean dangling pointers */ world.meta = NULL; + + world.textures = NULL; + world.texture_count = 0; + world.materials = NULL; + world.material_count = 0; world.scene_geo = NULL; - world.scene_lines = NULL; world.scene_no_collide = NULL; + world.scene_lines = NULL; world.geo_bh = NULL; world.trigger_bh = NULL; @@ -610,15 +661,15 @@ VG_STATIC void world_unload(void) 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; @@ -631,16 +682,20 @@ VG_STATIC void world_unload(void) world.collectors = NULL; world.collector_count = 0; - world.instance_cache_count = 0; world.water.enabled = 0; + + vg_release_thread_sync(); } -VG_STATIC void world_load( const char *mdl_file ) +VG_STATIC void world_load(void) { world_unload(); - world.meta = mdl_load_full( world.dynamic_vgl, mdl_file ); - vg_info( "Loading world: %s\n", mdl_file ); + world.meta = mdl_load_full( world.dynamic_vgl, world.world_name ); + vg_info( "Loading world: %s\n", world.world_name ); + + /* process resources from pack */ + world_process_resources(); /* dynamic allocations */ world_ents_allocate();