X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobject.h;h=2b5f4a850d8aa7b483fde3cf1eb932d4c9efc9e2;hb=bdd9a8e26efad3ba349e4ffd58171cfee3cacfb0;hp=ad856323d732e6356d6708c123f688c1061b66c8;hpb=a93d6abc8a4a3e70fa8f6781d9804583e18ef636;p=libs%2Fgl.git

diff --git a/source/object.h b/source/object.h
index ad856323..2b5f4a85 100644
--- a/source/object.h
+++ b/source/object.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2008, 2010  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -9,7 +9,7 @@ Distributed under the LGPL
 #define MSP_GL_OBJECT_H_
 
 #include <vector>
-#include "misc.h"
+#include "bindable.h"
 #include "renderable.h"
 #include "renderpass.h"
 
@@ -60,14 +60,14 @@ public:
 	/**
 	Renders the object.  A tag can be provided to render a non-default pass.
 	*/
-	virtual void render(const Tag &tag=Tag()) const;
+	virtual void render(const Tag &tag = Tag()) const;
 
 	/**
 	Renders the object with an instance.  The instance's hook functions are
 	called before and after drawing the mesh.  A tag may also be given to render
 	a non-default pass.
 	*/
-	virtual void render(const ObjectInstance &, const Tag &tag=Tag()) const;
+	virtual void render(const ObjectInstance &, const Tag &tag = Tag()) const;
 
 	/**
 	Renders multiple instances of the object in one go.  This may improve
@@ -76,13 +76,13 @@ public:
 	mesh.
 	*/
 	template<typename Iter>
-	void render(Iter begin, Iter end, const Tag &tag=Tag()) const
+	void render(Iter begin, Iter end, const Tag &tag = Tag()) const
 	{
-		const RenderPass *pass=get_pass(tag);
+		const RenderPass *pass = get_pass(tag);
 		if(!pass)
 			return;
 
-		Bind bind(*pass);
+		Bind bind(pass);
 		for(Iter i=begin; i!=end; ++i)
 			render_instance(**i, tag);
 	}