X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobject.h;h=d81c4ade6fa0453aadbd5fd27cb5a212204df36d;hb=97015ec7bddd26aa746f5227e4109b7d32438cca;hp=0039dffd42500f8daadaaff85c1071df279d9564;hpb=a3c2f08ce3232dbd8923bbb37723f41803bdd757;p=libs%2Fgl.git

diff --git a/source/object.h b/source/object.h
index 0039dffd..d81c4ade 100644
--- a/source/object.h
+++ b/source/object.h
@@ -9,7 +9,7 @@ Distributed under the LGPL
 #define MSP_GL_OBJECT_H_
 
 #include <vector>
-#include <msp/datafile/collection.h>
+#include "misc.h"
 #include "objectpass.h"
 #include "renderable.h"
 
@@ -19,60 +19,38 @@ 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;
+	bool own_technique;
+	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 &, Collection &);
 
-		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(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 technique();
 	};
 
 	Object();
 	~Object();
 
-	virtual bool has_pass(const Tag &) const;
-	const ObjectPass &get_pass(const Tag &) const;
+	const Technique *get_technique() const { return technique; }
 
 	/**
 	Renders the object.  A tag can be provided to render a non-default pass.
@@ -92,12 +70,20 @@ public:
 	Each instance's hook functions will be called before and after drawing the
 	mesh.
 	*/
-	void render(const std::list<const ObjectInstance *> &, const Tag &tag=Tag()) const;
+	template<typename Iter>
+	void render(Iter begin, Iter end, const Tag &tag=Tag()) const
+	{
+		const RenderPass *pass=get_pass(tag);
+		if(!pass)
+			return;
+
+		Bind bind(*pass);
+		for(Iter i=begin; i!=end; ++i)
+			render_instance(**i, tag);
+	}
 private:
-	void setup_render(const ObjectPass &) const;
-	void finish_render(const ObjectPass &) const;
-	void render(const ObjectPass &, const ObjectInstance *) const;
-	void render(const ObjectPass &, const std::list<const ObjectInstance *> &) const;
+	const RenderPass *get_pass(const Tag &) const;
+	void render_instance(const ObjectInstance &, const Tag &) const;
 };
 
 } // namespace GL