X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fscene.h;h=e6e337b907388591ea82f8a769cb9f163b819f0f;hp=611f3508e2d7e103a592787aa5e08ea75f0f1625;hb=975162f86071985913b59a835d38046e1c271594;hpb=802832425b02be7b3ccb7d585fe63f4b68b5275f

diff --git a/source/scene.h b/source/scene.h
index 611f3508..e6e337b9 100644
--- 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