Просмотр исходного кода

[ts] Ported IKConstraint simplification, see #907

badlogic 8 лет назад
Родитель
Сommit
3f478fd831

+ 2 - 16
spine-ts/build/spine-all.js

@@ -2407,22 +2407,8 @@ var spine;
 						break outer;
 						break outer;
 					}
 					}
 				}
 				}
-				var minAngle = 0, minDist = Number.MAX_VALUE, minX = 0, minY = 0;
-				var maxAngle = 0, maxDist = 0, maxX = 0, maxY = 0;
-				x = l1 + a;
-				d = x * x;
-				if (d > maxDist) {
-					maxAngle = 0;
-					maxDist = d;
-					maxX = x;
-				}
-				x = l1 - a;
-				d = x * x;
-				if (d < minDist) {
-					minAngle = spine.MathUtils.PI;
-					minDist = d;
-					minX = x;
-				}
+				var minAngle = spine.MathUtils.PI, minX = l1 - a, minDist = minX * minX, minY = 0;
+				var maxAngle = 0, maxX = l1 + a, maxDist = maxX * maxX, maxY = 0;
 				var angle = Math.acos(-a * l1 / (aa - bb));
 				var angle = Math.acos(-a * l1 / (aa - bb));
 				x = a * Math.cos(angle) + l1;
 				x = a * Math.cos(angle) + l1;
 				y = b * Math.sin(angle);
 				y = b * Math.sin(angle);

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
spine-ts/build/spine-all.js.map


+ 2 - 16
spine-ts/build/spine-canvas.js

@@ -2407,22 +2407,8 @@ var spine;
 						break outer;
 						break outer;
 					}
 					}
 				}
 				}
-				var minAngle = 0, minDist = Number.MAX_VALUE, minX = 0, minY = 0;
-				var maxAngle = 0, maxDist = 0, maxX = 0, maxY = 0;
-				x = l1 + a;
-				d = x * x;
-				if (d > maxDist) {
-					maxAngle = 0;
-					maxDist = d;
-					maxX = x;
-				}
-				x = l1 - a;
-				d = x * x;
-				if (d < minDist) {
-					minAngle = spine.MathUtils.PI;
-					minDist = d;
-					minX = x;
-				}
+				var minAngle = spine.MathUtils.PI, minX = l1 - a, minDist = minX * minX, minY = 0;
+				var maxAngle = 0, maxX = l1 + a, maxDist = maxX * maxX, maxY = 0;
 				var angle = Math.acos(-a * l1 / (aa - bb));
 				var angle = Math.acos(-a * l1 / (aa - bb));
 				x = a * Math.cos(angle) + l1;
 				x = a * Math.cos(angle) + l1;
 				y = b * Math.sin(angle);
 				y = b * Math.sin(angle);

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
spine-ts/build/spine-canvas.js.map


+ 2 - 16
spine-ts/build/spine-core.js

@@ -2407,22 +2407,8 @@ var spine;
 						break outer;
 						break outer;
 					}
 					}
 				}
 				}
-				var minAngle = 0, minDist = Number.MAX_VALUE, minX = 0, minY = 0;
-				var maxAngle = 0, maxDist = 0, maxX = 0, maxY = 0;
-				x = l1 + a;
-				d = x * x;
-				if (d > maxDist) {
-					maxAngle = 0;
-					maxDist = d;
-					maxX = x;
-				}
-				x = l1 - a;
-				d = x * x;
-				if (d < minDist) {
-					minAngle = spine.MathUtils.PI;
-					minDist = d;
-					minX = x;
-				}
+				var minAngle = spine.MathUtils.PI, minX = l1 - a, minDist = minX * minX, minY = 0;
+				var maxAngle = 0, maxX = l1 + a, maxDist = maxX * maxX, maxY = 0;
 				var angle = Math.acos(-a * l1 / (aa - bb));
 				var angle = Math.acos(-a * l1 / (aa - bb));
 				x = a * Math.cos(angle) + l1;
 				x = a * Math.cos(angle) + l1;
 				y = b * Math.sin(angle);
 				y = b * Math.sin(angle);

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
spine-ts/build/spine-core.js.map


+ 2 - 16
spine-ts/build/spine-threejs.js

@@ -2407,22 +2407,8 @@ var spine;
 						break outer;
 						break outer;
 					}
 					}
 				}
 				}
-				var minAngle = 0, minDist = Number.MAX_VALUE, minX = 0, minY = 0;
-				var maxAngle = 0, maxDist = 0, maxX = 0, maxY = 0;
-				x = l1 + a;
-				d = x * x;
-				if (d > maxDist) {
-					maxAngle = 0;
-					maxDist = d;
-					maxX = x;
-				}
-				x = l1 - a;
-				d = x * x;
-				if (d < minDist) {
-					minAngle = spine.MathUtils.PI;
-					minDist = d;
-					minX = x;
-				}
+				var minAngle = spine.MathUtils.PI, minX = l1 - a, minDist = minX * minX, minY = 0;
+				var maxAngle = 0, maxX = l1 + a, maxDist = maxX * maxX, maxY = 0;
 				var angle = Math.acos(-a * l1 / (aa - bb));
 				var angle = Math.acos(-a * l1 / (aa - bb));
 				x = a * Math.cos(angle) + l1;
 				x = a * Math.cos(angle) + l1;
 				y = b * Math.sin(angle);
 				y = b * Math.sin(angle);

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
spine-ts/build/spine-threejs.js.map


+ 2 - 16
spine-ts/build/spine-webgl.js

@@ -2407,22 +2407,8 @@ var spine;
 						break outer;
 						break outer;
 					}
 					}
 				}
 				}
-				var minAngle = 0, minDist = Number.MAX_VALUE, minX = 0, minY = 0;
-				var maxAngle = 0, maxDist = 0, maxX = 0, maxY = 0;
-				x = l1 + a;
-				d = x * x;
-				if (d > maxDist) {
-					maxAngle = 0;
-					maxDist = d;
-					maxX = x;
-				}
-				x = l1 - a;
-				d = x * x;
-				if (d < minDist) {
-					minAngle = spine.MathUtils.PI;
-					minDist = d;
-					minX = x;
-				}
+				var minAngle = spine.MathUtils.PI, minX = l1 - a, minDist = minX * minX, minY = 0;
+				var maxAngle = 0, maxX = l1 + a, maxDist = maxX * maxX, maxY = 0;
 				var angle = Math.acos(-a * l1 / (aa - bb));
 				var angle = Math.acos(-a * l1 / (aa - bb));
 				x = a * Math.cos(angle) + l1;
 				x = a * Math.cos(angle) + l1;
 				y = b * Math.sin(angle);
 				y = b * Math.sin(angle);

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
spine-ts/build/spine-webgl.js.map


+ 2 - 16
spine-ts/build/spine-widget.js

@@ -2407,22 +2407,8 @@ var spine;
 						break outer;
 						break outer;
 					}
 					}
 				}
 				}
-				var minAngle = 0, minDist = Number.MAX_VALUE, minX = 0, minY = 0;
-				var maxAngle = 0, maxDist = 0, maxX = 0, maxY = 0;
-				x = l1 + a;
-				d = x * x;
-				if (d > maxDist) {
-					maxAngle = 0;
-					maxDist = d;
-					maxX = x;
-				}
-				x = l1 - a;
-				d = x * x;
-				if (d < minDist) {
-					minAngle = spine.MathUtils.PI;
-					minDist = d;
-					minX = x;
-				}
+				var minAngle = spine.MathUtils.PI, minX = l1 - a, minDist = minX * minX, minY = 0;
+				var maxAngle = 0, maxX = l1 + a, maxDist = maxX * maxX, maxY = 0;
 				var angle = Math.acos(-a * l1 / (aa - bb));
 				var angle = Math.acos(-a * l1 / (aa - bb));
 				x = a * Math.cos(angle) + l1;
 				x = a * Math.cos(angle) + l1;
 				y = b * Math.sin(angle);
 				y = b * Math.sin(angle);

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
spine-ts/build/spine-widget.js.map


+ 3 - 17
spine-ts/core/src/IkConstraint.ts

@@ -34,7 +34,7 @@ module spine {
 		bones: Array<Bone>;
 		bones: Array<Bone>;
 		target: Bone;
 		target: Bone;
 		mix = 1;
 		mix = 1;
-		bendDirection = 0;		
+		bendDirection = 0;
 
 
 		constructor (data: IkConstraintData, skeleton: Skeleton) {
 		constructor (data: IkConstraintData, skeleton: Skeleton) {
 			if (data == null) throw new Error("data cannot be null.");
 			if (data == null) throw new Error("data cannot be null.");
@@ -169,22 +169,8 @@ module spine {
 						break outer;
 						break outer;
 					}
 					}
 				}
 				}
-				let minAngle = 0, minDist = Number.MAX_VALUE, minX = 0, minY = 0;
-				let maxAngle = 0, maxDist = 0, maxX = 0, maxY = 0;
-				x = l1 + a;
-				d = x * x;
-				if (d > maxDist) {
-					maxAngle = 0;
-					maxDist = d;
-					maxX = x;
-				}
-				x = l1 - a;
-				d = x * x;
-				if (d < minDist) {
-					minAngle = MathUtils.PI;
-					minDist = d;
-					minX = x;
-				}
+				let minAngle = spine.MathUtils.PI, minX = l1 - a, minDist = minX * minX, minY = 0;
+				let maxAngle = 0, maxX = l1 + a, maxDist = maxX * maxX, maxY = 0;
 				let angle = Math.acos(-a * l1 / (aa - bb));
 				let angle = Math.acos(-a * l1 / (aa - bb));
 				x = a * Math.cos(angle) + l1;
 				x = a * Math.cos(angle) + l1;
 				y = b * Math.sin(angle);
 				y = b * Math.sin(angle);

Некоторые файлы не были показаны из-за большого количества измененных файлов