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

diff --git a/source/render/scene.h b/source/render/scene.h
index e55de1a8..6f4f48d6 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) { }
@@ -36,6 +43,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:
@@ -52,23 +60,14 @@ public:
 
 protected:
 	mutable Matrix culling_matrix;
-	mutable Vector4 frustum_edges[6];
 
-	Scene() { }
-private:
-	Scene(const Scene &);
-	Scene &operator=(const Scene &);
+	Scene() = default;
 public:
-	virtual ~Scene() { }
+	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: