Move transform loading to ObjectInstance

[libs/gl.git] / source / animatedobject.cpp

diff --git a/source/animatedobject.cpp b/source/animatedobject.cpp
index 3a78110009bc2c47b8cf26e9ab7ee59013444b40..390b90b869ce6acc9eb5a5a93a6fbe701776429e 100644 (file)
--- a/source/animatedobject.cpp
+++ b/source/animatedobject.cpp
@@ -6,7 +6,6 @@
 #include "programdata.h"
 #include "renderer.h"
 #include "technique.h"
-#include "transform.h"
 
 using namespace std;
 
@@ -78,11 +77,9 @@ void AnimatedObject::setup_render(Renderer &renderer, const Tag &) const
 
 
 AnimatedObject::Loader::Loader(AnimatedObject &o):
-       DataFile::ObjectLoader<AnimatedObject>(o)
+       DataFile::DerivedObjectLoader<AnimatedObject, ObjectInstance::Loader>(o)
 {
-       add("transform", &Loader::transform);
-
-       // Deprecated; Use the transform statement instead
+       // Deprecated; Use the transform statement defined in ObjectInstance instead
        add("position", &Loader::position);
        add("rotation", &Loader::rotation);
        add("scale", &Loader::scale);
@@ -109,12 +106,5 @@ void AnimatedObject::Loader::scale_uniform(float s)
        obj.matrix.scale(s);
 }
 
-void AnimatedObject::Loader::transform()
-{
-       Transform trn;
-       load_sub(trn);
-       obj.matrix = trn.to_matrix();
-}
-
 } // namespace GL
 } // namespace Msp