projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge all features from glider feature branch
[carveJwlIkooP6JGAAIwe30JlM.git]
/
world.h
diff --git
a/world.h
b/world.h
index 642e7578b44a6d32ce042a36ba9be4ff2e4ca97e..6ff3afbc00f295d7a459eec32d0eff75bcc7e719 100644
(file)
--- a/
world.h
+++ b/
world.h
@@
-56,7
+56,8
@@
static void skaterift_world_get_save_path( enum world_purpose which,
static f32 k_day_length = 30.0f; /* minutes */
static i32 k_debug_light_indices = 0,
k_debug_light_complexity= 0,
static f32 k_day_length = 30.0f; /* minutes */
static i32 k_debug_light_indices = 0,
k_debug_light_complexity= 0,
- k_light_preview = 0;
+ k_light_preview = 0,
+ k_light_editor = 0;
#define WORLD_SURFACE_HAS_TRAFFIC 0x1
#define WORLD_SURFACE_HAS_PROPS 0x2
#define WORLD_SURFACE_HAS_TRAFFIC 0x1
#define WORLD_SURFACE_HAS_PROPS 0x2
@@
-187,7
+188,8
@@
struct world_instance {
ent_cubemap,
ent_miniworld,
ent_prop,
ent_cubemap,
ent_miniworld,
ent_prop,
- ent_region;
+ ent_region,
+ ent_glider;
enum skybox {
k_skybox_default,
enum skybox {
k_skybox_default,
@@
-217,8
+219,6
@@
struct world_instance {
mesh_water;
u32 cubemap_cooldown, cubemap_side;
mesh_water;
u32 cubemap_cooldown, cubemap_side;
- rb_object rb_geo;
-
/* leaderboards */
struct leaderboard_cache *leaderboard_cache;
/* leaderboards */
struct leaderboard_cache *leaderboard_cache;