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 acabd10..ece454e 100644 (file)
--- a/src/scene.h
+++ b/src/scene.h
@@ -9,7 +9,10 @@
 
 enum {
        SCNLOAD_FLIPYZ = 1,
-       SCNLOAD_FLIPTEX = 2
+       SCNLOAD_FLIPTEX = 2,
+
+       SCNLOAD_STAGE_IO = 0x4000,
+       SCNLOAD_STAGE_GL = 0x8000
 };
 
 class Scene {
@@ -25,6 +28,7 @@ public:
        Mesh *walk_mesh;
 
        TextureSet *texset;     // only owned by Scene if own_texset is true
+       void *loader_data;
 
        explicit Scene(TextureSet *tset = 0);
        ~Scene();
@@ -36,6 +40,9 @@ public:
 
        bool load(const char *fname, unsigned int flags = 0);
 
+       // merge scn into this scene, leaving scn empty and safe to destroy
+       bool merge(Scene *scn);
+
        void add_object(Object *obj);
        bool remove_object(Object *obj);
        bool have_object(Object *obj) const;