Prechádzať zdrojové kódy

fixed Quat.lerp value was inverted

Nicolas Cannasse 4 rokov pred
rodič
commit
05ac82e9fe
2 zmenil súbory, kde vykonal 5 pridanie a 5 odobranie
  1. 4 4
      h3d/Quat.hx
  2. 1 1
      h3d/anim/SmoothTarget.hx

+ 4 - 4
h3d/Quat.hx

@@ -198,10 +198,10 @@ class Quat {
 			v2 = v - 1;
 			v2 = v - 1;
 		else
 		else
 			v2 = 1 - v;
 			v2 = 1 - v;
-		var x = q1.x * v + q2.x * v2;
-		var y = q1.y * v + q2.y * v2;
-		var z = q1.z * v + q2.z * v2;
-		var w = q1.w * v + q2.w * v2;
+		var x = q1.x * v2 + q2.x * v;
+		var y = q1.y * v2 + q2.y * v;
+		var z = q1.z * v2 + q2.z * v;
+		var w = q1.w * v2 + q2.w * v;
 		this.x = x;
 		this.x = x;
 		this.y = y;
 		this.y = y;
 		this.z = z;
 		this.z = z;

+ 1 - 1
h3d/anim/SmoothTarget.hx

@@ -133,7 +133,7 @@ class SmoothTarget extends Animation {
 			} else {
 			} else {
 
 
 				q1.set(m._12, m._13, m._21, m._23);
 				q1.set(m._12, m._13, m._21, m._23);
-				qout.lerp(o.q, q1, 1 - blend, true);
+				qout.lerp(o.q, q1, blend, true);
 				qout.normalize();
 				qout.normalize();
 				qout.toMatrix(mout);
 				qout.toMatrix(mout);