projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
load in preview images to dynamic rt textures
[carveJwlIkooP6JGAAIwe30JlM.git]
/
world.h
diff --git
a/world.h
b/world.h
index 98b9df90bc7e120bfea347fcad2e088037b444cc..0a67abf855df6d9216424243f9730770e945acda 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
@@
-62,6
+63,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,
@@
-176,7
+179,14
@@
struct world_instance {
ent_objective,
ent_challenge,
ent_relay,
ent_objective,
ent_challenge,
ent_relay,
- ent_cubemap;
+ ent_cubemap,
+ ent_miniworld,
+ ent_prop;
+
+ enum skybox {
+ k_skybox_default,
+ k_skybox_space
+ } skybox;
ent_gate *rendering_gate;
ent_gate *rendering_gate;
@@
-243,6
+253,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 */