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 76d43d6e66d6e58f4c5a841983fb1feaa5aa286a..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
*/
@@
-17,11
+18,19
@@
enum world_geo_type{
};
enum world_purpose{
};
enum world_purpose{
+ k_world_purpose_invalid = -1,
k_world_purpose_hub = 0,
k_world_purpose_client = 1,
k_world_max
};
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;
static void skaterift_world_get_save_path( enum world_purpose which,
typedef struct world_instance world_instance;
static void skaterift_world_get_save_path( enum world_purpose which,
@@
-40,6
+49,7
@@
static void skaterift_world_get_save_path( enum world_purpose which,
#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 */
@@
-48,12
+58,16
@@
static i32 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,
@@
-74,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{
@@
-142,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;
@@
-168,7
+184,15
@@
struct world_instance {
ent_objective,
ent_challenge,
ent_relay,
ent_objective,
ent_challenge,
ent_relay,
- ent_cubemap;
+ 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;
@@
-194,6
+218,12
@@
struct world_instance {
u32 cubemap_cooldown, cubemap_side;
rb_object rb_geo;
u32 cubemap_cooldown, cubemap_side;
rb_object rb_geo;
+
+ /* leaderboards */
+ struct leaderboard_cache *leaderboard_cache;
+
+ /* ui */
+ struct route_ui *routes_ui;
};
struct world_static {
};
struct world_static {
@@
-232,6
+262,6
@@
static world_static;
static void world_init(void);
static world_instance *world_current_instance(void);
static void world_init(void);
static world_instance *world_current_instance(void);
-static void world_s
et_active
_instance( u32 index );
+static void world_s
witch
_instance( u32 index );
#endif /* WORLD_H */
#endif /* WORLD_H */