X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Foccludedscene.h;h=056acb2e0d12b2e14f74fcbffcde37cee09f7674;hb=729a477b47e97aea41f3f0b5db551f02bf70d1ee;hp=78e3d3ca696f7ef091d68738ed375c8764478b26;hpb=233dff2a6c552e08da832496aecd88ef4f8948f1;p=libs%2Fgl.git

diff --git a/source/render/occludedscene.h b/source/render/occludedscene.h
index 78e3d3ca..056acb2e 100644
--- a/source/render/occludedscene.h
+++ b/source/render/occludedscene.h
@@ -16,6 +16,9 @@ entirely occluded by others.
 */
 class OccludedScene: public Scene
 {
+public:
+	using Scene::Loader;
+
 private:
 	struct OccludedRenderable
 	{
@@ -28,18 +31,15 @@ private:
 		OccludedRenderable();
 	};
 
-	typedef std::set<Renderable *> RenderableSet;
-	typedef std::vector<OccludedRenderable> OccludedArray;
-
 	const Mesh &bounding_mesh;
 	const Program &bounding_shader;
-	RenderableSet renderables;
+	std::set<Renderable *> renderables;
 	float occluder_min_size;
-	mutable OccludedArray occluded_cache;
+	mutable std::vector<OccludedRenderable> occluded_cache;
 	mutable bool cache_dirty;
 
 public:
-	OccludedScene(Resources &);
+	OccludedScene();
 	~OccludedScene();
 
 	virtual void add(Renderable &);