Fix various issues with constant condition elimination

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

diff --git a/source/scene.h b/source/scene.h
index 19048eb305a9f2ca8e8a21eca741f4671ebf813e..639a467fa849cb526c19ac31744b957f820af7ea 100644 (file)
--- a/source/scene.h
+++ b/source/scene.h
@@ -1,28 +1,60 @@
 #ifndef MSP_GL_SCENE_H_
 #define MSP_GL_SCENE_H_
 
+#include <vector>
+#include <msp/datafile/objectloader.h>
+#include "matrix.h"
 #include "renderable.h"
+#include "vector.h"
 
 namespace Msp {
 namespace GL {
 
 /**
 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,
+be instantiated.  Examples of available Scene types are SimpleScene,
 InstancedScene and OrderedScene.
 */
 class Scene: public Renderable
 {
+public:
+       class Loader: public DataFile::CollectionObjectLoader<Scene>
+       {
+       public:
+               typedef std::map<std::string, Renderable *> ContentMap;
+
+       private:
+               ContentMap *content;
+
+       public:
+               Loader(Scene &, Collection &);
+               Loader(Scene &, Collection &, ContentMap &);
+       private:
+               void init();
+
+               void object(const std::string &);
+               void object_tagged(const std::string &, const std::string &);
+       };
+
 protected:
+       // XXX If a loaded renderable is removed from the scene it needs to be removed from here as well
+       std::vector<Renderable *> owned_data;
+       mutable Matrix culling_matrix;
+       mutable Vector4 frustum_edges[6];
+
        Scene() { }
+private:
+       Scene(const Scene &);
+       Scene &operator=(const Scene &);
 public:
-       virtual ~Scene() { }
+       virtual ~Scene();
 
-       virtual void add(const Renderable &) = 0;
-       virtual void remove(const Renderable &) = 0;
+       virtual void add(Renderable &) = 0;
+       virtual void remove(Renderable &) = 0;
 
-       using Renderable::render;
-       virtual void render(const Tag & = Tag()) const;
+protected:
+       bool setup_frustum(const Renderer &) const;
+       bool frustum_cull(const Renderable &) const;
 };
 
 } // namespace GL