X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Fzsortedscene.h;h=778b097e801fdf913c418b85e403ff3030237791;hb=9e63512930bc7dace6dc169c65161961e5dcfcf6;hp=cb21061bae301db5f7851c54130112d29e04c011;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266;p=libs%2Fgl.git

diff --git a/source/render/zsortedscene.h b/source/render/zsortedscene.h
index cb21061b..778b097e 100644
--- a/source/render/zsortedscene.h
+++ b/source/render/zsortedscene.h
@@ -10,23 +10,29 @@ 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
 };
 
 /**
-Sorts renderables by their distance from the camera before rendering.  Requires
-renderables to have a matrix.
+A scene which sorts renderables by their distance from the camera before
+rendering.
+
+Renderables must have valid model matrices to be sorted.  Those without a
+matrix are sorted as closest to the camera.
 */
 class ZSortedScene: public Scene
 {
+public:
+	using Scene::Loader;
+
 private:
 	struct SortedRenderable
 	{
@@ -39,17 +45,12 @@ private:
 		bool operator<(const SortedRenderable &o) const { return depth<o.depth; }
 	};
 
-	typedef std::set<Renderable *> RenderableSet;
-	typedef std::vector<SortedRenderable> SortedArray;
-
-	RenderableSet renderables;
-	SortOrder order;
-	DepthReference reference;
-	mutable SortedArray sorted_cache;
+	std::vector<Renderable *> content;
+	SortOrder order = BACK_TO_FRONT;
+	DepthReference reference = FURTHEST;
+	mutable std::vector<SortedRenderable> sorted_cache;
 
 public:
-	ZSortedScene();
-
 	virtual void add(Renderable &);
 	virtual void remove(Renderable &);
 
@@ -66,7 +67,7 @@ public:
 	virtual void setup_frame(Renderer &);
 	virtual void finish_frame();
 
-	virtual void render(Renderer &, const Tag & = Tag()) const;
+	virtual void render(Renderer &, Tag = Tag()) const;
 };
 
 } // namespace GL