X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Fobject.h;h=dea389e4b8ae4d0d841ccbea333341bbc2a40ef9;hb=23d4100160bfa33359ce297b6b36244abcaa5f82;hp=522d3adc335be01519e8c69df5a9a952c9b7129f;hpb=3ac3a51c623271da815c8ee60c484445871753bf;p=libs%2Fgl.git

diff --git a/source/render/object.h b/source/render/object.h
index 522d3adc..dea389e4 100644
--- a/source/render/object.h
+++ b/source/render/object.h
@@ -2,19 +2,16 @@
 #define MSP_GL_OBJECT_H_
 
 #include <vector>
-#include "bindable.h"
 #include "renderable.h"
-#include "renderpass.h"
+#include "rendermethod.h"
 #include "resourceobserver.h"
 
 namespace Msp {
 namespace GL {
 
-class Material;
 class Mesh;
 class ObjectInstance;
 class Technique;
-class Texture;
 
 /**
 Combines a Mesh with a Technique to give it an appearance.  The Technique will
@@ -53,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);
@@ -74,7 +71,7 @@ private:
 	Geometry::BoundingSphere<float, 3> bounding_sphere;
 	bool lod0_watched;
 
-	static Matrix identity_matrix;
+	static const Matrix identity_matrix;
 
 public:
 	Object();
@@ -121,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 &);