X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobject.h;h=69759c80a7fde69b7ffe9ccc2a35abb064a758fa;hb=3cdcc7f689b3868dd275774b9bd9adb5c436f244;hp=4655695b355583d40598a7186eeab915c497d016;hpb=2f09d68a0844d2838d116d93d3ecc69723b52f16;p=libs%2Fgl.git

diff --git a/source/object.h b/source/object.h
index 4655695b..69759c80 100644
--- a/source/object.h
+++ b/source/object.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007-2008, 2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_OBJECT_H_
 #define MSP_GL_OBJECT_H_
 
@@ -30,10 +23,6 @@ similar objects.  See class ObjectInstance.
 */
 class Object: public Renderable
 {
-private:
-	std::vector<RefPtr<const Mesh> > meshes;
-	RefPtr<const Technique> technique;
-
 public:
 	class Loader: public DataFile::CollectionObjectLoader<Object>
 	{
@@ -44,19 +33,26 @@ public:
 		void init();
 
 	private:
-		void mesh();
-		void mesh(unsigned);
+		void mesh_inline();
+		void mesh_inline_lod(unsigned);
 		void mesh(const std::string &);
-		void mesh(unsigned, const std::string &);
-		void technique();
+		void mesh_lod(unsigned, const std::string &);
+		void technique_inline();
 		void technique(const std::string &);
 	};
 
+private:
+	std::vector<RefPtr<const Mesh> > meshes;
+	RefPtr<const Technique> technique;
+
+public:
 	Object();
+	Object(const Mesh *, const Technique *);
 	~Object();
 
 	void set_mesh(const Mesh *m) { set_mesh(0, m); }
 	void set_mesh(unsigned, const Mesh *);
+	const Mesh *get_mesh(unsigned = 0) const;
 	void set_technique(const Technique *);
 	const Technique *get_technique() const { return technique.get(); }
 
@@ -65,33 +61,17 @@ public:
 	*/
 	virtual void render(const Tag &tag = Tag()) const;
 
+	virtual void render(Renderer &, const 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;
-
-	/**
-	Renders multiple instances of the object in one go.  This may improve
-	performance, as the object-specific render setup only has to be done once.
-	Each instance's hook functions will be called before and after drawing the
-	mesh.
-	*/
-	template<typename Iter>
-	void render(Iter begin, Iter end, const Tag &tag = Tag()) const
-	{
-		const RenderPass *pass = get_pass(tag);
-		if(!pass)
-			return;
+	virtual void render(Renderer &, const ObjectInstance &, const Tag & = Tag()) const;
 
-		Bind bind(pass);
-		for(Iter i=begin; i!=end; ++i)
-			render_instance(**i, tag);
-	}
 private:
 	const RenderPass *get_pass(const Tag &) const;
-	void render_instance(const ObjectInstance &, const Tag &) const;
 };
 
 } // namespace GL