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

diff --git a/source/objectinstance.cpp b/source/objectinstance.cpp
index 14341561..450c8106 100644
--- a/source/objectinstance.cpp
+++ b/source/objectinstance.cpp
@@ -1,13 +1,6 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007, 2010-2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include "object.h"
 #include "objectinstance.h"
 #include "renderer.h"
+#include "transform.h"
 
 using namespace std;
 
@@ -29,5 +22,24 @@ 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()
+{
+	Transform trn;
+	load_sub(trn);
+	obj.matrix = trn.to_matrix();
+}
+
 } // namespace GL
 } // namespaec Msp