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

diff --git a/source/scene.h b/source/scene.h
index 329099ea..3b35f45b 100644
--- a/source/scene.h
+++ b/source/scene.h
@@ -1,38 +1,35 @@
 /* $Id$
 
 This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2010-2011  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
 #ifndef MSP_GL_SCENE_H_
 #define MSP_GL_SCENE_H_
 
-#include <map>
-#include <set>
 #include "renderable.h"
 
 namespace Msp {
 namespace GL {
 
-class Object;
-class ObjectInstance;
-
+/**
+Scenes are containers for other Renderables.  This is a base class that can't
+be instantiated.  At the moment the 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;
-
-	ObjectMap objects;
-	RenderableSet renderables;
-
+protected:
+	Scene() { }
 public:
-	void add(const Renderable &);
-	void remove(const Renderable &);
+	virtual ~Scene() { }
+
+	virtual void add(const Renderable &) = 0;
+	virtual void remove(const Renderable &) = 0;
 
-	virtual void render(const Tag &tag = Tag()) const;
+	using Renderable::render;
+	virtual void render(const Tag & = Tag()) const;
 };
 
 } // namespace GL