X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world.h;h=106b8247334270807d2e8112095ae3fde022580b;hb=000297f007a08b25f458656bfb8dfe4345f2ec32;hp=69def4c85875df63fa9bd9a9c0d207738b94daeb;hpb=0136a935c00e3ea1f231fd88b38b44982fd409ac;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world.h b/world.h index 69def4c..106b824 100644 --- a/world.h +++ b/world.h @@ -170,17 +170,21 @@ struct world_instance struct world_audio_thing { v3f pos; - float volume; + float volume, range; u32 flags; +#if 0 audio_player player; +#endif + audio_clip temp_embedded_clip; } * audio_things; u32 audio_things_count; +#if 0 /* - * Relays + * Relays [ DEPRECATED ] */ struct logic_relay { @@ -196,6 +200,34 @@ struct world_instance } * logic_relays; u32 relay_count; +#endif + + struct soundscape + { + /* locking */ + audio_channel *channels[4]; + + /* accessable without locking */ + v3f spawn_position; + + u32 usage_count; + u32 max_instances; + u32 allow_transitions; + float transition_duration; + const char *label; + } + * soundscapes; + u32 soundscape_count; + + struct logic_brick_ref + { + mdl_node *node; + float usage; + u32 internal_id; /* used for things like soundscapes where another + allocation is made on top */ + } + * logic_bricks; + u32 logic_brick_count; /* * Box trigger entities @@ -203,8 +235,9 @@ struct world_instance struct trigger_zone { m4x3f transform, inv_transform; - - struct relay_target target; + + u32 target_logic_brick; + enum classtype classtype; } * triggers; u32 trigger_count; @@ -437,6 +470,7 @@ int ray_world( world_instance *world, v3f pos, v3f dir, ray_hit *hit ); #include "world_sfd.h" #include "world_render.h" #include "world_water.h" +#include "world_logic_bricks.h" #include "world_gen.h" #include "world_gate.h" @@ -455,6 +489,7 @@ VG_STATIC int world_stop_sound( int argc, const char *argv[] ) * Therefore it is safe to delete clip data after the players are * disconnected */ +#if 0 audio_lock(); for( int i=0; iaudio_things_count; i++ ) { @@ -467,6 +502,7 @@ VG_STATIC int world_stop_sound( int argc, const char *argv[] ) } } audio_unlock(); +#endif return 0; } @@ -571,6 +607,7 @@ VG_STATIC void world_audio_init(void) #endif } +#if 0 VG_STATIC void world_trigger_achievement( world_instance *world, u32 uid ) { struct logic_achievement *ach = &world->logic_achievements[ uid ]; @@ -583,7 +620,9 @@ VG_STATIC void world_trigger_achievement( world_instance *world, u32 uid ) ach->achieved = 1; } +#endif +#if 0 VG_STATIC void world_run_relay( world_instance *world, struct relay_target *rt ); @@ -596,7 +635,9 @@ VG_STATIC void world_trigger_relay( world_instance *world, u32 uid ) world_run_relay( world, &relay->targets[i] ); } } +#endif +#if 0 VG_STATIC void world_trigger_audio( world_instance *world, u32 uid ) { struct world_audio_thing *wat = &world->audio_things[ uid ]; @@ -606,7 +647,9 @@ VG_STATIC void world_trigger_audio( world_instance *world, u32 uid ) &wat->temp_embedded_clip ); audio_unlock(); } +#endif +#if 0 VG_STATIC void world_run_relay( world_instance *world, struct relay_target *rt ) { @@ -619,7 +662,8 @@ VG_STATIC void world_run_relay( world_instance *world, { { k_classtype_logic_achievement, world_trigger_achievement }, { k_classtype_logic_relay, world_trigger_relay }, - { k_classtype_audio, world_trigger_audio } + { k_classtype_audio, world_trigger_audio }, + { k_classtype_logic_wire, logic_bricks_trigger_brick } }; for( int i=0; iclasstype ); } +#endif VG_STATIC void world_update( world_instance *world, v3f pos ) { @@ -747,11 +792,56 @@ VG_STATIC void world_update( world_instance *world, v3f pos ) } } } + + /* TODO: Bvh */ + + static float random_accum = 0.0f; + random_accum += vg.time_delta; + + u32 random_ticks = 0; + + while( random_accum > 0.1f ) + { + random_accum -= 0.1f; + random_ticks ++; + } + + float radius = 25.0f; + boxf trigger_proximity; + v3_add( pos, (v3f){ radius, radius, radius }, trigger_proximity[1] ); + v3_sub( pos, (v3f){ radius, radius, radius }, trigger_proximity[0] ); + + bh_iter it; + bh_iter_init( 0, &it ); + int idx; int in_trigger = 0; - for( int i=0; itrigger_count; i++ ) + + while( bh_next( world->trigger_bh, &it, trigger_proximity, &idx ) ) { - struct trigger_zone *zone = &world->triggers[i]; + struct trigger_zone *zone = &world->triggers[idx]; + + if( zone->classtype == k_classtype_particle_box ) + { + vg_line_boxf_transformed( zone->transform, (boxf){{-1.0f,-1.0f,-1.0f}, + { 1.0f, 1.0f, 1.0f}}, + 0xff00c0ff ); + for( int j=0; jtarget_logic_brick; + packet.function = 0; + + 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 ); + + logic_bricks_send_packet( world, &packet ); + } + continue; + } v3f local; m4x3_mulv( zone->inv_transform, pos, local ); @@ -764,13 +854,26 @@ VG_STATIC void world_update( world_instance *world, v3f pos ) if( !world_global.in_trigger ) { - world_run_relay( world, &zone->target ); + 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 ); + + logic_bricks_send_packet( world, &packet ); } + + vg_line_boxf_transformed( zone->transform, (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 ); } - - vg_line_boxf_transformed( zone->transform, (boxf){{-1.0f,-1.0f,-1.0f}, - { 1.0f, 1.0f, 1.0f}}, - 0xff00ff00 ); } if( k_debug_light_indices ) @@ -795,6 +898,29 @@ VG_STATIC void world_update( world_instance *world, v3f pos ) world_global.in_trigger = in_trigger; sfd_update(); + + if( debug_logic_bricks ) + logic_bricks_debug( world ); + + /* process soundscape transactions */ + audio_lock(); + for( int i=0; isoundscape_count; i++ ) + { + struct soundscape *s = &world->soundscapes[i]; + s->usage_count = 0; + + for( int j=0; jmax_instances; j++ ) + { + if( s->channels[j] ) + { + if( audio_channel_finished(s->channels[j]) ) + s->channels[j] = audio_relinquish_channel( s->channels[j] ); + else + s->usage_count ++; + } + } + } + audio_unlock(); } /*