X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world.h;h=b9814f89aff027da117e8e6503237c56f99ac86b;hb=72c40f1bc7a732f6a628dbf8a4135ac0bf3efa4e;hp=9883b295d6916bb06b3466f057301b29cf2fe08e;hpb=66b3ec9c538fefd79c2de08e0dcdf070b4331885;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world.h b/world.h index 9883b29..b9814f8 100644 --- a/world.h +++ b/world.h @@ -118,6 +118,8 @@ struct world_instance tex_light_entities, tex_light_cubes; + float probabilities[3]; + v3i light_cubes; struct framebuffer heightmap; @@ -154,7 +156,12 @@ struct world_instance ent_route_node, ent_path_index, ent_checkpoint, - ent_route; + ent_route, + ent_water, + + ent_audio_clip, + ent_audio, + ent_volume; ent_gate *rendering_gate; @@ -465,6 +472,134 @@ VG_STATIC void world_init(void) VG_MEMORY_SYSTEM ); } +typedef struct ent_call ent_call; +struct ent_call{ + ent_index ent; + u32 function; + void *data; +}; + +VG_STATIC void entity_call( world_instance *world, ent_call *call ); + +VG_STATIC void ent_volume_call( world_instance *world, ent_call *call ) +{ + ent_volume *volume = mdl_arritm( &world->ent_volume, call->ent.index ); + if( !volume->target.type ) return; + + if( call->function == k_ent_function_trigger ){ + call->ent = volume->target; + + if( volume->type == k_volume_subtype_particle ){ + v3f co; + co[0] = vg_randf()*2.0f-1.0f; + co[1] = vg_randf()*2.0f-1.0f; + co[2] = vg_randf()*2.0f-1.0f; + m4x3_mulv( volume->to_world, co, co ); + + call->function = k_ent_function_particle_spawn; + call->data = co; + entity_call( world, call ); + } + else + entity_call( world, call ); + } +} + +VG_STATIC void ent_audio_call( world_instance *world, ent_call *call ) +{ + ent_audio *audio = mdl_arritm( &world->ent_audio, call->ent.index ); + + v3f sound_co; + + if( call->function == k_ent_function_particle_spawn ){ + v3_copy( call->data, sound_co ); + } + else if( call->function == k_ent_function_trigger ){ + v3_copy( audio->transform.co, sound_co ); + } + else + vg_fatal_exit_loop( "ent_audio_call (invalid function id)" ); + + float chance = vg_randf()*100.0f, + bar = 0.0f; + + for( u32 i=0; iclip_count; i++ ){ + ent_audio_clip *clip = mdl_arritm( &world->ent_audio_clip, + audio->clip_start+i ); + + float mod = world->probabilities[ audio->probability_curve ], + p = clip->probability * mod; + + bar += p; + + if( chance < bar ){ + + audio_lock(); + + if( audio->behaviour == k_channel_behaviour_unlimited ){ + audio_oneshot_3d( &clip->clip, sound_co, + audio->transform.s[0], + audio->volume ); + } + else if( audio->behaviour == k_channel_behaviour_discard_if_full ){ + audio_channel *ch = + audio_get_group_idle_channel( audio->group, + audio->max_channels ); + + if( ch ){ + audio_channel_init( ch, &clip->clip, audio->flags ); + audio_channel_group( ch, audio->group ); + audio_channel_set_spacial( ch, sound_co, audio->transform.s[0] ); + audio_channel_edit_volume( ch, audio->volume, 1 ); + ch = audio_relinquish_channel( ch ); + } + } + else if( audio->behaviour == k_channel_behaviour_crossfade_if_full){ + audio_channel *ch = + audio_get_group_idle_channel( audio->group, + audio->max_channels ); + + /* group is full */ + if( !ch ){ + audio_channel *existing = + audio_get_group_first_active_channel( audio->group ); + + if( existing ){ + if( existing->source == &clip->clip ){ + audio_unlock(); + return; + } + + existing->group = 0; + existing = audio_channel_fadeout(existing, audio->crossfade); + } + + ch = audio_get_first_idle_channel(); + } + + if( ch ){ + audio_channel_init( ch, &clip->clip, audio->flags ); + audio_channel_group( ch, audio->group ); + audio_channel_fadein( ch, audio->crossfade ); + ch = audio_relinquish_channel( ch ); + } + } + + audio_unlock(); + return; + } + } +} + +VG_STATIC void entity_call( world_instance *world, ent_call *call ) +{ + if( call->ent.type == k_ent_volume ){ + ent_volume_call( world, call ); + } else if( call->ent.type == k_ent_audio ){ + ent_audio_call( world, call ); + } +} + VG_STATIC void world_update( world_instance *world, v3f pos ) { /* TEMP!!!!!! */ @@ -494,6 +629,15 @@ VG_STATIC void world_update( world_instance *world, v3f pos ) v3_normalize( state->g_sun_dir ); + world->probabilities[ k_probability_curve_constant ] = 1.0f; + + float dp = state->g_day_phase; + + world->probabilities[ k_probability_curve_wildlife_day ] = + (dp*dp*0.8f+state->g_sunset_phase)*0.8f; + world->probabilities[ k_probability_curve_wildlife_night ] = + 1.0f-powf(fabsf((state->g_time_of_day-0.5f)*5.0f),5.0f); + glBindBuffer( GL_UNIFORM_BUFFER, world->ubo_lighting ); glBufferSubData( GL_UNIFORM_BUFFER, 0, @@ -548,8 +692,7 @@ VG_STATIC void world_update( world_instance *world, v3f pos ) } sfd_update(); -#if 0 - /* TODO: Bvh */ + static float random_accum = 0.0f; random_accum += vg.time_delta; @@ -572,69 +715,50 @@ VG_STATIC void world_update( world_instance *world, v3f pos ) int in_volume = 0; - while( bh_next( world->volume_bh, &it, volume_proximity, &idx ) ) - { - struct world_volume *zone = &world->volumes[idx]; + while( bh_next( world->volume_bh, &it, volume_proximity, &idx ) ){ + ent_volume *volume = mdl_arritm( &world->ent_volume, idx ); - if( zone->node->classtype == k_classtype_volume_audio ) - { - vg_line_boxf_transformed( zone->transform, (boxf){{-1.0f,-1.0f,-1.0f}, - { 1.0f, 1.0f, 1.0f}}, - 0xff00c0ff ); -#if 0 - for( int j=0; jtype == k_volume_subtype_trigger ){ + v3f local; + m4x3_mulv( volume->to_local, pos, local ); + + if( (fabsf(local[0]) <= 1.0f) && + (fabsf(local[1]) <= 1.0f) && + (fabsf(local[2]) <= 1.0f) ) { - logic_packet packet; - packet.location = zone->target_logic_brick; - packet.function = 0; + in_volume = 1; + vg_line_boxf_transformed( volume->to_world, cube, 0xff00ff00 ); - packet.type = k_mdl_128bit_datatype_vec3; - packet.data._v4f[0] = vg_randf()*2.0f-1.0f; - packet.data._v4f[1] = vg_randf()*2.0f-1.0f; - packet.data._v4f[2] = vg_randf()*2.0f-1.0f; - m4x3_mulv( zone->transform, packet.data._v4f, packet.data._v4f ); + if( !world_global.in_volume ){ + ent_call basecall; + basecall.ent.index = idx; + basecall.ent.type = k_ent_volume; + basecall.function = k_ent_function_trigger; + basecall.data = NULL; - logic_bricks_send_packet( world, &packet ); + entity_call( world, &basecall ); + } } -#endif - continue; + else + vg_line_boxf_transformed( volume->to_world, cube, 0xff0000ff ); } + else if( volume->type == k_volume_subtype_particle ){ + vg_line_boxf_transformed( volume->to_world, cube, 0xff00c0ff ); - v3f local; - m4x3_mulv( zone->inv_transform, pos, local ); - - if( (fabsf(local[0]) <= 1.0f) && - (fabsf(local[1]) <= 1.0f) && - (fabsf(local[2]) <= 1.0f) ) - { - in_volume = 1; - - if( !world_global.in_volume ) - { -#if 0 - logic_packet packet; - packet.location = zone->target_logic_brick; - packet.function = 0; - - packet.type = k_mdl_128bit_datatype_vec3; - v3_copy( pos, packet.data._v4f ); + for( int j=0; jtransform, (boxf){{-1.0f,-1.0f,-1.0f}, - { 1.0f, 1.0f, 1.0f}}, - 0xff00ff00 ); - } - else - { - vg_line_boxf_transformed( zone->transform, (boxf){{-1.0f,-1.0f,-1.0f}, - { 1.0f, 1.0f, 1.0f}}, - 0xff0000ff ); } } -#endif + world_global.in_volume = in_volume; #if 0 if( k_debug_light_indices ) @@ -656,7 +780,6 @@ VG_STATIC void world_update( world_instance *world, v3f pos ) } } - world_global.in_volume = in_volume; #endif #if 0