X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fobject.h;h=0039dffd42500f8daadaaff85c1071df279d9564;hb=a3c2f08ce3232dbd8923bbb37723f41803bdd757;hp=0b808983099e08ffba4caf01da9ad943b3966f0f;hpb=6a135773515b020ea3f163a11d06150ae5c0e69f;p=libs%2Fgl.git

diff --git a/source/object.h b/source/object.h
index 0b808983..0039dffd 100644
--- a/source/object.h
+++ b/source/object.h
@@ -33,10 +33,11 @@ See also class ObjectInstance.
 class Object: public Renderable
 {
 private:
-	std::vector<Mesh *> meshes;
-	std::vector<Texture *> textures;
+	std::vector<const Mesh *> meshes;
+	std::vector<const Texture *> textures;
+	const Texture *main_texture;
 	std::map<unsigned, ObjectPass> passes;
-	Material *material;
+	const Material *material;
 	ObjectPass *normal_pass;
 
 public:
@@ -53,16 +54,17 @@ 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 &);
 	};