X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frender%2Fobject.h;h=b6bd3a69d9b5c00ff74a14233963a11787eb70fb;hp=48e3045930559fd354af6d868a935100a2fab09d;hb=77a534371433054384d213922a2e8c55f8a69ad6;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266

diff --git a/source/render/object.h b/source/render/object.h
index 48e30459..b6bd3a69 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
@@ -40,7 +37,7 @@ private:
 		LevelOfDetail &lod;
 
 	public:
-		LodLoader(Object &, unsigned, Collection *);
+		LodLoader(Object &, unsigned, Collection &);
 
 	private:
 		void mesh(const std::string &);
@@ -53,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);
@@ -66,15 +61,15 @@ public:
 private:
 	struct LevelOfDetail
 	{
-		RefPtr<const Mesh> mesh;
-		RefPtr<const Technique> technique;
+		const Mesh *mesh;
+		const Technique *technique;
 	};
 
 	std::vector<LevelOfDetail> lods;
 	Geometry::BoundingSphere<float, 3> bounding_sphere;
-	bool lod0_watched;
+	bool lod0_watched = false;
 
-	static Matrix identity_matrix;
+	static const Matrix identity_matrix;
 
 public:
 	Object();
@@ -110,18 +105,18 @@ public:
 	virtual const Matrix *get_matrix() const { return &identity_matrix; }
 	virtual const Geometry::BoundingSphere<float, 3> *get_bounding_sphere() const { return &bounding_sphere; }
 
-	virtual void render(Renderer &, const Tag & = Tag()) const;
+	virtual void render(Renderer &, Tag = Tag()) const;
 
 	/** Renders an instance of the object.  The instance's hook functions are
 	called before and after drawing the mesh. */
-	virtual void render(Renderer &, const ObjectInstance &, const Tag & = Tag()) const;
+	virtual void render(Renderer &, const ObjectInstance &, Tag = Tag()) const;
 
 protected:
-	virtual void setup_render(Renderer &, const Tag &) const { }
-	virtual void finish_render(Renderer &, const Tag &) const { }
+	virtual void setup_render(Renderer &, Tag) const { }
+	virtual void finish_render(Renderer &, Tag) const { }
 
 private:
-	const RenderPass *get_pass(const Tag &, unsigned) const;
+	const RenderMethod *get_method(Tag, unsigned) const;
 
 	virtual void resource_loaded(Resource &);
 	virtual void resource_removed(Resource &);