From 641c138a1b557654764f63592ceb7a3c8b81603c Mon Sep 17 00:00:00 2001
From: "PSp..om" <PSpeed42@gmail.com>
Date: Thu, 19 Sep 2013 04:10:45 +0000
Subject: [PATCH] Changed interpolate() to interpolateLocal() to match the
 other method behavior where "local" stores it back to the same vector.

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10794 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
---
 engine/src/core/com/jme3/animation/Bone.java              | 8 ++++----
 engine/src/core/com/jme3/animation/BoneTrack.java         | 4 ++--
 engine/src/core/com/jme3/animation/SpatialTrack.java      | 4 ++--
 .../effect/influencers/DefaultParticleInfluencer.java     | 2 +-
 .../jme3/effect/influencers/RadialParticleInfluencer.java | 2 +-
 engine/src/core/com/jme3/math/Vector3f.java               | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/engine/src/core/com/jme3/animation/Bone.java b/engine/src/core/com/jme3/animation/Bone.java
index 0ffe374d2..f6958c04b 100644
--- a/engine/src/core/com/jme3/animation/Bone.java
+++ b/engine/src/core/com/jme3/animation/Bone.java
@@ -342,8 +342,8 @@ public final class Bone implements Savable {
             } else {
                 float invWeightSum = 1f - currentWeightSum;
                 localRot.nlerp(initialRot, invWeightSum);
-                localPos.interpolate(initialPos, invWeightSum);
-                localScale.interpolate(initialScale, invWeightSum);
+                localPos.interpolateLocal(initialPos, invWeightSum);
+                localScale.interpolateLocal(initialScale, invWeightSum);
             }
             
             // Future invocations of transform blend will start over.
@@ -598,14 +598,14 @@ public final class Bone implements Savable {
             Quaternion tmpQ = vars.quat1;
             
             tmpV.set(initialPos).addLocal(translation);
-            localPos.interpolate(tmpV, weight);
+            localPos.interpolateLocal(tmpV, weight);
 
             tmpQ.set(initialRot).multLocal(rotation);
             localRot.nlerp(tmpQ, weight);
 
             if (scale != null) {
                 tmpV2.set(initialScale).multLocal(scale);
-                localScale.interpolate(tmpV2, weight);
+                localScale.interpolateLocal(tmpV2, weight);
             }
         
             // Ensures no new weights will be blended in the future.
diff --git a/engine/src/core/com/jme3/animation/BoneTrack.java b/engine/src/core/com/jme3/animation/BoneTrack.java
index dda20d733..bf3c2da73 100644
--- a/engine/src/core/com/jme3/animation/BoneTrack.java
+++ b/engine/src/core/com/jme3/animation/BoneTrack.java
@@ -239,8 +239,8 @@ public final class BoneTrack implements Track {
                 scales.get(endFrame, tempS2);
             }
             tempQ.nlerp(tempQ2, blend);
-            tempV.interpolate(tempV2, blend);
-            tempS.interpolate(tempS2, blend);
+            tempV.interpolateLocal(tempV2, blend);
+            tempS.interpolateLocal(tempS2, blend);
         }
 
 //        if (weight != 1f) {
diff --git a/engine/src/core/com/jme3/animation/SpatialTrack.java b/engine/src/core/com/jme3/animation/SpatialTrack.java
index a124e920f..ba715b6f8 100644
--- a/engine/src/core/com/jme3/animation/SpatialTrack.java
+++ b/engine/src/core/com/jme3/animation/SpatialTrack.java
@@ -149,8 +149,8 @@ public class SpatialTrack implements Track {
                 scales.get(endFrame, tempS2);
             }
             tempQ.nlerp(tempQ2, blend);
-            tempV.interpolate(tempV2, blend);
-            tempS.interpolate(tempS2, blend);
+            tempV.interpolateLocal(tempV2, blend);
+            tempS.interpolateLocal(tempS2, blend);
         }
         
         if (translations != null)
diff --git a/engine/src/core/com/jme3/effect/influencers/DefaultParticleInfluencer.java b/engine/src/core/com/jme3/effect/influencers/DefaultParticleInfluencer.java
index bd5c99be3..b52d8df80 100644
--- a/engine/src/core/com/jme3/effect/influencers/DefaultParticleInfluencer.java
+++ b/engine/src/core/com/jme3/effect/influencers/DefaultParticleInfluencer.java
@@ -76,7 +76,7 @@ public class DefaultParticleInfluencer implements ParticleInfluencer {
         temp.multLocal(2f);
         temp.subtractLocal(1f, 1f, 1f);
         temp.multLocal(initialVelocity.length());
-        particle.velocity.interpolate(temp, velocityVariation);
+        particle.velocity.interpolateLocal(temp, velocityVariation);
     }
 
     @Override
diff --git a/engine/src/core/com/jme3/effect/influencers/RadialParticleInfluencer.java b/engine/src/core/com/jme3/effect/influencers/RadialParticleInfluencer.java
index 0a7125268..87c5ce507 100644
--- a/engine/src/core/com/jme3/effect/influencers/RadialParticleInfluencer.java
+++ b/engine/src/core/com/jme3/effect/influencers/RadialParticleInfluencer.java
@@ -68,7 +68,7 @@ public class RadialParticleInfluencer extends DefaultParticleInfluencer {
         temp.multLocal(2f);
         temp.subtractLocal(1f, 1f, 1f);
         temp.multLocal(initialVelocity.length());
-        particle.velocity.interpolate(temp, velocityVariation);
+        particle.velocity.interpolateLocal(temp, velocityVariation);
     }
 
     /**
diff --git a/engine/src/core/com/jme3/math/Vector3f.java b/engine/src/core/com/jme3/math/Vector3f.java
index b82ec2023..16755af57 100644
--- a/engine/src/core/com/jme3/math/Vector3f.java
+++ b/engine/src/core/com/jme3/math/Vector3f.java
@@ -854,7 +854,7 @@ public final class Vector3f implements Savable, Cloneable, java.io.Serializable
      * @param changeAmnt An amount between 0.0 - 1.0 representing a precentage
      *  change from this towards finalVec
      */
-    public Vector3f interpolate(Vector3f finalVec, float changeAmnt) {
+    public Vector3f interpolateLocal(Vector3f finalVec, float changeAmnt) {
         this.x=(1-changeAmnt)*this.x + changeAmnt*finalVec.x;
         this.y=(1-changeAmnt)*this.y + changeAmnt*finalVec.y;
         this.z=(1-changeAmnt)*this.z + changeAmnt*finalVec.z;