datamap object passed around while loading

[laserbrain_demo] / src / scene.h

diff --git a/src/scene.h b/src/scene.h
index acabd10..b9e338b 100644 (file)
--- a/src/scene.h
+++ b/src/scene.h
@@ -6,17 +6,27 @@
 #include "mesh.h"
 #include "snode.h"
 #include "texture.h"
+#include "dataset.h"
+#include "datamap.h"
 
 enum {
        SCNLOAD_FLIPYZ = 1,
-       SCNLOAD_FLIPTEX = 2
+       SCNLOAD_FLIPTEX = 2,
+
+       SCNLOAD_STAGE_IO = 0x4000,
+       SCNLOAD_STAGE_GL = 0x8000
 };
 
+class MetaScene;
+
 class Scene {
 private:
        bool own_texset;
 
 public:
+       MetaScene *metascn;
+       DataMap datamap;
+
        // meshes objects and nodes are owned by Scene
        std::vector<Mesh*> meshes;
        std::vector<Object*> objects;
@@ -25,6 +35,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 +47,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;
@@ -65,4 +79,15 @@ public:
        void draw() const;
 };
 
+class SceneSet : public DataSet<Scene*> {
+private:
+       static Scene *create_scene();
+       static bool load_scene(Scene *scn, const char *fname);
+       static bool done_scene(Scene *scn);
+       static void free_scene(Scene *scn);
+
+public:
+       SceneSet();
+};
+
 #endif // SCENE_H_