X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Fscene.h;h=fcf5d33e8eb9645caccdbc9bff5f7d34a3427f27;hb=e92de029768eef5f0fd744329e589161b46d0762;hp=305bf62aefd5a2ed3fb4748bf9258772643eb52b;hpb=83ab54cf1339fcac560daa90496e6d4e956f7367;p=libs%2Fgl.git

diff --git a/source/render/scene.h b/source/render/scene.h
index 305bf62a..fcf5d33e 100644
--- a/source/render/scene.h
+++ b/source/render/scene.h
@@ -26,6 +26,7 @@ protected:
 
 	private:
 		ContentMap *content;
+		unsigned inst_counter;
 
 	public:
 		Loader(Scene &, Collection &);
@@ -35,6 +36,7 @@ protected:
 
 		void object(const std::string &);
 		void object_tagged(const std::string &, const std::string &);
+		void scene(const std::string &);
 	};
 
 public:
@@ -70,8 +72,6 @@ private:
 	typedef TypeRegistry<GenericLoader::CreateScene, GenericLoader &> SceneRegistry;
 
 protected:
-	// XXX If a loaded renderable is removed from the scene it needs to be removed from here as well
-	std::vector<Renderable *> owned_data;
 	mutable Matrix culling_matrix;
 	mutable Vector4 frustum_edges[6];
 
@@ -80,7 +80,7 @@ private:
 	Scene(const Scene &);
 	Scene &operator=(const Scene &);
 public:
-	virtual ~Scene();
+	virtual ~Scene() { }
 
 	virtual void add(Renderable &) = 0;
 	virtual void remove(Renderable &) = 0;