From 76c6a1ff4ce5d8bf5394e7851744a598982a47a1 Mon Sep 17 00:00:00 2001 From: Renanse Date: Tue, 18 Dec 2012 15:38:40 -0600 Subject: Small tweaks, spelling, unnecessary checks, etc. --- .../java/com/ardor3d/extension/animation/skeletal/SkeletonPose.java | 1 - .../extension/animation/skeletal/blendtree/BinaryLERPSource.java | 3 ++- .../extension/animation/skeletal/blendtree/ManagedTransformSource.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'ardor3d-animation/src/main/java/com') 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 combineSourceData(final Map sourceAData, final Map 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 combineSourceData(final Map 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 { -- cgit v1.2.3