X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world.h;h=c782ae09d7369cd90ddb51c3b25ef774166feced;hb=f99902f513b0ad606437bf32de47405dd4ea5f98;hp=997ff312b03fc0a28377aab2515810671b398c78;hpb=5f01e7ab4aad052faad262b55404819dac3d25ce;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world.h b/world.h
index 997ff31..c782ae0 100644
--- a/world.h
+++ b/world.h
@@ -19,6 +19,7 @@ typedef struct world_instance world_instance;
 #include "bvh.h"
 #include "model.h"
 #include "entity.h"
+#include "font.h"
 
 #include "shaders/scene_standard.h"
 #include "shaders/scene_standard_alphatest.h"
@@ -54,20 +55,14 @@ enum geo_type
 
 static const float k_light_cube_size = 8.0f;
 
-struct world_instance 
-{
-   /* This is a small flag we use to changelevel.
-    * It will not be cleared until all sounds stop playing 
-    */
-
+struct world_instance {
    /* Fixed items
     * -------------------------------------------------------
     */
 
    char  world_name[ 64 ];
 
-   struct
-   {
+   struct{
       boxf depthbounds;
       int depth_computed;
 
@@ -78,8 +73,7 @@ struct world_instance
    water;
 
    /* STD140 */
-   struct ub_world_lighting
-   {
+   struct ub_world_lighting{
       v4f g_cube_min,
           g_cube_inv_range;
 
@@ -93,6 +87,8 @@ struct world_instance
       v4f g_sunset_ambient;
       v4f g_sun_colour;
       v4f g_sun_dir;
+      v4f g_board_0;
+      v4f g_board_1;
 
       float g_water_fog;
       float g_time;
@@ -133,6 +129,7 @@ struct world_instance
     * (world_gen.h)
     * --------------------------------------------------------------------------
     */
+
    /*
     * Main world .mdl 
     */
@@ -141,8 +138,7 @@ struct world_instance
    GLuint *textures;
    u32 texture_count;
 
-   struct world_surface
-   {
+   struct world_surface{
       mdl_material info;
       mdl_submesh sm_geo,
                   sm_no_collide;
@@ -165,150 +161,6 @@ struct world_instance
 
    ent_gate *rendering_gate;
 
-#if 0
-   /*
-    * Named safe places to respawn
-    */
-   struct respawn_point
-   {
-      v3f co;
-      v4f q;
-      const char *name;
-   }
-   * spawns;
-   u32 spawn_count;
-
-   /*
-    * Audio player entities
-    */
-   struct world_audio_thing
-   {
-      v3f pos;
-      float volume, range;
-      u32 flags;
-      audio_clip temp_embedded_clip;
-   }
-   * audio_things;
-   u32 audio_things_count;
-
-   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;
-
-   /*
-    * Box volume entities
-    */
-   struct world_volume
-   {
-      m4x3f transform, inv_transform;
-      mdl_node *node;
-   }
-   * volumes;
-   u32 volume_count;
-
-   /* 
-    * Lights
-    */
-   struct world_light
-   {
-      mdl_node *node;
-      struct classtype_world_light *inf;
-      m4x3f inverse_world;
-      v2f angle_sin_cos;
-   }
-   * lights;
-   u32 light_count;
-
-   /*
-    * Routes (world_routes.h)
-    * --------------------------------------------------------------------------
-    */
-
-   struct route_node
-   {
-      v3f co, right, up, h;
-      u32 next[2];
-
-      u32 special_type, special_id, current_refs, ref_count;
-      u32 route_ids[4];    /* Gates can be linked into up to four routes */
-   }
-   *nodes;
-   u32 node_count;
-
-   struct route
-   {
-      u32 track_id;
-      v4f colour;
-
-      u32 start;
-      mdl_submesh sm;
-      
-      int active;
-      float factive;
-
-      double best_lap, latest_pass; /* Session */
-
-      m4x3f scoreboard_transform;
-   }
-   *routes;
-   u32 route_count;
-
-   struct route_gate
-   {
-      struct teleport_gate
-      { 
-         v3f co[2];
-         v4f q[2];
-         v2f dims;
-
-         m4x3f to_world, transport;
-      }
-      gate;
-
-      u32 node_id;
-
-      struct route_timing
-      {
-         u32 version; /* Incremented on every teleport */
-         double time;
-      } 
-      timing;
-   }
-   *gates;
-   u32 gate_count;
-
-   struct nonlocal_gate
-   {
-      struct teleport_gate gate;
-      mdl_node *node;
-
-      u32 target_map_index, working;
-   }
-   *nonlocal_gates;
-   u32 nonlocalgate_count;
-
-   struct route_collector
-   {
-      struct route_timing timing;
-   }
-   *collectors;
-   u32 collector_count;
-#endif
-
-
    /* logic 
     * ----------------------------------------------------
     */
@@ -329,11 +181,10 @@ struct world_instance
           mesh_no_collide,
           mesh_water;
 
-   rigidbody rb_geo; /* todo.. ... */
+   rb_object rb_geo;
 };
 
-VG_STATIC struct world_global
-{
+VG_STATIC struct world_global{
    /*
     * Allocated as system memory
     * --------------------------------------------------------------------------
@@ -352,15 +203,13 @@ VG_STATIC struct world_global
    double time, rewind_from, rewind_to, last_use;
 
    /* water rendering */
-   struct
-   {
+   struct{
       struct framebuffer fbreflect, fbdepth;
    }
    water;
 
    /* split flap display */
-   struct
-   {
+   struct{
       glmesh mesh_base, mesh_display;
       mdl_submesh sm_base;
       u32 active_route_board;
@@ -378,6 +227,30 @@ VG_STATIC struct world_global
    world_instance worlds[4];
    u32            world_count;
    u32            active_world;
+
+   /* text particles */
+   font3d font;
+
+   struct timer_text{
+      char text[8];
+      m4x3f transform;
+      ent_gate *gate;
+      ent_route *route;
+   }
+   timer_texts[4];
+   u32 timer_text_count;
+
+   struct text_particle{
+      rb_object obj;
+      m4x3f mlocal;
+      ent_glyph *glyph;
+      v4f colour;
+
+      m4x3f mdl;
+   }
+   text_particles[6*4];
+   u32 text_particle_count;
+
 }
 world_global;
 
@@ -406,6 +279,13 @@ int ray_world( world_instance *world, v3f pos, v3f dir, ray_hit *hit );
  * Submodules
  */
 
+VG_STATIC float
+   k_day_length            = 30.0f; /* minutes */
+
+VG_STATIC int   k_debug_light_indices = 0,
+                k_debug_light_complexity = 0,
+                k_light_preview = 0;
+
 #include "world_routes.h"
 #include "world_sfd.h"
 #include "world_render.h"
@@ -428,6 +308,11 @@ VG_STATIC int world_stop_sound( int argc, const char *argv[] )
 
 VG_STATIC void world_init(void)
 {
+   VG_VAR_F32( k_day_length );
+   VG_VAR_I32( k_debug_light_indices );
+   VG_VAR_I32( k_debug_light_complexity );
+   VG_VAR_I32( k_light_preview );
+
    world_global.sky_rate = 1.0;
    world_global.sky_target_rate = 1.0;
 
@@ -490,7 +375,7 @@ VG_STATIC void ent_volume_call( world_instance *world, ent_call *call )
       call->ent = volume->target;
 
       if( volume->type == k_volume_subtype_particle ){
-         v3f co;
+         float *co = alloca( sizeof(float)*3 );
          co[0] = vg_randf()*2.0f-1.0f;
          co[1] = vg_randf()*2.0f-1.0f;
          co[2] = vg_randf()*2.0f-1.0f;
@@ -498,12 +383,10 @@ VG_STATIC void ent_volume_call( world_instance *world, ent_call *call )
 
          call->function = k_ent_function_particle_spawn;
          call->data = co;
-         
          entity_call( world, call );
       }
-      else if( volume->type == k_volume_subtype_trigger ){
-         /* TODO */
-      }
+      else
+         entity_call( world, call );
    }
 }
 
@@ -511,51 +394,84 @@ 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 ){
-      float chance = vg_randf()*100.0f,
-            bar = 0.0f;
+      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; i<audio->clip_count; i++ ){
-         ent_audio_clip *clip = mdl_arritm( &world->ent_audio_clip, 
-                                             audio->clip_start+i );
+   for( u32 i=0; i<audio->clip_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;
+      float mod = world->probabilities[ audio->probability_curve ],
+            p   = clip->probability * mod;
 
-         bar += p;
+      bar += p;
 
-         if( chance < bar ){
-            float *pos = call->data;
+      if( chance < bar ){
 
-            audio_lock();
+         audio_lock();
 
-            if( audio->behaviour == k_channel_behaviour_unlimited ){
-               audio_oneshot_3d( &clip->clip, pos,
-                                 audio->transform.s[0],
-                                 audio->volume );
+         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_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, pos, 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);
                }
-            }
-            else if( audio->behaviour == k_channel_behaviour_crossfade_if_full){
-               
-            }
 
-            
+               ch = audio_get_first_idle_channel();
+            }
 
-            audio_unlock();
-            break;
+            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;
       }
    }
 }
@@ -571,55 +487,14 @@ VG_STATIC void entity_call( world_instance *world, ent_call *call )
 
 VG_STATIC void world_update( world_instance *world, v3f pos )
 {
-   /* TEMP!!!!!! */
-   static double g_time = 0.0;
-   g_time += vg.time_delta * (1.0/(k_day_length*60.0));
-
-
-   struct ub_world_lighting *state = &world->ub_lighting;
-
-   state->g_time = g_time;
-   state->g_realtime = vg.time;
-   state->g_debug_indices = k_debug_light_indices;
-   state->g_light_preview = k_light_preview;
-   state->g_debug_complexity = k_debug_light_complexity;
-
-   state->g_time_of_day = vg_fractf( g_time );
-   state->g_day_phase   = cosf( state->g_time_of_day * VG_PIf * 2.0f );
-   state->g_sunset_phase= cosf( state->g_time_of_day * VG_PIf * 4.0f + VG_PIf );
-
-   state->g_day_phase    =       state->g_day_phase    * 0.5f + 0.5f;
-   state->g_sunset_phase = powf( state->g_sunset_phase * 0.5f + 0.5f, 6.0f );
-
-   float a = state->g_time_of_day * VG_PIf * 2.0f;
-   state->g_sun_dir[0] = sinf( a );
-   state->g_sun_dir[1] = cosf( a );
-   state->g_sun_dir[2] = 0.2f;
-   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, 
-                    sizeof(struct ub_world_lighting), &world->ub_lighting );
-   /* TEMP!!!!!! */
-
    world_global.sky_time += world_global.sky_rate * vg.time_delta;
    world_global.sky_rate = vg_lerp( world_global.sky_rate, 
                                     world_global.sky_target_rate, 
                                     vg.time_delta * 5.0 );
 
+   world_routes_update_timer_texts( world );
    world_routes_update( world );
-   world_routes_debug( world );
+   //world_routes_debug( world );
 
    /* ---- SFD ------------ */
    
@@ -660,8 +535,6 @@ VG_STATIC void world_update( world_instance *world, v3f pos )
       }
    }
    sfd_update();
-   
-
 
    static float random_accum = 0.0f;
    random_accum += vg.time_delta;
@@ -692,13 +565,13 @@ VG_STATIC void world_update( world_instance *world, v3f pos )
       if( volume->type == k_volume_subtype_trigger ){
          v3f local;
          m4x3_mulv( volume->to_local, pos, local );
-         vg_line_boxf_transformed( volume->to_world, cube, 0xff00ff00 );
 
          if( (fabsf(local[0]) <= 1.0f) &&
              (fabsf(local[1]) <= 1.0f) &&
              (fabsf(local[2]) <= 1.0f) )
          {
             in_volume = 1;
+            vg_line_boxf_transformed( volume->to_world, cube, 0xff00ff00 );
 
             if( !world_global.in_volume ){
                ent_call basecall;
@@ -710,6 +583,8 @@ VG_STATIC void world_update( world_instance *world, v3f pos )
                entity_call( world, &basecall );
             }
          }
+         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 );