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

diff --git a/source/render/object.h b/source/render/object.h
index 0fbcf383..dea389e4 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 {
@@ -50,10 +50,10 @@ public:
 	class Loader: public LodLoader
 	{
 	public:
-		Loader(Object &);
-		Loader(Object &, Collection &);
+		Loader(Object &o): Loader(o, 0) { }
+		Loader(Object &o, Collection &c): Loader(o, &c) { }
 	private:
-		void init();
+		Loader(Object &, Collection *);
 		virtual void finish();
 
 		void bounding_sphere_hint(float, float, float, float);
@@ -118,7 +118,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 &);