From 6eda0bb25ed3d007f870a108e0005d8df48e833d Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Wed, 6 Jul 2011 13:19:19 -0700 Subject: [PATCH] Might as well just lerp directly here. --- src/main/java/pythagoras/f/NonUniformTransform.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/pythagoras/f/NonUniformTransform.java b/src/main/java/pythagoras/f/NonUniformTransform.java index 4cef0ba..4663e99 100644 --- a/src/main/java/pythagoras/f/NonUniformTransform.java +++ b/src/main/java/pythagoras/f/NonUniformTransform.java @@ -148,11 +148,12 @@ public class NonUniformTransform extends AbstractTransform return other.lerp(this, -t); // TODO: is this correct? } - Vector nt = getTranslation().lerpLocal(other.getTranslation(), t); + float ntx = FloatMath.lerpa(tx, other.getTx(), t); + float nty = FloatMath.lerpa(ty, other.getTy(), t); float nrotation = FloatMath.lerpa(rotation, other.getRotation(), t); float nscaleX = FloatMath.lerp(scaleX, other.getScaleX(), t); float nscaleY = FloatMath.lerp(scaleY, other.getScaleY(), t); - return new NonUniformTransform(nscaleX, nscaleY, nrotation, nt.x, nt.y); + return new NonUniformTransform(nscaleX, nscaleY, nrotation, ntx, nty); } @Override // from Transform