Cosmetic fixes

diff --git a/source/animation.cpp b/source/animation.cpp
index 744262d84781ae40e0b2c42b604b1b2badb516cf..e633aae502dfc0fa59f938b3add23e5ef5357604 100644 (file)
--- a/source/animation.cpp
+++ b/source/animation.cpp
@@ -72,20 +72,6 @@ void Animation::add_keyframe(const Time::TimeDelta &t, const RefPtr<const KeyFra
        prepare_keyframe(tkf);
 }
 
        prepare_keyframe(tkf);
 }
 

-void Animation::add_event(const Time::TimeDelta &t, const string &n, const Variant &v)
-{
-       Event event;
-       event.time = t;
-       event.name = n;
-       event.value = v;
-       events.push_back(event);
-}
-
-void Animation::set_looping(bool l)
-{
-       looping = l;
-}
-

 void Animation::prepare_keyframe(TimedKeyFrame &tkf)
 {
        const KeyFrame::UniformMap &kf_uniforms = tkf.keyframe->get_uniforms();
 void Animation::prepare_keyframe(TimedKeyFrame &tkf)
 {
        const KeyFrame::UniformMap &kf_uniforms = tkf.keyframe->get_uniforms();


@@ -107,6 +93,20 @@ void Animation::prepare_keyframe(TimedKeyFrame &tkf)
        tkf.prepare(*this);
 }
 
        tkf.prepare(*this);
 }
 

+void Animation::add_event(const Time::TimeDelta &t, const string &n, const Variant &v)
+{
+       Event event;
+       event.time = t;
+       event.name = n;
+       event.value = v;
+       events.push_back(event);
+}
+
+void Animation::set_looping(bool l)
+{
+       looping = l;
+}
+

 
 Animation::AxisInterpolation::AxisInterpolation():
        slope(0),
 
 Animation::AxisInterpolation::AxisInterpolation():
        slope(0),


@@ -333,7 +333,7 @@ Matrix Animation::Iterator::get_pose_matrix(unsigned link) const
                        return Matrix();
        }
 
                        return Matrix();
        }
 

-       // We must redo the base point correction since interpolation throws if off
+       // We must redo the base point correction since interpolation throws it off

        // XXX This should probably be done on local matrices
        Matrix result = iter->pose_matrices[link].get(time_since_keyframe/iter->delta_t);
        const Vector3 &base = animation->armature->get_link(link).get_base();
        // XXX This should probably be done on local matrices
        Matrix result = iter->pose_matrices[link].get(time_since_keyframe/iter->delta_t);
        const Vector3 &base = animation->armature->get_link(link).get_base();


@@ -400,6 +400,11 @@ void Animation::Loader::event4f(const string &n, float v0, float v1, float v2, f
        obj.add_event(current_time, n, Vector4(v0, v1, v2, v3));
 }
 
        obj.add_event(current_time, n, Vector4(v0, v1, v2, v3));
 }
 

+void Animation::Loader::interval(float t)
+{
+       current_time += t*Time::sec;
+}
+

 void Animation::Loader::keyframe(const string &n)
 {
        obj.add_keyframe(current_time, get_collection().get<KeyFrame>(n));
 void Animation::Loader::keyframe(const string &n)
 {
        obj.add_keyframe(current_time, get_collection().get<KeyFrame>(n));


@@ -416,10 +421,5 @@ void Animation::Loader::keyframe_inline()
        obj.add_keyframe(current_time, kf);
 }
 
        obj.add_keyframe(current_time, kf);
 }
 

-void Animation::Loader::interval(float t)
-{
-       current_time += t*Time::sec;
-}
-

 } // namespace GL
 } // namespace Msp
 } // namespace GL
 } // namespace Msp

diff --git a/source/animation.h b/source/animation.h
index c190bdbfd1cb11048020ad7ba06a44fff81d1a24..3404f45bd9f8c446f5110844e2cae7114fffe6ea 100644 (file)
--- a/source/animation.h
+++ b/source/animation.h
@@ -38,9 +38,9 @@ public:
                void event2f(const std::string &, float, float);
                void event3f(const std::string &, float, float, float);
                void event4f(const std::string &, float, float, float, float);
                void event2f(const std::string &, float, float);
                void event3f(const std::string &, float, float, float);
                void event4f(const std::string &, float, float, float, float);

+               void interval(float);

                void keyframe(const std::string &);
                void keyframe_inline();
                void keyframe(const std::string &);
                void keyframe_inline();

-               void interval(float);

        };
 
 private:
        };
 
 private:

diff --git a/source/animationplayer.cpp b/source/animationplayer.cpp
index 6b5a481f6a74f8da98b138067d803d8aacfbe785..a2df4b622d6eba313fd9b71e615e128becb78f14 100644 (file)
--- a/source/animationplayer.cpp
+++ b/source/animationplayer.cpp
@@ -192,6 +192,12 @@ void AnimationPlayer::set_object_uniform(AnimatedObject &obj, const string &name
 }
 
 
 }
 
 

+AnimationPlayer::PlayingAnimation::PlayingAnimation(const Animation &a):
+       animation(&a),
+       iterator(*animation)
+{ }
+
+

 AnimationPlayer::Target::Target(AnimatedObject &o):
        object(o),
        armature(0),
 AnimationPlayer::Target::Target(AnimatedObject &o):
        object(o),
        armature(0),


@@ -204,11 +210,5 @@ void AnimationPlayer::Target::animation_event(AnimatedObject *, const string &na
                (*i)->animation_event(&object, name, value);
 }
 
                (*i)->animation_event(&object, name, value);
 }
 

-
-AnimationPlayer::PlayingAnimation::PlayingAnimation(const Animation &a):
-       animation(&a),
-       iterator(*animation)
-{ }
-

 } // namespace GL
 } // namespace Msp
 } // namespace GL
 } // namespace Msp