small bugs

[carveJwlIkooP6JGAAIwe30JlM.git] / world.h

diff --git a/world.h b/world.h
index b9814f89aff027da117e8e6503237c56f99ac86b..ab663d005e4ffadacb32956e34c3e503c9287679 100644 (file)
--- 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;
 
@@ -133,6 +127,7 @@ struct world_instance
     * (world_gen.h)
     * --------------------------------------------------------------------------
     */
+
    /*
     * Main world .mdl 
     */
@@ -141,8 +136,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 +159,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 +179,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 +201,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 +225,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;
 
@@ -490,7 +361,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;
@@ -649,8 +520,9 @@ VG_STATIC void world_update( world_instance *world, v3f pos )
                                     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 ------------ */