X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fscene.h;h=687c581fe5d4070c27d6e62819be4a3f8bff48aa;hb=922fac753e31d97fc88daa166e93e4c5572bd2ba;hp=329099ea341f31479bbb5e7063c062b226bba49d;hpb=b617c5d7b5283ad260a77f01e42e6170cabbc03d;p=libs%2Fgl.git

diff --git a/source/scene.h b/source/scene.h
index 329099ea..687c581f 100644
--- a/source/scene.h
+++ b/source/scene.h
@@ -1,38 +1,55 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_SCENE_H_
 #define MSP_GL_SCENE_H_
 
-#include <map>
-#include <set>
+#include <list>
+#include <msp/datafile/objectloader.h>
 #include "renderable.h"
 
 namespace Msp {
 namespace GL {
 
-class Object;
-class ObjectInstance;
+class Culler;
 
+/**
+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.
+*/
 class Scene: public Renderable
 {
-private:
-	typedef std::set<const ObjectInstance *> InstanceSet;
-	typedef std::map<const Object *, InstanceSet> ObjectMap;
-	typedef std::set<const Renderable *> RenderableSet;
+public:
+	class Loader: public DataFile::CollectionObjectLoader<Scene>
+	{
+	public:
+		Loader(Scene &, Collection &);
 
-	ObjectMap objects;
-	RenderableSet renderables;
+	private:
+		void object(const std::string &);
+	};
 
+protected:
+	std::list<Renderable *> owned_data;
+	std::list<Culler *> cullers;
+
+	Scene() { }
+private:
+	Scene(const Scene &);
+	Scene &operator=(const Scene &);
 public:
-	void add(const Renderable &);
-	void remove(const Renderable &);
+	virtual ~Scene();
+
+	virtual void add(const Renderable &) = 0;
+	virtual void remove(const Renderable &) = 0;
+
+	void add_culler(Culler &);
+	void remove_culler(Culler &);
+
+	using Renderable::render;
+	virtual void render(const Tag & = Tag()) const;
 
-	virtual void render(const Tag &tag = Tag()) const;
+protected:
+	virtual void setup_cullers(const Renderer &) const;
+	virtual bool cull(const Renderer &, const Renderable &) const;
 };
 
 } // namespace GL