sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changed interpolate() to interpolateLocal() to match

Browse Source 
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
This commit is contained in:
PSp..om 2013-09-19 04:10:45 +00:00
parent 87930e7075
commit 641c138a1b
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engine/src/core/com/jme3/animation/Bone.java
View File

@ -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.

4
engine/src/core/com/jme3/animation/BoneTrack.java
View File

@ -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) {

4
engine/src/core/com/jme3/animation/SpatialTrack.java
View File

@ -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)

2
engine/src/core/com/jme3/effect/influencers/DefaultParticleInfluencer.java
View File

@ -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

2
engine/src/core/com/jme3/effect/influencers/RadialParticleInfluencer.java
View File

@ -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);
}
/**

2
engine/src/core/com/jme3/math/Vector3f.java
View File

@ -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;