X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_entity.c;h=4a8670d085447d41868e89d0e4c8c8317f554b98;hb=c16f95624c142beec1572baa24f262e8a661f3fb;hp=7ffa1d643012493f53637131e86446284f935ff5;hpb=2329044d44a5aff035b01926f7901d9e89ad284e;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world_entity.c b/world_entity.c
index 7ffa1d6..4a8670d 100644
--- a/world_entity.c
+++ b/world_entity.c
@@ -6,6 +6,7 @@
 #include "world.h"
 #include "world_load.h"
 #include "save.h"
+#include "vg/vg_msg.h"
 
 VG_STATIC void world_gen_entities_init( world_instance *world ){
    /* lights */
@@ -96,7 +97,8 @@ VG_STATIC void world_gen_entities_init( world_instance *world ){
    indexables[] = {
       { k_ent_gate, &world->ent_gate },
       { k_ent_challenge, &world->ent_challenge },
-      { k_ent_volume, &world->ent_volume }
+      { k_ent_volume, &world->ent_volume },
+      { k_ent_unlock, &world->ent_unlock }
    };
 
    for( u32 i=0; i<vg_list_size(indexables); i++ )
@@ -338,6 +340,18 @@ entity_bh_expand_bound( void *user, boxf bound, u32 item_index ){
       m4x3_expand_aabb_aabb( volume->to_world, bound,
                               (boxf){{-1.0f,-1.0f,-1.0f},{ 1.0f, 1.0f, 1.0f}} );
    }
+   else if( type == k_ent_unlock ){
+      ent_unlock *unlock = mdl_arritm( &world->ent_unlock, index );
+
+      boxf box = {{-1.2f*0.5f,-0.72f*0.5f,-0.01f*0.5f},
+                  { 1.2f*0.5f, 0.72f*0.5f, 0.01f*0.5f}};
+      m4x3f transform;
+      mdl_transform_m4x3( &unlock->transform, transform );
+      m4x3_expand_aabb_aabb( transform, bound, box );
+   }
+   else{
+      vg_fatal_error( "Programming error\n" );
+   }
 }
 
 VG_STATIC float entity_bh_centroid( void *user, u32 item_index, int axis ){
@@ -359,6 +373,10 @@ VG_STATIC float entity_bh_centroid( void *user, u32 item_index, int axis ){
       ent_volume *volume = mdl_arritm( &world->ent_volume, index );
       return volume->transform.co[axis];
    }
+   else if( type == k_ent_unlock ){
+      ent_unlock *unlock = mdl_arritm( &world->ent_unlock, index );
+      return unlock->transform.co[axis];
+   }
    else {
       vg_fatal_error( "Programming error\n" );
       return INFINITY;
@@ -409,6 +427,15 @@ VG_STATIC void entity_bh_debug( void *user, u32 item_index ){
                                 (boxf){{-1.0f,-1.0f,-1.0f},{ 1.0f, 1.0f, 1.0f}},
                                 0xf000ff00 );
    }
+   else if( type == k_ent_unlock ){
+      ent_unlock *unlock = mdl_arritm( &world->ent_unlock, index );
+
+      boxf box = {{-1.2f*0.5f,-0.72f*0.5f,-0.01f*0.5f},
+                  { 1.2f*0.5f, 0.72f*0.5f, 0.01f*0.5f}};
+      m4x3f transform;
+      mdl_transform_m4x3( &unlock->transform, transform );
+      vg_line_boxf_transformed( transform, box, 0xf0ff0000 );
+   }
    else{
       vg_fatal_error( "Programming error\n" );
    }
@@ -434,13 +461,16 @@ VG_STATIC void entity_bh_closest( void *user, u32 item_index, v3f point,
       ent_volume *volume = mdl_arritm( &world->ent_volume, index );
       v3_copy( volume->to_world[3], closest );
    }
+   else if( type == k_ent_unlock ){
+      ent_unlock *unlock = mdl_arritm( &world->ent_unlock, index );
+      v3_copy( unlock->transform.co, closest );
+   }
    else{
       vg_fatal_error( "Programming error\n" );
    }
 }
 
-VG_STATIC void world_entity_start( world_instance *world, 
-                                   struct savedata *sav ){
+VG_STATIC void world_entity_start( world_instance *world, vg_msg *sav ){
    vg_info( "Start instance %p\n", world );
 
    world->probabilities[ k_probability_curve_constant ] = 1.0f;
@@ -454,10 +484,31 @@ VG_STATIC void world_entity_start( world_instance *world,
          entity_call( world, &call );
       }
    }
+
+   /* read savedata 
+    * ----------------------------------------------------------------------- */
+
+   for( u32 i=0; i<mdl_arrcount(&world->ent_unlock); i++ ){
+      ent_unlock *unlock = mdl_arritm( &world->ent_unlock, i );
+      const char *alias = mdl_pstr( &world->meta, unlock->pstr_alias );
+
+      if( vg_msg_seekkvu32( sav, alias, k_vg_msg_first ) ){
+         ent_call call;
+         call.data = NULL;
+         call.function = 0;
+         call.id = mdl_entity_id( k_ent_unlock, i );
+         entity_call( world, &call );
+      }
+   }
 }
 
-VG_STATIC void async_world_entity_start( void *payload, u32 size ){
+VG_STATIC void world_entity_serialize( world_instance *world, vg_msg *sav ){
+   for( u32 i=0; i<mdl_arrcount(&world->ent_unlock); i++ ){
+      ent_unlock *unlock = mdl_arritm(&world->ent_unlock,i);
 
+      const char *alias = mdl_pstr(&world->meta,unlock->pstr_alias);
+      vg_msg_wkvu32( sav, alias, unlock->status );
+   }
 }
 
 #endif /* WORLD_ENTITY_C */