Minor fixes, courtesy of Apple's compiler

[libs/gl.git] / source / scene.h

diff --git a/source/scene.h b/source/scene.h
index 329099ea341f31479bbb5e7063c062b226bba49d..10b1ab650b3322fc078ded30be7115bac689f6f5 100644 (file)
--- a/source/scene.h
+++ b/source/scene.h
@@ -1,38 +1,40 @@
-/* $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 "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;
-
-       ObjectMap objects;
-       RenderableSet renderables;
+protected:
+       std::list<Culler *> cullers;
 
+       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