logic

[carveJwlIkooP6JGAAIwe30JlM.git] / world.h

diff --git a/world.h b/world.h
index 672ceb71ca35fb85bb8a49b92b24649f1aa058ba..4352b6e6031bd38f608b24061591e93e81ad72e1 100644 (file)
--- 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;
@@ -341,8 +374,7 @@ VG_STATIC struct world_global
     * Allocated as system memory
     * --------------------------------------------------------------------------
     */
-   void *generic_heap,
-        *audio_heap;  /* sub buffer of the audio buffer */
+   void *generic_heap;
 
    /* rendering */
    glmesh skydome;
@@ -438,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"
 
@@ -456,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; i<world->audio_things_count; i++ )
    {
@@ -468,6 +502,7 @@ VG_STATIC int world_stop_sound( int argc, const char *argv[] )
       }
    }
    audio_unlock();
+#endif
 
    return 0;
 }
@@ -562,14 +597,17 @@ VG_STATIC void world_init(void)
 
 VG_STATIC void world_audio_init(void)
 {
+#if 0
    u32 size = vg_linear_remaining( vg_audio.audio_pool ) 
                - sizeof(vg_linear_allocator);
 
    world_global.audio_heap = vg_create_linear_allocator( vg_audio.audio_pool, 
                                                          size, 
                                                          VG_MEMORY_SYSTEM );
+#endif
 }
 
+#if 0
 VG_STATIC void world_trigger_achievement( world_instance *world, u32 uid )
 {
    struct logic_achievement *ach = &world->logic_achievements[ uid ];
@@ -582,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 );
 
@@ -595,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 ];
@@ -605,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 )
 {
@@ -618,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; i<vg_list_size(entity_instructions); i++ )
@@ -634,6 +679,7 @@ VG_STATIC void world_run_relay( world_instance *world,
 
    vg_error( "Don't know how to trigger classtype %d\n", rt->classtype );
 }
+#endif
 
 VG_STATIC void world_update( world_instance *world, v3f pos )
 {
@@ -746,12 +792,41 @@ 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 ++;
+   }
 
    int in_trigger = 0;
    for( int i=0; i<world->trigger_count; i++ )
    {
       struct trigger_zone *zone = &world->triggers[i];
 
+      for( int j=0; j<random_ticks; j++ )
+      {
+         logic_packet packet;
+         packet.location = zone->target_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 );
       
@@ -763,7 +838,14 @@ 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 );
          }
       }
 
@@ -794,6 +876,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; i<world->soundscape_count; i++ )
+   {
+      struct soundscape *s = &world->soundscapes[i];
+      s->usage_count = 0;
+
+      for( int j=0; j<s->max_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();
 }
 
 /*