projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
world regions
[carveJwlIkooP6JGAAIwe30JlM.git]
/
world.h
diff --git
a/world.h
b/world.h
index 98b9df90bc7e120bfea347fcad2e088037b444cc..9d8cd4970dc8c037d98b30eb03ce5f4d48e844ff 100644
(file)
--- a/
world.h
+++ b/
world.h
@@
-18,6
+18,7
@@
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
@@
-48,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 */
@@
-62,6
+64,8
@@
struct world_instance {
* -------------------------------------------------------
*/
* -------------------------------------------------------
*/
+ v4f player_co;
+
void *heap;
enum world_status{
k_world_status_unloaded = 0,
void *heap;
enum world_status{
k_world_status_unloaded = 0,
@@
-82,6
+86,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{
@@
-176,7
+181,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;
@@
-205,6
+218,9
@@
struct world_instance {
/* leaderboards */
struct leaderboard_cache *leaderboard_cache;
/* leaderboards */
struct leaderboard_cache *leaderboard_cache;
+
+ /* ui */
+ struct route_ui *routes_ui;
};
struct world_static {
};
struct world_static {
@@
-243,6
+259,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 */