X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fobjectinstance.cpp;h=450c810646f23b5b8439de2e6275730432ea73e4;hp=7552cc937f54f30b6ffb9c654f8db8bb3d9e525d;hb=d901696935a6bf9fdad6ac8abe65ffab79bd297d;hpb=c6aea1bc1586ffef132e6fffdf99343cb56617db

diff --git a/source/objectinstance.cpp b/source/objectinstance.cpp
index 7552cc93..450c8106 100644
--- a/source/objectinstance.cpp
+++ b/source/objectinstance.cpp
@@ -1,13 +1,6 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include "object.h"
 #include "objectinstance.h"
-#include "programdata.h"
+#include "renderer.h"
+#include "transform.h"
 
 using namespace std;
 
@@ -18,14 +11,34 @@ ObjectInstance::ObjectInstance(const Object &obj):
 	object(obj)
 { }
 
-bool ObjectInstance::has_pass(const Tag &tag) const
+void ObjectInstance::render(const Tag &tag) const
 {
-	return object.has_pass(tag);
+	Renderer renderer(0);
+	render(renderer, tag);
 }
 
-void ObjectInstance::render(const Tag &tag) const
+void ObjectInstance::render(Renderer &renderer, const Tag &tag) const
+{
+	object.render(renderer, *this, tag);
+}
+
+void ObjectInstance::setup_render(Renderer &renderer, const Tag &) const
+{
+	renderer.transform(matrix);
+}
+
+
+ObjectInstance::Loader::Loader(ObjectInstance &o):
+	DataFile::ObjectLoader<ObjectInstance>(o)
+{
+	add("transform", &Loader::transform);
+}
+
+void ObjectInstance::Loader::transform()
 {
-	object.render(*this, tag);
+	Transform trn;
+	load_sub(trn);
+	obj.matrix = trn.to_matrix();
 }
 
 } // namespace GL