X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fscene.h;h=9e90b1284a014e90aa9a03191172b7137c80e35b;hp=27656a59db2fbbdc5af57de1daf498361f5f07a5;hb=6eb1cf196dbe5a2c39b29b49b6901ae7d2b4e803;hpb=3919a742c65783a9ebce05a88427bdcd8f6a6c92 diff --git a/source/scene.h b/source/scene.h index 27656a59..9e90b128 100644 --- a/source/scene.h +++ b/source/scene.h @@ -1,8 +1,9 @@ #ifndef MSP_GL_SCENE_H_ #define MSP_GL_SCENE_H_ -#include +#include #include +#include "matrix.h" #include "renderable.h" #include "vector.h" @@ -27,7 +28,8 @@ public: }; protected: - std::list owned_data; + std::vector owned_data; + mutable Matrix culling_matrix; mutable Vector4 frustum_edges[6]; Scene() { } @@ -37,11 +39,8 @@ 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: bool setup_frustum(const Renderer &) const;