projects
/
laserbrain_demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
separated scene loading into IO and GL parts in preparation for resman
[laserbrain_demo]
/
src
/
scene.h
diff --git
a/src/scene.h
b/src/scene.h
index
a8c8e6a
..
ece454e
100644
(file)
--- a/
src/scene.h
+++ b/
src/scene.h
@@
-9,7
+9,10
@@
enum {
SCNLOAD_FLIPYZ = 1,
enum {
SCNLOAD_FLIPYZ = 1,
- SCNLOAD_FLIPTEX = 2
+ SCNLOAD_FLIPTEX = 2,
+
+ SCNLOAD_STAGE_IO = 0x4000,
+ SCNLOAD_STAGE_GL = 0x8000
};
class Scene {
};
class Scene {
@@
-25,6
+28,7
@@
public:
Mesh *walk_mesh;
TextureSet *texset; // only owned by Scene if own_texset is true
Mesh *walk_mesh;
TextureSet *texset; // only owned by Scene if own_texset is true
+ void *loader_data;
explicit Scene(TextureSet *tset = 0);
~Scene();
explicit Scene(TextureSet *tset = 0);
~Scene();