fix some problems with world loader

[carveJwlIkooP6JGAAIwe30JlM.git] / world_entity.c

diff --git a/world_entity.c b/world_entity.c
index eccf2b4f7afed09c36d349b6432e86015d3c63fc..3fd7ac63473459781b85ed7a348038247eb545a7 100644 (file)
--- a/world_entity.c
+++ b/world_entity.c
@@ -27,7 +27,7 @@ static void world_entity_unfocus(void){
    localplayer.immobile = 0;
    skaterift.activity = k_skaterift_default;
    menu.disable_open = 0;
-   srinput.enabled = 0;
+   srinput.state = k_input_state_resume;
 }
 
 static void world_entity_focus_camera( world_instance *world, u32 uid ){
@@ -37,8 +37,7 @@ static void world_entity_focus_camera( world_instance *world, u32 uid ){
 
       v3f dir = {0.0f,-1.0f,0.0f};
       mdl_transform_vector( &cam->transform, dir, dir );
-      m3x3_mulv( localplayer.invbasis, dir, dir );
-      player_vector_angles( world_static.focus_cam.angles, dir, 1.0f, 0.0f );
+      v3_angles( dir, world_static.focus_cam.angles );
       v3_copy( cam->transform.co, world_static.focus_cam.pos );
       world_static.focus_cam.fov = cam->fov;
    }
@@ -93,10 +92,9 @@ static void world_entity_focus_render(void){
       ent_skateshop *skateshop = mdl_arritm( &world->ent_skateshop, index );
       skateshop_render( skateshop );
    }
-   else if( type == k_ent_challenge ){
-   }
-   else if( type == k_ent_route ){
-   }
+   else if( type == k_ent_challenge ){}
+   else if( type == k_ent_route ){}
+   else if( type == k_ent_miniworld ){}
    else {
       vg_fatal_error( "Programming error\n" );
    }
@@ -124,6 +122,7 @@ static void world_gen_entities_init( world_instance *world ){
          gate_transform_update( gate );
       }
    }
+      
    vg_async_call( world_link_nonlocal_async, world, 0 );
 
    /* water */
@@ -213,6 +212,19 @@ static void world_gen_entities_init( world_instance *world ){
 
    world->entity_bh = bh_create( world->heap, &bh_system_entity_list, world,
                                  indexed_count, 2 );
+
+   world->tar_min = world->entity_bh->nodes[0].bbx[0][1];
+   world->tar_max = world->entity_bh->nodes[0].bbx[1][1] + 20.0f;
+
+   for( u32 i=0; i<mdl_arrcount(&world->ent_marker); i++ ){
+      ent_marker *marker = mdl_arritm( &world->ent_marker, i );
+
+      if( MDL_CONST_PSTREQ( &world->meta, marker->pstr_alias, "tar_min" ) )
+         world->tar_min = marker->transform.co[1];
+
+      if( MDL_CONST_PSTREQ( &world->meta, marker->pstr_alias, "tar_max" ) )
+         world->tar_max = marker->transform.co[1];
+   }
 }
 
 static
@@ -287,6 +299,17 @@ static void ent_volume_call( world_instance *world, ent_call *call )
          entity_call( world, call );
       }
    }
+   else if( call->function == k_ent_function_trigger_leave ){
+      call->id = volume->target;
+
+      if( volume->flags & k_ent_volume_flag_particles ){
+         assert(0);
+      }
+      else{
+         call->function = volume->trigger.event_leave;
+         entity_call( world, call );
+      }
+   }
 }
 
 static void ent_audio_call( world_instance *world, ent_call *call ){
@@ -308,7 +331,7 @@ static void ent_audio_call( world_instance *world, ent_call *call ){
       v3_copy( audio->transform.co, sound_co );
    }
    else
-      vg_fatal_error( "ent_audio_call (invalid function id)" );
+      return;
 
    float chance = vg_randf64()*100.0f,
          bar = 0.0f;
@@ -594,6 +617,23 @@ static void world_entity_start( world_instance *world, vg_msg *sav ){
          entity_call( world, &call );
       }
    }
+
+   vg_msg routes_block = *sav;
+   if( vg_msg_seekframe( &routes_block, "routes" ) ){
+      for( u32 i=0; i<mdl_arrcount(&world->ent_route); i++ ){
+         ent_route *route = mdl_arritm( &world->ent_route, i );
+
+         vg_msg route_info = routes_block;
+         if( vg_msg_seekframe( &route_info, 
+                               mdl_pstr(&world->meta,route->pstr_name) ) ){
+            route->flags |= vg_msg_getkvu32( &route_info, "flags", 0 );
+            route->best_laptime =
+               vg_msg_getkvf64( &route_info, "best_laptime", 0.0 );
+         }
+      }
+   }
+
+   ent_region_re_eval( world );
 }
 
 static void world_entity_serialize( world_instance *world, vg_msg *sav ){
@@ -603,6 +643,21 @@ static void world_entity_serialize( world_instance *world, vg_msg *sav ){
       const char *alias = mdl_pstr(&world->meta,challenge->pstr_alias);
       vg_msg_wkvu32( sav, alias, challenge->status );
    }
+   
+   if( mdl_arrcount(&world->ent_route) ){
+      vg_msg_frame( sav, "routes" );
+      for( u32 i=0; i<mdl_arrcount(&world->ent_route); i++ ){
+         ent_route *route = mdl_arritm( &world->ent_route, i );
+         
+         vg_msg_frame( sav, mdl_pstr( &world->meta, route->pstr_name ) );
+         {
+            vg_msg_wkvu32( sav, "flags", route->flags );
+            vg_msg_wkvf64( sav, "best_laptime", route->best_laptime );
+         }
+         vg_msg_end_frame( sav );
+      }
+      vg_msg_end_frame( sav );
+   }
 }
 
 #endif /* WORLD_ENTITY_C */