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

diff --git a/source/object.h b/source/object.h
index d81c4ade..ad856323 100644
--- a/source/object.h
+++ b/source/object.h
@@ -10,8 +10,8 @@ Distributed under the LGPL
 
 #include <vector>
 #include "misc.h"
-#include "objectpass.h"
 #include "renderable.h"
+#include "renderpass.h"
 
 namespace Msp {
 namespace GL {
@@ -31,18 +31,23 @@ similar objects.  See class ObjectInstance.
 class Object: public Renderable
 {
 private:
-	std::vector<const Mesh *> meshes;
-	bool own_technique;
-	const Technique *technique;
+	std::vector<Mesh *> meshes;
+	Technique *technique;
+	bool own_mesh:1;
+	bool own_technique:1;
 
 public:
 	class Loader: public DataFile::CollectionObjectLoader<Object>
 	{
 	public:
+		Loader(Object &);
 		Loader(Object &, Collection &);
+	private:
+		void init();
 
 	private:
 		void lod_mesh(unsigned, const std::string &);
+		void mesh();
 		void mesh(const std::string &);
 		void technique();
 	};