X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frender%2Fscene.h;h=d07a81da80b82fef2998eed732c4d3aca8bef8b3;hp=8083239390fed6d765e546ae08ea2aadde14f2ce;hb=HEAD;hpb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14

diff --git a/source/render/scene.h b/source/render/scene.h
index 80832393..e6115ae5 100644
--- a/source/render/scene.h
+++ b/source/render/scene.h
@@ -11,9 +11,15 @@ namespace Msp {
 namespace GL {
 
 /**
-Scenes are containers for other Renderables.  This is a base class that can't
-be instantiated.  Examples of available Scene types are SimpleScene,
-InstancedScene and OrderedScene.
+Container for other renderables.  Subclasses provide different ways of
+rendering the contents.
+
+All types of Scenes perform frustum culling on the contents, skipping
+renderables whose bounding sphere is fully outside the view volume.  If a
+bounding sphere cannot be determined, culling is not performed on that
+renderable.
+
+SimpleScene is a good default choice if there are no specific requirements.
 */
 class Scene: public Renderable
 {
@@ -25,7 +31,8 @@ protected:
 
 	private:
 		ContentMap *content;
-		unsigned inst_counter;
+
+		static unsigned inline_counter;
 
 	public:
 		Loader(Scene &s, Collection &c): Loader(s, c, 0) { }
@@ -33,9 +40,11 @@ protected:
 	private:
 		Loader(Scene &, Collection &, ContentMap *);
 
+		void array(const std::string &);
 		void object(const std::string &);
 		void object_tagged(const std::string &, const std::string &);
 		void scene(const std::string &);
+		void scene_inline();
 	};
 
 public:
@@ -51,24 +60,13 @@ public:
 	};
 
 protected:
-	mutable Matrix culling_matrix;
-	mutable Vector4 frustum_edges[6];
-
 	Scene() = default;
-private:
-	Scene(const Scene &);
-	Scene &operator=(const Scene &);
 public:
 	virtual ~Scene() = default;
 
 	virtual void add(Renderable &) = 0;
 	virtual void remove(Renderable &) = 0;
 
-protected:
-	bool setup_frustum(const Renderer &) const;
-	bool frustum_cull(const Renderable &) const;
-
-public:
 	template<typename T>
 	static void register_type(const std::string &);
 private: