X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fzsortedscene.h;h=d417777e0a9c8f37c3de1b5c4b778df17a0aa61f;hb=d386eadfd08b556ecb05627a7ceca14652e8b1e5;hp=5c876697cae9ee3a878c42be2fc48156471ee9ce;hpb=af0077ac71c51aeed63bc0222fe4650d5077478a;p=libs%2Fgl.git diff --git a/source/zsortedscene.h b/source/zsortedscene.h index 5c876697..d417777e 100644 --- a/source/zsortedscene.h +++ b/source/zsortedscene.h @@ -1,7 +1,9 @@ #ifndef MSP_GL_ZSORTEDSCENE_H_ #define MSP_GL_ZSORTEDSCENE_H_ -#include "simplescene.h" +#include +#include +#include "scene.h" namespace Msp { namespace GL { @@ -28,16 +30,16 @@ class ZSortedScene: public Scene private: struct SortedRenderable { + Renderable *renderable; bool in_frustum; float depth; - const Renderable *renderable; - SortedRenderable(const Renderable *); + SortedRenderable(Renderable *); bool operator<(const SortedRenderable &o) const { return depth RenderableSet; + typedef std::set RenderableSet; typedef std::vector SortedArray; RenderableSet renderables; @@ -48,8 +50,8 @@ private: public: ZSortedScene(); - virtual void add(const Renderable &); - virtual void remove(const Renderable &); + virtual void add(Renderable &); + virtual void remove(Renderable &); /// Sets the sort order. Default is back to front. void set_order(SortOrder);