X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobjectpass.cpp;h=01a6c2eb3e21bcae46fe34507f8a0b1027eea35c;hb=927a1aa0a3a27e463ec0efc08bd08e7c4e969909;hp=92864b45a39f3f26055f1b4af1c7cc6651051299;hpb=0f3ae7cf6aed59f07895dfbef6740be3b666fc20;p=libs%2Fgl.git

diff --git a/source/objectpass.cpp b/source/objectpass.cpp
index 92864b45..01a6c2eb 100644
--- a/source/objectpass.cpp
+++ b/source/objectpass.cpp
@@ -5,6 +5,7 @@ Copyright © 2007  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
+#include <msp/datafile/collection.h>
 #include "objectpass.h"
 #include "program.h"
 #include "programdata.h"
@@ -16,7 +17,8 @@ namespace GL {
 
 ObjectPass::ObjectPass():
 	shprog(0),
-	shdata(0)
+	shdata(0),
+	use_textures(true)
 { }
 
 ObjectPass::~ObjectPass()
@@ -25,8 +27,7 @@ ObjectPass::~ObjectPass()
 
 
 ObjectPass::Loader::Loader(ObjectPass &p, Collection &c):
-	pass(p),
-	coll(c)
+	DataFile::CollectionObjectLoader<ObjectPass>(p, &c)
 {
 	add("shader", &Loader::shader);
 	add("use_textures", &ObjectPass::use_textures);
@@ -34,16 +35,16 @@ ObjectPass::Loader::Loader(ObjectPass &p, Collection &c):
 
 void ObjectPass::Loader::shader(const string &n)
 {
-	Program *shprog=coll.get<Program>(n);
+	Program *shprog=coll->get<Program>(n);
 	if(shprog)  // Allow for unsupported shaders
 	{
 		RefPtr<ProgramData> shdata=new ProgramData;
 		load_sub(*shdata, *shprog);
 
-		pass.shprog=shprog;
-		if(pass.shdata)
-			delete pass.shdata;
-		pass.shdata=shdata.release();
+		obj.shprog=shprog;
+		if(obj.shdata)
+			delete obj.shdata;
+		obj.shdata=shdata.release();
 	}
 }