diff options
4 files changed, 9 insertions, 14 deletions
diff --git a/trunk/ardor3d-animation/src/main/java/com/ardor3d/extension/animation/skeletal/clip/GuaranteedTriggerChannel.java b/trunk/ardor3d-animation/src/main/java/com/ardor3d/extension/animation/skeletal/clip/GuaranteedTriggerChannel.java index a0ed49e..394a585 100644 --- a/trunk/ardor3d-animation/src/main/java/com/ardor3d/extension/animation/skeletal/clip/GuaranteedTriggerChannel.java +++ b/trunk/ardor3d-animation/src/main/java/com/ardor3d/extension/animation/skeletal/clip/GuaranteedTriggerChannel.java @@ -39,11 +39,6 @@ public class GuaranteedTriggerChannel extends TriggerChannel { } @Override - public TriggerData createStateDataObject(final AnimationClipInstance instance) { - return new TriggerData(); - } - - @Override public void setCurrentSample(final int sampleIndex, final double progressPercent, final Object applyTo) { final TriggerData triggerData = (TriggerData) applyTo; diff --git a/trunk/ardor3d-animation/src/main/java/com/ardor3d/extension/animation/skeletal/clip/InterpolatedFloatChannel.java b/trunk/ardor3d-animation/src/main/java/com/ardor3d/extension/animation/skeletal/clip/InterpolatedFloatChannel.java index a1d5666..a0ff9f6 100644 --- a/trunk/ardor3d-animation/src/main/java/com/ardor3d/extension/animation/skeletal/clip/InterpolatedFloatChannel.java +++ b/trunk/ardor3d-animation/src/main/java/com/ardor3d/extension/animation/skeletal/clip/InterpolatedFloatChannel.java @@ -36,8 +36,8 @@ public class InterpolatedFloatChannel extends AbstractAnimationChannel { * the name of this channel.
* @param times
* the time samples
- * @param keys
- * our key samples. Entries may be null. Should have as many entries as the times array.
+ * @param values
+ * our value samples. Entries may be null. Should have as many entries as the times array.
*/
public InterpolatedFloatChannel(final String channelName, final float[] times, final float[] values) {
super(channelName, times);
diff --git a/trunk/ardor3d-animation/src/main/java/com/ardor3d/extension/animation/skeletal/clip/JointChannel.java b/trunk/ardor3d-animation/src/main/java/com/ardor3d/extension/animation/skeletal/clip/JointChannel.java index 928c404..9f3c8cd 100644 --- a/trunk/ardor3d-animation/src/main/java/com/ardor3d/extension/animation/skeletal/clip/JointChannel.java +++ b/trunk/ardor3d-animation/src/main/java/com/ardor3d/extension/animation/skeletal/clip/JointChannel.java @@ -124,12 +124,17 @@ public class JointChannel extends TransformChannel { jointData.setJointIndex(_jointIndex); } + @Override + public JointData createStateDataObject(final AnimationClipInstance instance) { + return new JointData(); + } + public JointData getJointData(final int index, final JointData store) { JointData rVal = store; if (rVal == null) { rVal = new JointData(); } - super.getTransformData(index, store); + super.getTransformData(index, rVal); rVal.setJointIndex(_jointIndex); return rVal; } @@ -168,11 +173,6 @@ public class JointChannel extends TransformChannel { } } - @Override - public JointData createStateDataObject(final AnimationClipInstance instance) { - return new JointData(); - } - public static JointChannel initSavable() { return new JointChannel(); } diff --git a/trunk/ardor3d-animation/src/main/java/com/ardor3d/extension/animation/skeletal/clip/TransformData.java b/trunk/ardor3d-animation/src/main/java/com/ardor3d/extension/animation/skeletal/clip/TransformData.java index 73cc7bd..15d4bc3 100644 --- a/trunk/ardor3d-animation/src/main/java/com/ardor3d/extension/animation/skeletal/clip/TransformData.java +++ b/trunk/ardor3d-animation/src/main/java/com/ardor3d/extension/animation/skeletal/clip/TransformData.java @@ -164,7 +164,7 @@ public class TransformData implements Savable { tData.setScale(scaleX, scaleY, scaleZ); tData.setTranslation(transX, transY, transZ); - tData.setRotation(getRotation().slerpLocal(blendTo.getRotation(), weight)); + Quaternion.slerp(_rotation, blendTo.getRotation(), weight, tData._rotation); return tData; } |