Add a Loader for Scene, and a matching Blender exporter

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

diff --git a/source/animatedobject.cpp b/source/animatedobject.cpp
index e4aa00445f4b42f83f63400b798772aa583777c1..4be198a87fec6739957642e485db91baee036263 100644 (file)
--- a/source/animatedobject.cpp
+++ b/source/animatedobject.cpp
@@ -20,6 +20,11 @@ AnimatedObject::AnimatedObject(const Object &o):
                        shdata = new ProgramData;
 }
 
+AnimatedObject::~AnimatedObject()
+{
+       delete shdata;
+}
+
 void AnimatedObject::set_matrix(const Matrix &m)
 {
        matrix = m;
@@ -40,7 +45,37 @@ void AnimatedObject::setup_render(Renderer &renderer, const Tag &) const
 {
        renderer.matrix_stack() *= matrix;
        if(shdata)
-               renderer.add_shader_data(shdata);
+               renderer.add_shader_data(*shdata);
+}
+
+
+AnimatedObject::Loader::Loader(AnimatedObject &o):
+       DataFile::ObjectLoader<AnimatedObject>(o)
+{
+       add("position", &Loader::position);
+       add("rotation", &Loader::rotation);
+       add("scale", &Loader::scale);
+       add("scale", &Loader::scale_uniform);
+}
+
+void AnimatedObject::Loader::position(float x, float y, float z)
+{
+       obj.matrix.translate(x, y, z);
+}
+
+void AnimatedObject::Loader::rotation(float a, float x, float y, float z)
+{
+       obj.matrix.rotate_deg(a, x, y, z);
+}
+
+void AnimatedObject::Loader::scale(float x, float y, float z)
+{
+       obj.matrix.scale(x, y, z);
+}
+
+void AnimatedObject::Loader::scale_uniform(float s)
+{
+       obj.matrix.scale(s);
 }
 
 } // namespace GL