X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=src%2Fmetascene.h;h=c363901346afac6a92680591e4a522b4326cc34e;hp=5d57ee010b156ae49ce8a740e2d50d0aae28ddf9;hb=fb11663a3654acd0132e71e5652e35b0ea72d544;hpb=21f74bf587d9b7a76bc1ee83db02cb8c243dc567

diff --git a/src/metascene.h b/src/metascene.h
index 5d57ee0..c363901 100644
--- a/src/metascene.h
+++ b/src/metascene.h
@@ -4,11 +4,12 @@
 #include <map>
 #include "scene.h"
 #include "mesh.h"
+#include "audio/ovstream.h"
+#include "datamap.h"
 
 class MetaScene {
 public:
-	SceneSet *sceneman;
-	TextureSet *texman;
+	DataMap datamap;
 
 	std::vector<Scene*> scenes;
 
@@ -18,8 +19,9 @@ public:
 
 	std::map<Scene*, void*> scndata;
 
+	AudioStream *music;
 
-	MetaScene(SceneSet *sman, TextureSet *tman);
+	MetaScene();
 	~MetaScene();
 
 	bool load(const char *fname);
@@ -27,6 +29,15 @@ public:
 
 	void update(float dt);
 	void draw() const;
+
+	/* helper functions which end up calling the corresponding Scene functions
+	 * for every scene
+	 */
+	SceneNode *find_node(const char *name) const;
+	SceneNode *match_node(const char *qstr) const;
+	std::list<SceneNode*> match_nodes(const char *qstr) const;
+
+	Scene *extract_nodes(const char *qstr);
 };
 
 #endif	// METASCENE_H_