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 02bb02e9a0564b0fa856bc43a3bfc473bfd72493..642e7578b44a6d32ce042a36ba9be4ff2e4ca97e 100644
(file)
--- a/
world.h
+++ b/
world.h
@@
-49,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 */
@@
-57,13
+58,15
@@
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
, player_angles
;
+ v4f player_co;
void *heap;
enum world_status{
void *heap;
enum world_status{
@@
-85,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{
@@
-153,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;
@@
-180,7
+185,9
@@
struct world_instance {
ent_challenge,
ent_relay,
ent_cubemap,
ent_challenge,
ent_relay,
ent_cubemap,
- ent_miniworld;
+ ent_miniworld,
+ ent_prop,
+ ent_region;
enum skybox {
k_skybox_default,
enum skybox {
k_skybox_default,
@@
-214,6
+221,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 {