projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wind rushing sound
[carveJwlIkooP6JGAAIwe30JlM.git]
/
world.h
diff --git
a/world.h
b/world.h
index d6f80412bb97f00336614b124198b905d2fcd058..642e7578b44a6d32ce042a36ba9be4ff2e4ca97e 100644
(file)
--- a/
world.h
+++ b/
world.h
@@
-6,6
+6,7
@@
#define WORLD_H
#include "render.h"
#define WORLD_H
#include "render.h"
+#include "network_msg.h"
/* types
*/
/* types
*/
@@
-16,8
+17,25
@@
enum world_geo_type{
k_world_geo_type_water = 2
};
k_world_geo_type_water = 2
};
+enum world_purpose{
+ k_world_purpose_invalid = -1,
+ k_world_purpose_hub = 0,
+ k_world_purpose_client = 1,
+ k_world_max
+};
+
+struct leaderboard_cache {
+ enum request_status status;
+ f64 cache_time;
+ u8 *data;
+ u32 data_len;
+};
+
typedef struct world_instance world_instance;
typedef struct world_instance world_instance;
+static void skaterift_world_get_save_path( enum world_purpose which,
+ char buf[128] );
+
/* submodule headers */
#include "world_entity.h"
#include "world_gate.h"
/* submodule headers */
#include "world_entity.h"
#include "world_gate.h"
@@
-31,20
+49,25
@@
typedef struct world_instance world_instance;
#include "world_water.h"
#include "world_audio.h"
#include "world_routes.h"
#include "world_water.h"
#include "world_audio.h"
#include "world_routes.h"
+#include "world_routes_ui.h"
/* console variables */
/* console variables */
-static f
loat
k_day_length = 30.0f; /* minutes */
-static i
nt
k_debug_light_indices = 0,
+static f
32
k_day_length = 30.0f; /* minutes */
+static i
32
k_debug_light_indices = 0,
k_debug_light_complexity= 0,
k_light_preview = 0;
k_debug_light_complexity= 0,
k_light_preview = 0;
+#define WORLD_SURFACE_HAS_TRAFFIC 0x1
+#define WORLD_SURFACE_HAS_PROPS 0x2
struct world_instance {
/* Fixed items
* -------------------------------------------------------
*/
struct world_instance {
/* Fixed items
* -------------------------------------------------------
*/
+ v4f player_co;
+
void *heap;
enum world_status{
k_world_status_unloaded = 0,
void *heap;
enum world_status{
k_world_status_unloaded = 0,
@@
-65,6
+88,7
@@
struct world_instance {
water;
f64 time;
water;
f64 time;
+ f32 tar_min, tar_max;
/* STD140 */
struct ub_world_lighting{
/* STD140 */
struct ub_world_lighting{
@@
-133,6
+157,7
@@
struct world_instance {
mdl_material info;
mdl_submesh sm_geo,
sm_no_collide;
mdl_material info;
mdl_submesh sm_geo,
sm_no_collide;
+ u32 flags;
}
* surfaces;
u32 surface_count;
}
* surfaces;
u32 surface_count;
@@
-154,7
+179,20
@@
struct world_instance {
ent_skateshop,
ent_marker,
ent_camera,
ent_skateshop,
ent_marker,
ent_camera,
- ent_swspreview;
+ ent_swspreview,
+ ent_ccmd,
+ ent_objective,
+ ent_challenge,
+ ent_relay,
+ ent_cubemap,
+ ent_miniworld,
+ ent_prop,
+ ent_region;
+
+ enum skybox {
+ k_skybox_default,
+ k_skybox_space
+ } skybox;
ent_gate *rendering_gate;
ent_gate *rendering_gate;
@@
-168,17
+206,24
@@
struct world_instance {
scene_lines;
/* spacial mappings */
scene_lines;
/* spacial mappings */
- bh_tree *
audi
o_bh,
- *
volume_bh,
-
*geo_bh
;
+ bh_tree *
ge
o_bh,
+ *
entity_bh;
+
u32 *entity_list
;
/* graphics */
glmesh mesh_route_lines;
glmesh mesh_geo,
mesh_no_collide,
mesh_water;
/* graphics */
glmesh mesh_route_lines;
glmesh mesh_geo,
mesh_no_collide,
mesh_water;
+ u32 cubemap_cooldown, cubemap_side;
rb_object rb_geo;
rb_object rb_geo;
+
+ /* leaderboards */
+ struct leaderboard_cache *leaderboard_cache;
+
+ /* ui */
+ struct route_ui *routes_ui;
};
struct world_static {
};
struct world_static {
@@
-191,14
+236,32
@@
struct world_static {
u32 current_run_version;
double time, rewind_from, rewind_to, last_use;
u32 current_run_version;
double time, rewind_from, rewind_to, last_use;
- int in_volume;
+ u32 active_trigger_volumes[8];
+ u32 active_trigger_volume_count;
+
+ addon_reg *instance_addons[ k_world_max ];
+ world_instance instances[ k_world_max ];
- world_instance worlds[4];
- u32 active_world;
+ enum world_purpose active_instance;
+ u32 focused_entity; /* like skateshop, challenge.. */
+ f32 focus_strength;
+ camera focus_cam;
+
+ /* challenges */
+ ent_objective *challenge_target;
+ f32 challenge_timer;
+
+ enum world_loader_state{
+ k_world_loader_none,
+ k_world_loader_preload,
+ k_world_loader_load
+ }
+ load_state;
}
static world_static;
static void world_init(void);
static world_instance *world_current_instance(void);
}
static world_static;
static void world_init(void);
static world_instance *world_current_instance(void);
+static void world_switch_instance( u32 index );
#endif /* WORLD_H */
#endif /* WORLD_H */