revision 2

[carveJwlIkooP6JGAAIwe30JlM.git] / world_entity.c

diff --git a/world_entity.c b/world_entity.c
index 957891d4f21e059acfdfbcd98e5a3722ae9ec630..3602530ff99a70d8eac814e32a616afde6fd6363 100644 (file)
--- a/world_entity.c
+++ b/world_entity.c
@@ -1,6 +1,5 @@
-#ifndef WORLD_ENTITY_C
-#define WORLD_ENTITY_C
-
+#include "vg/vg_steam.h"
+#include "vg/vg_steam_user_stats.h"
 #include "model.h"
 #include "entity.h"
 #include "world.h"
@@ -13,8 +12,22 @@
 #include "ent_route.h"
 #include "ent_traffic.h"
 #include "ent_glider.h"
+#include "ent_region.h"
+#include "input.h"
+#include "player_walk.h"
 
-static void world_entity_focus( u32 entity_id ){
+bh_system bh_system_entity_list = 
+{
+   .expand_bound = entity_bh_expand_bound,
+   .item_centroid = entity_bh_centroid,
+   .item_closest = entity_bh_closest,
+   .item_swap = entity_bh_swap,
+   .item_debug = entity_bh_debug,
+   .cast_ray = NULL
+};
+
+void world_entity_focus( u32 entity_id )
+{
    localplayer.immobile = 1;
    menu.disable_open = 1;
 
@@ -25,14 +38,16 @@ static void world_entity_focus( u32 entity_id ){
    skaterift.activity = k_skaterift_ent_focus;
 }
 
-static void world_entity_unfocus(void){
+void world_entity_unfocus(void)
+{
    localplayer.immobile = 0;
    skaterift.activity = k_skaterift_default;
    menu.disable_open = 0;
    srinput.state = k_input_state_resume;
 }
 
-static void world_entity_focus_camera( world_instance *world, u32 uid ){
+void world_entity_focus_camera( world_instance *world, u32 uid )
+{
    if( mdl_entity_id_type( uid ) == k_ent_camera ){
       u32 index = mdl_entity_id_id( uid );
       ent_camera *cam = mdl_arritm( &world->ent_camera, index );
@@ -44,7 +59,7 @@ static void world_entity_focus_camera( world_instance *world, u32 uid ){
       world_static.focus_cam.fov = cam->fov;
    }
    else {
-      camera_copy( &localplayer.cam, &world_static.focus_cam );
+      vg_camera_copy( &localplayer.cam, &world_static.focus_cam );
 
       /* TODO ? */
       world_static.focus_cam.nearz = localplayer.cam.nearz;
@@ -53,7 +68,8 @@ static void world_entity_focus_camera( world_instance *world, u32 uid ){
 }
 
 /* logic preupdate */
-static void world_entity_focus_preupdate(void){
+void world_entity_focus_preupdate(void)
+{
    f32 rate = vg_minf( 1.0f, vg.time_frame_delta * 2.0f );
    int active = 0;
    if( skaterift.activity == k_skaterift_ent_focus )
@@ -82,7 +98,8 @@ static void world_entity_focus_preupdate(void){
 }
 
 /* additional renderings like text etc.. */
-static void world_entity_focus_render(void){
+void world_entity_focus_render(void)
+{
    world_instance *world = world_current_instance();
    if( skaterift.activity != k_skaterift_ent_focus ){
       skateshop_render_nonfocused( world, &skaterift.cam );
@@ -104,7 +121,8 @@ static void world_entity_focus_render(void){
    }
 }
 
-static void world_gen_entities_init( world_instance *world ){
+void world_gen_entities_init( world_instance *world )
+{
    /* lights */
    for( u32 j=0; j<mdl_arrcount(&world->ent_light); j ++ ){
       ent_light *light = mdl_arritm( &world->ent_light, j );
@@ -232,7 +250,6 @@ static void world_gen_entities_init( world_instance *world ){
    }
 }
 
-static
 ent_spawn *world_find_closest_spawn( world_instance *world, v3f position )
 {
    ent_spawn *rp = NULL, *r;
@@ -261,7 +278,6 @@ ent_spawn *world_find_closest_spawn( world_instance *world, v3f position )
    return rp;
 }
 
-static
 ent_spawn *world_find_spawn_by_name( world_instance *world, const char *name )
 {
    ent_spawn *rp = NULL, *r;
@@ -279,7 +295,7 @@ ent_spawn *world_find_spawn_by_name( world_instance *world, const char *name )
    return rp;
 }
 
-static void world_default_spawn_pos( world_instance *world, v3f pos )
+void world_default_spawn_pos( world_instance *world, v3f pos )
 {
    ent_spawn *rp = world_find_spawn_by_name( world, "start" );
    if( !rp ) rp = world_find_closest_spawn( world, (v3f){0,0,0} );
@@ -292,7 +308,8 @@ static void world_default_spawn_pos( world_instance *world, v3f pos )
    }
 }
 
-static void ent_volume_call( world_instance *world, ent_call *call ){
+void ent_volume_call( world_instance *world, ent_call *call )
+{
    u32 index = mdl_entity_id_id( call->id );
    ent_volume *volume = mdl_arritm( &world->ent_volume, index );
    if( !volume->target ) return;
@@ -329,7 +346,8 @@ static void ent_volume_call( world_instance *world, ent_call *call ){
    }
 }
 
-static void ent_audio_call( world_instance *world, ent_call *call ){
+void ent_audio_call( world_instance *world, ent_call *call )
+{
    if( world->status == k_world_status_unloading ){
       vg_warn( "cannot modify audio while unloading world\n" );
       return;
@@ -422,7 +440,8 @@ static void ent_audio_call( world_instance *world, ent_call *call ){
 }
 
 
-static void ent_ccmd_call( world_instance *world, ent_call *call ){
+void ent_ccmd_call( world_instance *world, ent_call *call )
+{
    if( call->function == k_ent_function_trigger ){
       u32 index = mdl_entity_id_id( call->id );
       ent_ccmd *ccmd = mdl_arritm( &world->ent_ccmd, index );
@@ -436,8 +455,8 @@ static void ent_ccmd_call( world_instance *world, ent_call *call ){
  * ----------------------------------------------------------------------------
  */
 
-static void 
-entity_bh_expand_bound( void *user, boxf bound, u32 item_index ){
+void entity_bh_expand_bound( void *user, boxf bound, u32 item_index )
+{
    world_instance *world = user;
 
    u32 id    = world->entity_list[ item_index ],
@@ -496,7 +515,8 @@ entity_bh_expand_bound( void *user, boxf bound, u32 item_index ){
    }
 }
 
-static float entity_bh_centroid( void *user, u32 item_index, int axis ){
+float entity_bh_centroid( void *user, u32 item_index, int axis )
+{
    world_instance *world = user;
 
    u32 id    = world->entity_list[ item_index ],
@@ -529,7 +549,8 @@ static float entity_bh_centroid( void *user, u32 item_index, int axis ){
    }
 }
 
-static void entity_bh_swap( void *user, u32 ia, u32 ib ){
+void entity_bh_swap( void *user, u32 ia, u32 ib )
+{
    world_instance *world = user;
 
    u32 a = world->entity_list[ ia ],
@@ -539,7 +560,7 @@ static void entity_bh_swap( void *user, u32 ia, u32 ib ){
    world->entity_list[ ib ] = a;
 }
 
-static void entity_bh_debug( void *user, u32 item_index ){
+void entity_bh_debug( void *user, u32 item_index ){
    world_instance *world = user;
 
    u32 id    = world->entity_list[ item_index ],
@@ -587,7 +608,8 @@ static void entity_bh_debug( void *user, u32 item_index ){
    }
 }
 
-static void update_ach_models(void){
+void update_ach_models(void)
+{
    world_instance *hub = &world_static.instances[k_world_purpose_hub];
    if( hub->status != k_world_status_loaded ) return;
 
@@ -610,8 +632,8 @@ static void update_ach_models(void){
    }
 }
 
-static void entity_bh_closest( void *user, u32 item_index, v3f point,
-                                  v3f closest ){
+void entity_bh_closest( void *user, u32 item_index, v3f point, v3f closest )
+{
    world_instance *world = user;
 
    u32 id    = world->entity_list[ item_index ],
@@ -639,7 +661,8 @@ static void entity_bh_closest( void *user, u32 item_index, v3f point,
    }
 }
 
-static void world_entity_start( world_instance *world, vg_msg *sav ){
+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;
@@ -733,7 +756,8 @@ static void world_entity_start( world_instance *world, vg_msg *sav ){
    ent_region_re_eval( world );
 }
 
-static void world_entity_serialize( world_instance *world, vg_msg *sav ){
+void world_entity_serialize( world_instance *world, vg_msg *sav )
+{
    for( u32 i=0; i<mdl_arrcount(&world->ent_challenge); i++ ){
       ent_challenge *challenge = mdl_arritm(&world->ent_challenge,i);
 
@@ -769,5 +793,3 @@ static void world_entity_serialize( world_instance *world, vg_msg *sav ){
       vg_msg_end_frame( sav );
    }
 }
-
-#endif /* WORLD_ENTITY_C */