Fix various issues with constant condition elimination

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

diff --git a/source/scene.h b/source/scene.h
index 687c581fe5d4070c27d6e62819be4a3f8bff48aa..639a467fa849cb526c19ac31744b957f820af7ea 100644 (file)
--- a/source/scene.h
+++ b/source/scene.h
@@ -1,15 +1,15 @@
 #ifndef MSP_GL_SCENE_H_
 #define MSP_GL_SCENE_H_
 
-#include <list>
+#include <vector>
 #include <msp/datafile/objectloader.h>
+#include "matrix.h"
 #include "renderable.h"
+#include "vector.h"
 
 namespace Msp {
 namespace GL {
 
-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,
@@ -21,15 +21,26 @@ public:
        class Loader: public DataFile::CollectionObjectLoader<Scene>
        {
        public:
-               Loader(Scene &, Collection &);
+               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:
-       std::list<Renderable *> owned_data;
-       std::list<Culler *> cullers;
+       // 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:
@@ -38,18 +49,12 @@ private:
 public:
        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 add(Renderable &) = 0;
+       virtual void remove(Renderable &) = 0;
 
 protected:
-       virtual void setup_cullers(const Renderer &) const;
-       virtual bool cull(const Renderer &, const Renderable &) const;
+       bool setup_frustum(const Renderer &) const;
+       bool frustum_cull(const Renderable &) const;
 };
 
 } // namespace GL