fixed background loading of both textures and scenes

[laserbrain_demo] / src / scene.h

diff --git a/src/scene.h b/src/scene.h
index 7489261..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,
@@ -19,11 +20,9 @@ enum {
 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;
@@ -35,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;