projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
a mess but stable
[carveJwlIkooP6JGAAIwe30JlM.git]
/
world.h
diff --git
a/world.h
b/world.h
index 823b38c70e7992ae838f91b6dd0f55a330feec1e..3a067db5ce24cdc4e47de1f121126096f0c47ff0 100644
(file)
--- a/
world.h
+++ b/
world.h
@@
-6,6
+6,7
@@
#include "render.h"
#include "network_msg.h"
#include "addon.h"
#include "render.h"
#include "network_msg.h"
#include "addon.h"
+#include "scene.h"
/* types
*/
/* types
*/
@@
-133,7
+134,7
@@
struct world_instance {
float probabilities[3];
v3i light_cubes;
float probabilities[3];
v3i light_cubes;
-
struct framebuffer
heightmap;
+
vg_framebuffer *
heightmap;
/*
* Dynamically allocated when world_load is called.
/*
* Dynamically allocated when world_load is called.
@@
-156,6
+157,7
@@
struct world_instance {
mdl_submesh sm_geo,
sm_no_collide;
u32 flags;
mdl_submesh sm_geo,
sm_no_collide;
u32 flags;
+ u32 alpha_tex;
}
* surfaces;
u32 surface_count;
}
* surfaces;
u32 surface_count;
@@
-186,7
+188,8
@@
struct world_instance {
ent_miniworld,
ent_prop,
ent_region,
ent_miniworld,
ent_prop,
ent_region,
- ent_glider;
+ ent_glider,
+ ent_npc;
enum skybox {
k_skybox_default,
enum skybox {
k_skybox_default,
@@
-212,8
+215,7
@@
struct world_instance {
/* graphics */
glmesh mesh_route_lines;
glmesh mesh_geo,
/* graphics */
glmesh mesh_route_lines;
glmesh mesh_geo,
- mesh_no_collide,
- mesh_water;
+ mesh_no_collide;
u32 cubemap_cooldown, cubemap_side;
/* leaderboards */
u32 cubemap_cooldown, cubemap_side;
/* leaderboards */
@@
-254,6
+256,8
@@
struct world_static {
k_world_loader_load
}
load_state;
k_world_loader_load
}
load_state;
+
+ bool clear_async_op_when_done;
}
extern world_static;
}
extern world_static;