X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Fzsortedscene.h;h=a498164cd6bea37806419ed92b59d6aa5cc01ef2;hb=64de7412ba2d6b4c93f0379895bf775f74f00541;hp=24e06a6bd8f96ff56ce319a811d1cdcdea57db44;hpb=233dff2a6c552e08da832496aecd88ef4f8948f1;p=libs%2Fgl.git

diff --git a/source/render/zsortedscene.h b/source/render/zsortedscene.h
index 24e06a6b..a498164c 100644
--- a/source/render/zsortedscene.h
+++ b/source/render/zsortedscene.h
@@ -10,46 +10,47 @@ 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
 	{
 		Renderable *renderable;
-		bool in_frustum;
-		float depth;
+		bool in_frustum = false;
+		float depth = 0.0f;
 
-		SortedRenderable(Renderable *);
+		SortedRenderable(Renderable *r): renderable(r) { }
 
 		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::map<const Camera *, std::vector<SortedRenderable> > sorted_cache;
 
 public:
-	ZSortedScene();
-
 	virtual void add(Renderable &);
 	virtual void remove(Renderable &);
 
@@ -59,10 +60,6 @@ public:
 	/// Sets the reference point for sorting.  Default is furthest from camera.
 	void set_reference(DepthReference);
 
-private:
-	void populate_cache() const;
-
-public:
 	virtual void setup_frame(Renderer &);
 	virtual void finish_frame();