X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Fscene.h;h=f89f10daf26691412de2f950925b11b524d9c783;hb=77a534371433054384d213922a2e8c55f8a69ad6;hp=e55de1a84323529dfe4300c6ebec210d52c8664e;hpb=9813f8711628a0fbe786406e974dc33546dc9cee;p=libs%2Fgl.git

diff --git a/source/render/scene.h b/source/render/scene.h
index e55de1a8..f89f10da 100644
--- a/source/render/scene.h
+++ b/source/render/scene.h
@@ -25,7 +25,8 @@ protected:
 
 	private:
 		ContentMap *content;
-		unsigned inst_counter;
+
+		static unsigned inline_counter;
 
 	public:
 		Loader(Scene &s, Collection &c): Loader(s, c, 0) { }
@@ -36,6 +37,7 @@ protected:
 		void object(const std::string &);
 		void object_tagged(const std::string &, const std::string &);
 		void scene(const std::string &);
+		void scene_inline();
 	};
 
 public:
@@ -54,12 +56,12 @@ protected:
 	mutable Matrix culling_matrix;
 	mutable Vector4 frustum_edges[6];
 
-	Scene() { }
+	Scene() = default;
 private:
 	Scene(const Scene &);
 	Scene &operator=(const Scene &);
 public:
-	virtual ~Scene() { }
+	virtual ~Scene() = default;
 
 	virtual void add(Renderable &) = 0;
 	virtual void remove(Renderable &) = 0;