X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Fobject.h;h=b6bd3a69d9b5c00ff74a14233963a11787eb70fb;hb=c8520aa336e92f2eaf9a38c3430c608520a90324;hp=0fbcf3830331cd893dbd5bc4b0f6f46dc72a9381;hpb=5bb193f930fb8738d099d630c4d625d82c1215b5;p=libs%2Fgl.git

diff --git a/source/render/object.h b/source/render/object.h
index 0fbcf383..b6bd3a69 100644
--- a/source/render/object.h
+++ b/source/render/object.h
@@ -3,7 +3,7 @@
 
 #include <vector>
 #include "renderable.h"
-#include "renderpass.h"
+#include "rendermethod.h"
 #include "resourceobserver.h"
 
 namespace Msp {
@@ -37,7 +37,7 @@ private:
 		LevelOfDetail &lod;
 
 	public:
-		LodLoader(Object &, unsigned, Collection *);
+		LodLoader(Object &, unsigned, Collection &);
 
 	private:
 		void mesh(const std::string &);
@@ -50,10 +50,8 @@ public:
 	class Loader: public LodLoader
 	{
 	public:
-		Loader(Object &);
 		Loader(Object &, Collection &);
 	private:
-		void init();
 		virtual void finish();
 
 		void bounding_sphere_hint(float, float, float, float);
@@ -69,7 +67,7 @@ private:
 
 	std::vector<LevelOfDetail> lods;
 	Geometry::BoundingSphere<float, 3> bounding_sphere;
-	bool lod0_watched;
+	bool lod0_watched = false;
 
 	static const Matrix identity_matrix;
 
@@ -118,7 +116,7 @@ protected:
 	virtual void finish_render(Renderer &, Tag) const { }
 
 private:
-	const RenderPass *get_pass(Tag, unsigned) const;
+	const RenderMethod *get_method(Tag, unsigned) const;
 
 	virtual void resource_loaded(Resource &);
 	virtual void resource_removed(Resource &);