X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fscene.h;h=f295bbced04a810bc867419b9a75dff534753291;hb=a16a1a6cb3d831842f75e13653934360db617097;hp=3712ee645b0e7467824e9c7a4f9ca1b67d420eac;hpb=84f1549d8146ac54574256ae0243747199e51151;p=laserbrain_demo

diff --git a/src/scene.h b/src/scene.h
index 3712ee6..f295bbc 100644
--- 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;
@@ -28,16 +31,17 @@ public:
 
 	Mesh *walk_mesh;
 
-	TextureSet *texset;	// only owned by Scene if own_texset is true
+	TextureSet *texset;
 	void *loader_data;
 
-	explicit Scene(TextureSet *tset = 0);
+	explicit Scene();
 	~Scene();
 
 	Scene(const Scene &rhs) = delete;
 	Scene &operator =(const Scene &rhs) = delete;
 
 	void destroy();
+	void clear();	// clear all contents (meshes, objects, and nodes)
 
 	bool load(const char *fname, unsigned int flags = 0);
 
@@ -73,7 +77,6 @@ public:
 	void draw() const;
 };
 
-
 class SceneSet : public DataSet<Scene*> {
 private:
 	static Scene *create_scene();