Support overriding uniforms in inherited Techniques

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

diff --git a/source/scene.h b/source/scene.h
index 611f3508e2d7e103a592787aa5e08ea75f0f1625..e6e337b907388591ea82f8a769cb9f163b819f0f 100644 (file)
--- a/source/scene.h
+++ b/source/scene.h
@@ -3,6 +3,7 @@
 
 #include <list>
 #include <msp/datafile/objectloader.h>
+#include "matrix.h"
 #include "renderable.h"
 #include "vector.h"
 
@@ -28,7 +29,8 @@ public:
 
 protected:
        std::list<Renderable *> owned_data;
-       mutable Vector3 frustum_edges[4];
+       mutable Matrix culling_matrix;
+       mutable Vector4 frustum_edges[6];
 
        Scene() { }
 private:
@@ -37,15 +39,12 @@ private:
 public:
        virtual ~Scene();
 
-       virtual void add(const Renderable &) = 0;
-       virtual void remove(const Renderable &) = 0;
-
-       using Renderable::render;
-       virtual void render(const Tag & = Tag()) const;
+       virtual void add(Renderable &) = 0;
+       virtual void remove(Renderable &) = 0;
 
 protected:
-       void setup_frustum(const Renderer &) const;
-       bool frustum_cull(const Renderer &, const Renderable &) const;
+       bool setup_frustum(const Renderer &) const;
+       bool frustum_cull(const Renderable &) const;
 };
 
 } // namespace GL