From f4286b9fe0d78e999a301c4943646159698c2cfd Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Mon, 5 Sep 2016 11:32:51 +0200 Subject: [PATCH] [ts] Adjust touch detection size, transitions demo timing. --- spine-ts/webgl/demos/ikconstraint.js | 4 ++-- spine-ts/webgl/demos/pathconstraint.js | 4 ++-- spine-ts/webgl/demos/stretchy.js | 12 ++++++------ spine-ts/webgl/demos/transformconstraint.js | 4 ++-- spine-ts/webgl/demos/transitions.js | 8 ++++---- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/spine-ts/webgl/demos/ikconstraint.js b/spine-ts/webgl/demos/ikconstraint.js index d33f41f72..1f7e04d4f 100644 --- a/spine-ts/webgl/demos/ikconstraint.js +++ b/spine-ts/webgl/demos/ikconstraint.js @@ -88,7 +88,7 @@ var ikConstraintDemo = function(loadingComplete, bgColor) { for (var i = 0; i < controlBones.length; i++) { var bone = skeleton.findBone(controlBones[i]); renderer.camera.screenToWorld(coords.set(x, y, 0), canvas.width, canvas.height); - if (temp.set(skeleton.x + bone.worldX, skeleton.y + bone.worldY, 0).distance(coords) < 20) { + if (temp.set(skeleton.x + bone.worldX, skeleton.y + bone.worldY, 0).distance(coords) < 30) { target = bone; } } @@ -113,7 +113,7 @@ var ikConstraintDemo = function(loadingComplete, bgColor) { for (var i = 0; i < controlBones.length; i++) { var bone = skeleton.findBone(controlBones[i]); renderer.camera.screenToWorld(coords.set(x, y, 0), canvas.width, canvas.height); - if (temp.set(skeleton.x + bone.worldX, skeleton.y + bone.worldY, 0).distance(coords) < 20) { + if (temp.set(skeleton.x + bone.worldX, skeleton.y + bone.worldY, 0).distance(coords) < 30) { hoverTargets[i] = bone; } else { hoverTargets[i] = null; diff --git a/spine-ts/webgl/demos/pathconstraint.js b/spine-ts/webgl/demos/pathconstraint.js index 1cfaac2a7..12af8f063 100644 --- a/spine-ts/webgl/demos/pathconstraint.js +++ b/spine-ts/webgl/demos/pathconstraint.js @@ -114,7 +114,7 @@ var pathConstraintDemo = function(loadingComplete, bgColor) { for (var i = 0; i < controlBones.length; i++) { var bone = skeleton.findBone(controlBones[i]); renderer.camera.screenToWorld(coords.set(x, y, 0), canvas.width, canvas.height); - if (temp.set(skeleton.x + bone.worldX, skeleton.y + bone.worldY, 0).distance(coords) < 20) { + if (temp.set(skeleton.x + bone.worldX, skeleton.y + bone.worldY, 0).distance(coords) < 30) { target = bone; } } @@ -139,7 +139,7 @@ var pathConstraintDemo = function(loadingComplete, bgColor) { for (var i = 0; i < controlBones.length; i++) { var bone = skeleton.findBone(controlBones[i]); renderer.camera.screenToWorld(coords.set(x, y, 0), canvas.width, canvas.height); - if (temp.set(skeleton.x + bone.worldX, skeleton.y + bone.worldY, 0).distance(coords) < 20) { + if (temp.set(skeleton.x + bone.worldX, skeleton.y + bone.worldY, 0).distance(coords) < 30) { hoverTargets[i] = bone; } else { hoverTargets[i] = null; diff --git a/spine-ts/webgl/demos/stretchy.js b/spine-ts/webgl/demos/stretchy.js index 1a6206a97..087011b0e 100644 --- a/spine-ts/webgl/demos/stretchy.js +++ b/spine-ts/webgl/demos/stretchy.js @@ -94,7 +94,7 @@ var stretchyDemo = function(loadingComplete, bgColor) { for (var i = 0; i < controlBones.length; i++) { var bone = skeleton.findBone(controlBones[i]); renderer.camera.screenToWorld(coords.set(x, y, 0), canvas.width, canvas.height); - if (temp.set(skeleton.x + bone.worldX, skeleton.y + bone.worldY, 0).distance(coords) < 20) { + if (temp.set(skeleton.x + bone.worldX, skeleton.y + bone.worldY, 0).distance(coords) < 30) { target = bone; } } @@ -124,7 +124,7 @@ var stretchyDemo = function(loadingComplete, bgColor) { for (var i = 0; i < controlBones.length; i++) { var bone = skeleton.findBone(controlBones[i]); renderer.camera.screenToWorld(coords.set(x, y, 0), canvas.width, canvas.height); - if (temp.set(skeleton.x + bone.worldX, skeleton.y + bone.worldY, 0).distance(coords) < 20) { + if (temp.set(skeleton.x + bone.worldX, skeleton.y + bone.worldY, 0).distance(coords) < 30) { hoverTargets[i] = bone; } else { hoverTargets[i] = null; @@ -173,16 +173,16 @@ var stretchyDemo = function(loadingComplete, bgColor) { gl.clearColor(bgColor.r, bgColor.g, bgColor.b, bgColor.a); gl.clear(gl.COLOR_BUFFER_BIT); - renderer.begin(); + renderer.begin(); renderer.drawSkeleton(skeleton, true); renderer.drawSkeletonDebug(skeleton, false, ["root"]); gl.lineWidth(2); - for (var i = 0; i < controlBones.length; i++) { + for (var i = 0; i < controlBones.length; i++) { var bone = skeleton.findBone(controlBones[i]); var colorInner = hoverTargets[i] !== null ? spineDemos.HOVER_COLOR_INNER : spineDemos.NON_HOVER_COLOR_INNER; var colorOuter = hoverTargets[i] !== null ? spineDemos.HOVER_COLOR_OUTER : spineDemos.NON_HOVER_COLOR_OUTER; - renderer.circle(true, skeleton.x + bone.worldX, skeleton.y + bone.worldY, 20, colorInner); - renderer.circle(false, skeleton.x + bone.worldX, skeleton.y + bone.worldY, 20, colorOuter); + renderer.circle(true, skeleton.x + bone.worldX, skeleton.y + bone.worldY, 20, colorInner); + renderer.circle(false, skeleton.x + bone.worldX, skeleton.y + bone.worldY, 20, colorOuter); } renderer.end(); gl.lineWidth(1); diff --git a/spine-ts/webgl/demos/transformconstraint.js b/spine-ts/webgl/demos/transformconstraint.js index 39717e5a1..d653663c7 100644 --- a/spine-ts/webgl/demos/transformconstraint.js +++ b/spine-ts/webgl/demos/transformconstraint.js @@ -112,7 +112,7 @@ var transformConstraintDemo = function(loadingComplete, bgColor) { renderer.camera.screenToWorld(coords.set(x, y, 0), canvas.width, canvas.height); for (var i = 0; i < controlBones.length; i++) { var bone = skeleton.findBone(controlBones[i]); - if (temp.set(skeleton.x + bone.worldX, skeleton.y + bone.worldY, 0).distance(coords) < 20) { + if (temp.set(skeleton.x + bone.worldX, skeleton.y + bone.worldY, 0).distance(coords) < 30) { target = bone; if (target === rotateHandle) lastRotation = getRotation(x, y); } @@ -145,7 +145,7 @@ var transformConstraintDemo = function(loadingComplete, bgColor) { renderer.camera.screenToWorld(coords.set(x, y, 0), canvas.width, canvas.height); for (var i = 0; i < controlBones.length; i++) { var bone = skeleton.findBone(controlBones[i]); - if (temp.set(skeleton.x + bone.worldX, skeleton.y + bone.worldY, 0).distance(coords) < 20) { + if (temp.set(skeleton.x + bone.worldX, skeleton.y + bone.worldY, 0).distance(coords) < 30) { hoverTargets[i] = bone; } else { hoverTargets[i] = null; diff --git a/spine-ts/webgl/demos/transitions.js b/spine-ts/webgl/demos/transitions.js index b2f28ca0c..168140b3a 100644 --- a/spine-ts/webgl/demos/transitions.js +++ b/spine-ts/webgl/demos/transitions.js @@ -81,11 +81,11 @@ var transitionsDemo = function(loadingComplete, bgColor) { state.addAnimation(0, "idle", true, 0.8); state.addAnimation(0, "run", true, 0.7); state.addAnimation(0, "idle", true, 0.8); - state.addAnimation(0, "walk", true, 0.7); - state.addAnimation(0, "run", true, 0.7); - state.addAnimation(0, "jump", false, 0.7); + state.addAnimation(0, "walk", true, 0.6); + state.addAnimation(0, "run", true, 0.6); + state.addAnimation(0, "jump", false, 0.6); state.addAnimation(0, "run", true, mix); - state.addAnimation(0, "jump", true, 0.7); + state.addAnimation(0, "jump", true, 0.5); state.addAnimation(0, "run", true, mix).listener = { event: function (trackIndex, event) {}, complete: function (trackIndex, loopCount) {},