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

diff --git a/source/object.h b/source/object.h
index e38afb5c..0039dffd 100644
--- a/source/object.h
+++ b/source/object.h
@@ -11,6 +11,7 @@ Distributed under the LGPL
 #include <vector>
 #include <msp/datafile/collection.h>
 #include "objectpass.h"
+#include "renderable.h"
 
 namespace Msp {
 namespace GL {
@@ -29,13 +30,14 @@ are optional.
 
 See also class ObjectInstance.
 */
-class Object
+class Object: public Renderable
 {
 private:
-	std::vector<Mesh *> meshes;
-	std::vector<Texture *> textures;
-	std::map<std::string, ObjectPass> passes;
-	Material *material;
+	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;
 
 public:
@@ -52,39 +54,45 @@ public:
 	
 	public:
 		Loader(Object &, Collection &);
-		~Loader();
 
 		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 &);
 	};
 
 	Object();
 	~Object();
 
-	bool has_pass(const std::string &) const;
-	const ObjectPass &get_pass(const std::string &) const;
+	virtual bool has_pass(const Tag &) const;
+	const ObjectPass &get_pass(const Tag &) const;
 
 	/**
-	Renders the object.  If an ObjectInstance is provided, its hook functions
-	are called.
+	Renders the object.  A tag can be provided to render a non-default pass.
 	*/
-	void render(const ObjectInstance * =0) const;
-	void render(const std::string &, const ObjectInstance *) const;
+	virtual void render(const Tag &tag=Tag()) const;
 
 	/**
-	Renders multiple instances of the object in one go.  This may be a
-	performance improvement, as the object-specific render setup only has to be
-	done once.
+	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.
 	*/
-	void render(const std::list<const ObjectInstance *> &) const;
-	void render(const std::string &, const std::list<const ObjectInstance *> &) const;
+	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.
+	*/
+	void render(const std::list<const ObjectInstance *> &, const Tag &tag=Tag()) const;
 private:
 	void setup_render(const ObjectPass &) const;
 	void finish_render(const ObjectPass &) const;