X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_gen.h;h=fb6031b32f02552d908f2c00abffc599641dbd88;hb=16f58e6b8d79762919000b9ae8266ad55a01a870;hp=5120bd758fe6e2ff09c7ec6ce5051fdba5b756fc;hpb=2673c575386c604fc2c0603dba2480eda05cf97a;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world_gen.h b/world_gen.h index 5120bd7..fb6031b 100644 --- a/world_gen.h +++ b/world_gen.h @@ -126,195 +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_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 ) -{ - 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_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[ - 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_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; imeta->info.node_count; i++ ) - { - mdl_node *pnode = mdl_node_from_id( world->meta, i ); - - for( int j=0; jclasstype == 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" ); - world_instance *a = &world_global.worlds[ index_a ], - *b = &world_global.worlds[ index_b ]; - - for( int i=0; inonlocalgate_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; jnonlocalgate_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 - -#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 ) { /* @@ -430,16 +241,23 @@ VG_STATIC void world_compute_light_indices( world_instance *world ) icubes_max[i] = cubes_max[i]; } + v3f cube_size; + v3i icubes_count; v3i_sub( icubes_max, icubes_min, icubes_count ); for( int i=0; i<3; i++ ){ - icubes_count[i] = VG_MIN( 128, icubes_count[i]+1 ); - cubes_max[i] = icubes_min[i] + icubes_count[i]; + int clamped_count = VG_MIN( 128, icubes_count[i]+1 ); + float clamped_max = icubes_min[i] + clamped_count, + max = icubes_min[i] + icubes_count[i]+1; + + icubes_count[i] = clamped_count; + cube_size[i] = (max / clamped_max) * k_light_cube_size; + cubes_max[i] = clamped_max; } - v3_muls( cubes_min, k_light_cube_size, cubes_min ); - v3_muls( cubes_max, k_light_cube_size, cubes_max ); + v3_mul( cubes_min, cube_size, cubes_min ); + v3_mul( cubes_max, cube_size, cubes_max ); for( int i=0; i<3; i++ ){ float range = cubes_max[i]-cubes_min[i]; @@ -452,17 +270,13 @@ VG_STATIC void world_compute_light_indices( world_instance *world ) int total_cubes = icubes_count[0]*icubes_count[1]*icubes_count[2]; u32 *cubes_index = vg_linear_alloc( world_global.generic_heap, - total_cubes * sizeof(u32) * 2.0f ); + vg_align8(total_cubes*sizeof(u32)*2) ); vg_info( "Computing light cubes (%d) [%f %f %f] -> [%f %f %f]\n", total_cubes, cubes_min[0], -cubes_min[2], cubes_min[1], cubes_max[0], -cubes_max[2], cubes_max[1] ); - v3_copy( cubes_min, world->ub_lighting.g_cube_min ); - v3f cube_size; - v3_div( (v3f){1.0f,1.0f,1.0f}, world->ub_lighting.g_cube_inv_range, - cube_size ); float bound_radius = v3_length( cube_size ); for( int iz = 0; izcolour, light->colour[3] * 2.0f, light_dst[i*3+0] ); - light_dst[i*3+0][3] = -1.0f; + light_dst[i*3+0][3] = 2.0f; if( !light->daytime ){ - u32 hash = (i * 29986577) & 0xff; + u32 hash = (i * 29986577u) & 0xffu; float switch_on = hash; switch_on *= (1.0f/255.0f); @@ -705,13 +519,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 ) @@ -722,7 +529,7 @@ VG_STATIC void world_process_resources( world_instance *world ) world->texture_count = world->meta.textures.count+1; world->textures = vg_linear_alloc( world_global.generic_heap, - sizeof(GLuint)*world->texture_count ); + vg_align8(sizeof(GLuint)*world->texture_count) ); vg_acquire_thread_sync(); { @@ -756,7 +563,7 @@ VG_STATIC void world_process_resources( world_instance *world ) world->surface_count = world->meta.materials.count+1; world->surfaces = vg_linear_alloc( world_global.generic_heap, - sizeof(struct world_surface)*world->surface_count ); + vg_align8(sizeof(struct world_surface)*world->surface_count) ); /* error material */ struct world_surface *errmat = &world->surfaces[0]; @@ -806,17 +613,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; @@ -887,12 +687,50 @@ VG_STATIC void world_entities_init( world_instance *world ) world->water.enabled = 1; water_set_surface( world, water->transform.co[1] ); } + + /* volumes */ + for( u32 j=0; jent_volume); j++ ){ + ent_volume *volume = mdl_arritm( &world->ent_volume, j ); + mdl_transform_m4x3( &volume->transform, volume->to_world ); + m4x3_invert_full( volume->to_world, volume->to_local ); + } + + /* audio packs */ + for( u32 j=0; jent_audio); j++ ){ + ent_audio *audio = mdl_arritm( &world->ent_audio, j ); + + for( u32 k=0; kclip_count; k++ ){ + ent_audio_clip *clip = mdl_arritm( &world->ent_audio_clip, + audio->clip_start+k ); + + if( clip->file.pack_size ){ + u32 size = clip->file.pack_size, + offset = clip->file.pack_offset; + + /* FIXME: Ditchable asset! */ + void *data = mdl_arritm(&world->meta.pack, clip->file.pack_offset); + + clip->clip.path = NULL; + clip->clip.flags = audio->flags; + clip->clip.data = data; + clip->clip.size = size; + } + else{ + clip->clip.path = mdl_pstr( &world->meta, clip->file.pstr_path ); + clip->clip.flags = audio->flags; + clip->clip.data = NULL; + clip->clip.size = 0; + } + + audio_clip_load( &clip->clip, world_global.generic_heap ); + } + } } 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 ); @@ -900,6 +738,8 @@ VG_STATIC void world_load( world_instance *world, const char *path ) mdl_load_metadata_block( &world->meta, world_global.generic_heap ); mdl_load_animation_block( &world->meta, world_global.generic_heap ); mdl_load_mesh_block( &world->meta, world_global.generic_heap ); + + /* TODO: This should get a seperate memory area */ mdl_load_pack_block( &world->meta, world_global.generic_heap ); mdl_load_array( &world->meta, &world->ent_gate, @@ -919,6 +759,12 @@ VG_STATIC void world_load( world_instance *world, const char *path ) "ent_route", world_global.generic_heap ); mdl_load_array( &world->meta, &world->ent_water, "ent_water", world_global.generic_heap ); + mdl_load_array( &world->meta, &world->ent_audio_clip, + "ent_audio_clip", world_global.generic_heap ); + mdl_load_array( &world->meta, &world->ent_audio, + "ent_audio", world_global.generic_heap ); + mdl_load_array( &world->meta, &world->ent_volume, + "ent_volume", world_global.generic_heap ); mdl_close( &world->meta ); @@ -934,6 +780,11 @@ VG_STATIC void world_load( world_instance *world, const char *path ) #endif world_routes_ent_init( world ); world_entities_init( world ); + world->volume_bh = bh_create( world_global.generic_heap, + &bh_system_volumes, + world, + mdl_arrcount( &world->ent_volume ), + 1 ); /* main bulk */ world_generate( world );