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

diff --git a/source/render/zsortedscene.h b/source/render/zsortedscene.h
index cb21061b..9653567c 100644
--- a/source/render/zsortedscene.h
+++ b/source/render/zsortedscene.h
@@ -27,6 +27,9 @@ renderables to have a matrix.
 */
 class ZSortedScene: public Scene
 {
+public:
+	using Scene::Loader;
+
 private:
 	struct SortedRenderable
 	{
@@ -39,13 +42,10 @@ private:
 		bool operator<(const SortedRenderable &o) const { return depth<o.depth; }
 	};
 
-	typedef std::set<Renderable *> RenderableSet;
-	typedef std::vector<SortedRenderable> SortedArray;
-
-	RenderableSet renderables;
+	std::set<Renderable *> renderables;
 	SortOrder order;
 	DepthReference reference;
-	mutable SortedArray sorted_cache;
+	mutable std::vector<SortedRenderable> sorted_cache;
 
 public:
 	ZSortedScene();
@@ -66,7 +66,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