makefile rules for cross-compiling with mingw-w64

[laserbrain_demo] / src / metascene.h

diff --git a/src/metascene.h b/src/metascene.h
index 5d57ee0..8d0f5c2 100644 (file)
--- a/src/metascene.h
+++ b/src/metascene.h
@@ -4,11 +4,11 @@
 #include <map>
 #include "scene.h"
 #include "mesh.h"
+#include "datamap.h"
 
 class MetaScene {
 public:
-       SceneSet *sceneman;
-       TextureSet *texman;
+       DataMap datamap;
 
        std::vector<Scene*> scenes;
 
@@ -19,7 +19,7 @@ public:
        std::map<Scene*, void*> scndata;
 
 
-       MetaScene(SceneSet *sman, TextureSet *tman);
+       MetaScene();
        ~MetaScene();
 
        bool load(const char *fname);