diff options
author | Renanse <[email protected]> | 2012-12-18 15:38:40 -0600 |
---|---|---|
committer | Renanse <[email protected]> | 2012-12-18 15:38:40 -0600 |
commit | 76c6a1ff4ce5d8bf5394e7851744a598982a47a1 (patch) | |
tree | a9c8f781ab26e1249975aa46a652d7cf0f4319ba /ardor3d-animation | |
parent | 4a37685a4e9338a83e090b01ec2c0a8c49467a36 (diff) |
Small tweaks, spelling, unnecessary checks, etc.
Diffstat (limited to 'ardor3d-animation')
3 files changed, 3 insertions, 3 deletions
diff --git a/ardor3d-animation/src/main/java/com/ardor3d/extension/animation/skeletal/SkeletonPose.java b/ardor3d-animation/src/main/java/com/ardor3d/extension/animation/skeletal/SkeletonPose.java index cb1ea7a..a0fa4c1 100644 --- a/ardor3d-animation/src/main/java/com/ardor3d/extension/animation/skeletal/SkeletonPose.java +++ b/ardor3d-animation/src/main/java/com/ardor3d/extension/animation/skeletal/SkeletonPose.java @@ -196,7 +196,6 @@ public class SkeletonPose implements Savable { } Transform.releaseTempInstance(temp); updateTransforms(); - firePoseUpdated(); } /** diff --git a/ardor3d-animation/src/main/java/com/ardor3d/extension/animation/skeletal/blendtree/BinaryLERPSource.java b/ardor3d-animation/src/main/java/com/ardor3d/extension/animation/skeletal/blendtree/BinaryLERPSource.java index fec63a8..5edb64d 100644 --- a/ardor3d-animation/src/main/java/com/ardor3d/extension/animation/skeletal/blendtree/BinaryLERPSource.java +++ b/ardor3d-animation/src/main/java/com/ardor3d/extension/animation/skeletal/blendtree/BinaryLERPSource.java @@ -95,7 +95,8 @@ public class BinaryLERPSource extends AbstractTwoPartSource { */ public static Map<String, ? extends Object> combineSourceData(final Map<String, ? extends Object> sourceAData, final Map<String, ? extends Object> sourceBData, final Double blendWeight) { - return BinaryLERPSource.combineSourceData(sourceAData, sourceBData, blendWeight, null); + return BinaryLERPSource.combineSourceData(sourceAData, sourceBData, + blendWeight != null ? blendWeight.doubleValue() : 0.0, null); } public static Map<String, ? extends Object> combineSourceData(final Map<String, ? extends Object> sourceAData, diff --git a/ardor3d-animation/src/main/java/com/ardor3d/extension/animation/skeletal/blendtree/ManagedTransformSource.java b/ardor3d-animation/src/main/java/com/ardor3d/extension/animation/skeletal/blendtree/ManagedTransformSource.java index 6530783..1806e6a 100644 --- a/ardor3d-animation/src/main/java/com/ardor3d/extension/animation/skeletal/blendtree/ManagedTransformSource.java +++ b/ardor3d-animation/src/main/java/com/ardor3d/extension/animation/skeletal/blendtree/ManagedTransformSource.java @@ -24,7 +24,7 @@ import com.google.common.collect.Maps; /** * This tree source maintains its own source data, which can be modified directly using setJointXXX. This source is - * meant to be used for controlling a particular joint or set of joints programmatically. + * meant to be used for controlling a particular joint or set of joints programatically. */ public class ManagedTransformSource implements BlendTreeSource { |