fixed background loading of both textures and scenes

[laserbrain_demo] / src / scene.h

diff --git a/src/scene.h b/src/scene.h
index 3712ee6..1cf8dcc 100644 (file)
--- a/src/scene.h
+++ b/src/scene.h
@@ -7,6 +7,7 @@
 #include "snode.h"
 #include "texture.h"
 #include "dataset.h"
+#include "datamap.h"
 
 enum {
        SCNLOAD_FLIPYZ = 1,
@@ -16,11 +17,13 @@ enum {
        SCNLOAD_STAGE_GL = 0x8000
 };
 
-class Scene {
-private:
-       bool own_texset;
+class MetaScene;
 
+class Scene {
 public:
+       MetaScene *metascn;
+       DataMap datamap;
+
        // meshes objects and nodes are owned by Scene
        std::vector<Mesh*> meshes;
        std::vector<Object*> objects;
@@ -31,7 +34,7 @@ public:
        TextureSet *texset;     // only owned by Scene if own_texset is true
        void *loader_data;
 
-       explicit Scene(TextureSet *tset = 0);
+       explicit Scene();
        ~Scene();
 
        Scene(const Scene &rhs) = delete;
@@ -73,7 +76,6 @@ public:
        void draw() const;
 };
 
-
 class SceneSet : public DataSet<Scene*> {
 private:
        static Scene *create_scene();