X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fmetascene.h;h=8d0f5c250d0547b71228484d85dc216f850682f5;hb=6b2ad3e55ddd0770ccd763a84c18657b12750a0e;hp=e793a391776c56dd730461e69210bc4198ff53d8;hpb=84f1549d8146ac54574256ae0243747199e51151;p=laserbrain_demo

diff --git a/src/metascene.h b/src/metascene.h
index e793a39..8d0f5c2 100644
--- a/src/metascene.h
+++ b/src/metascene.h
@@ -1,13 +1,14 @@
 #ifndef METASCENE_H_
 #define METASCENE_H_
 
+#include <map>
 #include "scene.h"
 #include "mesh.h"
+#include "datamap.h"
 
 class MetaScene {
 public:
-	SceneSet *sceneman;
-	TextureSet *texman;
+	DataMap datamap;
 
 	std::vector<Scene*> scenes;
 
@@ -15,10 +16,14 @@ public:
 	Vec3 start_pos;
 	Quat start_rot;
 
-	MetaScene(SceneSet *sman, TextureSet *tman);
+	std::map<Scene*, void*> scndata;
+
+
+	MetaScene();
 	~MetaScene();
 
 	bool load(const char *fname);
+	bool scene_loaded(Scene *scn);
 
 	void update(float dt);
 	void draw() const;