X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world.h;h=3b30973099152990e276dbc780869f1f08dc623c;hb=bceb3a28f8127fa27a17f480bd21fa20a340e848;hp=8779df9ef8790e7b0d6ad0dbd63960e38e759365;hpb=0c3ef87e654d436e0cad5f5b40f3631ae26ab649;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world.h b/world.h
index 8779df9..3b30973 100644
--- a/world.h
+++ b/world.h
@@ -1,3 +1,7 @@
+/*
+ * Copyright (C) 2021-2022 Mt.ZERO Software, Harry Godden - All Rights Reserved
+ */
+
 #include "common.h"
 
 static int ray_world( v3f pos, v3f dir, ray_hit *hit );
@@ -5,15 +9,14 @@ static int ray_world( v3f pos, v3f dir, ray_hit *hit );
 #ifndef WORLD_H
 #define WORLD_H
 
+#include "vg/vg_loader.h"
+
 #include "network.h"
 #include "network_msg.h"
 #include "scene.h"
-#include "terrain.h"
 #include "render.h"
 #include "rigidbody.h"
-#include "gate.h"
 #include "bvh.h"
-#include "lighting.h"
 #include "model.h"
 
 #include "traffic.h" /*TODO: -> world_traffic.h */
@@ -39,6 +42,12 @@ enum { k_route_ui_max_indices = k_max_ui_elements*k_max_element_indices };
 
 static struct gworld
 {
+   struct subworld_gen
+   {
+      
+   }
+   subworld_gen;
+
    /* gameplay */
    struct respawn_point
    {
@@ -49,6 +58,37 @@ static struct gworld
    spawns[32];
    u32 spawn_count;
 
+   struct world_audio_thing
+   {
+      v3f pos;
+      float volume;
+      u32 flags;
+
+      audio_player player;
+      audio_clip temp_embedded_clip;
+   }
+   * audio_things;
+   
+   u32 audio_things_count,
+       audio_things_cap;
+
+   struct achievement_zone
+   {
+      m4x3f transform, inv_transform;
+      char name[32];
+      int triggered;
+
+      union
+      {
+         mdl_node *ptarget_delegated;
+         struct world_audio_thing *ptarget;
+      };
+   }
+   * achievement_zones;
+
+   u32 achievement_zones_count,
+       achievement_zones_cap;
+
    struct subworld_routes
    {
       struct route_node
@@ -104,14 +144,22 @@ static struct gworld
       }
       *routes;
 
-      double last_interaction;
+      double time, rewind_from, rewind_to, last_use;
 
       u32 route_count,
           route_cap;
 
       struct route_gate
       {
-         teleport_gate gate;
+         struct teleport_gate
+         { 
+            v3f co[2];
+            v4f q[2];
+            v2f dims;
+
+            m4x3f to_world, recv_to_world, transport;
+         } 
+         gate;
          
          u32 node_id;
 
@@ -165,6 +213,8 @@ static struct gworld
 #if 0
    traffic_driver van_man[6];
 #endif
+
+   double sky_time, sky_rate, sky_target_rate;
    
    /* Physics */
    
@@ -183,8 +233,6 @@ static struct gworld
    glmesh cars;
    mdl_submesh car_holden;
 
-   rigidbody mr_ball;
-
    /* Load time */
 
    struct instance_cache
@@ -199,7 +247,7 @@ static struct gworld
    v3f render_gate_pos;
    int active_route_board;
 }
-world;
+world ;
 
 /*
  * API
@@ -215,18 +263,22 @@ static int ray_world( v3f pos, v3f dir, ray_hit *hit );
  */
 #include "world_routes.h"
 #include "world_sfd.h"
-#include "world_audio.h"
 #include "world_render.h"
 #include "world_water.h"
 #include "world_gen.h"
+#include "world_gate.h"
 
 /* 
  * -----------------------------------------------------------------------------
  *                                    Events
  * -----------------------------------------------------------------------------
  */
-static void world_register(void)
+
+static void world_init(void)
 {
+   world.sky_rate = 1.0;
+   world.sky_target_rate = 1.0;
+
    shader_terrain_register();
    shader_sky_register();
    shader_planeinf_register();
@@ -234,49 +286,62 @@ static void world_register(void)
    shader_fscolour_register();
    shader_alphatest_register();
 
-   world_routes_register();
-   world_sfd_register();
-   world_water_register();
-}
-
-static void world_free(void)
-{
-   /* TODO.. */
-
-   world_sfd_free();
-}
+   vg_info( "Loading world resources\n" );
 
+   VG_REQUIRED_ASSET( mdl_header*, mcars, mdl_load, "models/rs_cars.mdl" );
+   VG_REQUIRED_ASSET( mdl_header*, msky,  mdl_load, "models/rs_skydome.mdl" );
 
-static void world_init(void)
-{
-   mdl_header *mcars = mdl_load( "models/rs_cars.mdl" );
-   mdl_unpack_glmesh( mcars, &world.cars );
    mdl_node *nholden = mdl_node_from_name( mcars, "holden" );
    world.car_holden = *mdl_node_submesh( mcars, nholden, 0 );
-   free(mcars);
-
-
-   mdl_header *msky = mdl_load("models/rs_skydome.mdl");
-   mdl_unpack_glmesh( msky, &world.skydome );
 
    mdl_node *nlower = mdl_node_from_name( msky, "dome_lower" ),
             *nupper = mdl_node_from_name( msky, "dome_upper" );
    
    world.dome_lower = *mdl_node_submesh( msky, nlower, 0 );
    world.dome_upper = *mdl_node_submesh( msky, nupper, 0 );
-   free(msky);
 
+   vg_acquire_thread_sync();
+   {
+      mdl_unpack_glmesh( mcars, &world.cars );
+      mdl_unpack_glmesh( msky, &world.skydome );
+   }
+   vg_release_thread_sync();
+
+   vg_free(mcars);
+   vg_free(msky);
 
    /* Other systems */
-   world_render_init();
-   world_sfd_init();
-   world_audio_init();
+   vg_info( "Loading other world systems\n" );
+
+   vg_loader_highwater( world_render_init, world_render_free, NULL );
+   vg_loader_highwater( world_sfd_init, world_sfd_free, NULL );
+   vg_loader_highwater( world_water_init, world_water_free, NULL );
+   vg_loader_highwater( world_gates_init, world_gates_free, NULL );
+   vg_loader_highwater( world_routes_init, world_routes_free, NULL );
+}
+
+static void world_free( void *_ )
+{
+   mesh_free( &world.cars );
+   mesh_free( &world.skydome );
+   vg_free( world.achievement_zones );
+
+   /* FIXME: This fucks with the audio player. Use-after-free */
+#if 0
+   vg_free( world.audio_things );
+#endif
 }
 
 static void world_update( v3f pos )
 {
+   world.sky_time += world.sky_rate * vg.time_delta;
+   world.sky_rate = vg_lerp( world.sky_rate, world.sky_target_rate, 
+                                 vg.time_delta * 5.0 );
+
    world_routes_update();
+#if 0
    world_routes_debug();
+#endif
    
    int closest = 0;
    float min_dist = INFINITY;
@@ -312,26 +377,49 @@ static void world_update( v3f pos )
          }
       }
    }
-   
-   sfd_update( &world.sfd.tester );
 
-#if 0
-   rb_solver_reset();
-   rb_build_manifold_terrain_sphere( &world.mr_ball );
-   
-   for( int i=0; i<5; i++ )
-      rb_solve_contacts( rb_contact_buffer, rb_contact_count );
+   static int in_zone = 0;
 
-   rb_iter( &world.mr_ball );
-   rb_update_transform( &world.mr_ball );
-   rb_debug( &world.mr_ball, 0 );
+   int in_zone_this_time = 0;
 
-   for( int i=0; i<vg_list_size(world.van_man); i++ )
+   for( int i=0; i<world.achievement_zones_count; i++ )
    {
-      traffic_drive( &world.van_man[i] );
-      traffic_visualize_car( &world.van_man[i] );
+      struct achievement_zone *zone = &world.achievement_zones[i];
+
+      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_zone_this_time = 1;
+
+         if( !in_zone && zone->ptarget )
+         {
+            audio_lock();
+            audio_player_playclip( &zone->ptarget->player, 
+                                   &zone->ptarget->temp_embedded_clip );
+            audio_unlock();
+         }
+
+         if( !zone->triggered )
+         {
+            steam_set_achievement( zone->name );
+            steam_store_achievements();
+         }
+
+         zone->triggered = 1;
+      }
+
+      vg_line_boxf_transformed( zone->transform, (boxf){{-1.0f,-1.0f,-1.0f},
+                                                        { 1.0f, 1.0f, 1.0f}}, 
+                                                        0xff00ff00 );
    }
-#endif
+
+   in_zone = in_zone_this_time;
+   
+   sfd_update( &world.sfd.tester );
 }
 
 /*