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

diff --git a/source/object.h b/source/object.h
index 42541eaf..4655695b 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,9 +9,9 @@ Distributed under the LGPL
 #define MSP_GL_OBJECT_H_
 
 #include <vector>
-#include <msp/datafile/collection.h>
-#include "objectpass.h"
+#include "bindable.h"
 #include "renderable.h"
+#include "renderpass.h"
 
 namespace Msp {
 namespace GL {
@@ -19,72 +19,58 @@ namespace GL {
 class Material;
 class Mesh;
 class ObjectInstance;
-class Program;
-class ProgramData;
+class Technique;
 class Texture;
 
 /**
-Stores data for a complete 3D object.  This includes a mesh, a shader and data
-for it and a number of textures.  Only the mesh is mandatory, other components
-are optional.
+Stores a Mesh together with a Technique to determine its appearance.
 
-See also class ObjectInstance.
+It is possible to use a single Object for rendering multiple identical or
+similar objects.  See class ObjectInstance.
 */
 class Object: public Renderable
 {
 private:
-	std::vector<const Mesh *> meshes;
-	std::vector<const Texture *> textures;
-	const Texture *main_texture;
-	std::map<unsigned, ObjectPass> passes;
-	const Material *material;
-	ObjectPass *normal_pass;
+	std::vector<RefPtr<const Mesh> > meshes;
+	RefPtr<const Technique> technique;
 
 public:
-	class Loader: public DataFile::Loader
+	class Loader: public DataFile::CollectionObjectLoader<Object>
 	{
 	public:
-		typedef DataFile::Collection Collection;
-
-	protected:
-		Object &obj;
-		Collection &coll;
-	private:
-		std::vector<std::string> textures;
-	
-	public:
+		Loader(Object &);
 		Loader(Object &, Collection &);
+	private:
+		void init();
 
-		Object &get_object() const { return obj; }
-		Collection &get_collection() const { return coll; }
 	private:
-		virtual void finish();
-		void lod_mesh(unsigned, const std::string &);
-		void material_inline();
+		void mesh();
+		void mesh(unsigned);
 		void mesh(const std::string &);
-		void pass(const std::string &);
-		void shader(const std::string &);
-		void shader_texture(const std::string &);
-		void texture(const std::string &);
+		void mesh(unsigned, const std::string &);
+		void technique();
+		void technique(const std::string &);
 	};
 
 	Object();
 	~Object();
 
-	virtual bool has_pass(const Tag &) const;
-	const ObjectPass &get_pass(const Tag &) const;
+	void set_mesh(const Mesh *m) { set_mesh(0, m); }
+	void set_mesh(unsigned, const Mesh *);
+	void set_technique(const Technique *);
+	const Technique *get_technique() const { return technique.get(); }
 
 	/**
 	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
@@ -93,23 +79,19 @@ public:
 	mesh.
 	*/
 	template<typename Iter>
-	void render(Iter begin, Iter end, const Tag &tag=Tag()) const
-	{ render(get_pass(tag), begin, end); }
-private:
-	void setup_render(const ObjectPass &) const;
-	void finish_render(const ObjectPass &) const;
-	void render(const ObjectPass &, const ObjectInstance *) const;
-
-	template<typename Iter>
-	void render(const ObjectPass &pass, Iter begin, Iter end) const
+	void render(Iter begin, Iter end, const Tag &tag = Tag()) const
 	{
-		setup_render(pass);
+		const RenderPass *pass = get_pass(tag);
+		if(!pass)
+			return;
+
+		Bind bind(pass);
 		for(Iter i=begin; i!=end; ++i)
-			render_instance(pass, **i);
-		finish_render(pass);
+			render_instance(**i, tag);
 	}
-
-	void render_instance(const ObjectPass &, const ObjectInstance &) const;
+private:
+	const RenderPass *get_pass(const Tag &) const;
+	void render_instance(const ObjectInstance &, const Tag &) const;
 };
 
 } // namespace GL