X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Fzsortedscene.h;h=f268f5297e3b279e064173c71f938494ade5431a;hb=54e758597f72544719119e4660af742628645ff6;hp=319cd8c35dfe2b17e93a84b836def3a23427409b;hpb=83ab54cf1339fcac560daa90496e6d4e956f7367;p=libs%2Fgl.git diff --git a/source/render/zsortedscene.h b/source/render/zsortedscene.h index 319cd8c3..f268f529 100644 --- a/source/render/zsortedscene.h +++ b/source/render/zsortedscene.h @@ -10,15 +10,15 @@ namespace GL { enum SortOrder { - FRONT_TO_BACK, - BACK_TO_FRONT + FRONT_TO_BACK = 0, + BACK_TO_FRONT = 1 }; enum DepthReference { - CLOSEST, - CENTER, - FURTHEST + CLOSEST = 0, + CENTER = 1, + FURTHEST = 2 }; /** @@ -42,17 +42,12 @@ private: bool operator<(const SortedRenderable &o) const { return depth RenderableSet; - typedef std::vector SortedArray; - - RenderableSet renderables; - SortOrder order; - DepthReference reference; - mutable SortedArray sorted_cache; + std::set renderables; + SortOrder order = BACK_TO_FRONT; + DepthReference reference = FURTHEST; + mutable std::vector sorted_cache; public: - ZSortedScene(); - virtual void add(Renderable &); virtual void remove(Renderable &);