diff --git a/spine-ts/webgl/demos/hoverboard.js b/spine-ts/webgl/demos/hoverboard.js index eca98057c..ad8128c87 100644 --- a/spine-ts/webgl/demos/hoverboard.js +++ b/spine-ts/webgl/demos/hoverboard.js @@ -143,8 +143,15 @@ var hoverboardDemo = function(loadingComplete, bgColor) { renderer.begin(); renderer.drawSkeleton(skeleton, true); - // renderer.drawSkeletonDebug(skeleton, false, ["root"]); - + renderer.drawSkeletonDebug(skeleton, false, ["root"]); + gl.lineWidth(2); + 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.end(); gl.lineWidth(1); diff --git a/spine-ts/webgl/demos/imagechanges.js b/spine-ts/webgl/demos/imagechanges.js index 78d446b28..ebdff64f2 100644 --- a/spine-ts/webgl/demos/imagechanges.js +++ b/spine-ts/webgl/demos/imagechanges.js @@ -146,6 +146,7 @@ var imageChangesDemo = function(loadingComplete, bgColor) { var x = offset.x + size.x + 100, offsetY = offset.y; if (activeSkeleton === "Alien") { + skeleton.x = -400; renderer.camera.position.x = offset.x + size.x - 100; renderer.camera.position.y = offset.y + size.y / 2 + 100; offsetY += 125; diff --git a/spine-ts/webgl/demos/skins.js b/spine-ts/webgl/demos/skins.js index 2c68faaf5..0712ff943 100644 --- a/spine-ts/webgl/demos/skins.js +++ b/spine-ts/webgl/demos/skins.js @@ -208,6 +208,7 @@ var skinsDemo = function(loadingComplete, bgColor) { state.update(delta); state.apply(skeleton); + skeleton.y = -150; skeleton.updateWorldTransform(); renderer.begin(); diff --git a/spine-ts/webgl/demos/stretchyman.js b/spine-ts/webgl/demos/stretchyman.js index da6430447..16dbc156f 100644 --- a/spine-ts/webgl/demos/stretchyman.js +++ b/spine-ts/webgl/demos/stretchyman.js @@ -175,7 +175,7 @@ var stretchymanDemo = function(loadingComplete, bgColor) { skeleton.updateWorldTransform(); renderer.camera.viewportWidth = bounds.x * 1.2; - renderer.camera.viewportHeight = bounds.y * 1.2; + renderer.camera.viewportHeight = bounds.y * 1.5; renderer.resize(spine.webgl.ResizeMode.Fit); gl.clearColor(bgColor.r, bgColor.g, bgColor.b, bgColor.a); diff --git a/spine-ts/webgl/demos/transforms.js b/spine-ts/webgl/demos/transforms.js index d89b5c684..eff4de706 100644 --- a/spine-ts/webgl/demos/transforms.js +++ b/spine-ts/webgl/demos/transforms.js @@ -60,8 +60,8 @@ var transformsDemo = function(loadingComplete, bgColor) { skeleton.updateWorldTransform(); rotateHandle = skeleton.findBone("rotate-handle"); - renderer.camera.position.x = offset.x + bounds.x / 2; - renderer.camera.position.y = offset.y + bounds.y / 2; + renderer.camera.position.x = offset.x + bounds.x / 2 + 70; + renderer.camera.position.y = offset.y + bounds.y / 2 + 50; renderer.skeletonDebugRenderer.drawRegionAttachments = false; renderer.skeletonDebugRenderer.drawMeshHull = false; @@ -161,10 +161,9 @@ var transformsDemo = function(loadingComplete, bgColor) { function render () { timeKeeper.update(); var delta = timeKeeper.delta; - skeleton.updateWorldTransform(); - renderer.camera.viewportWidth = bounds.x * 1.2; + renderer.camera.viewportWidth = bounds.x * 1.6; renderer.camera.viewportHeight = bounds.y * 1.2; renderer.resize(spine.webgl.ResizeMode.Fit); diff --git a/spine-ts/webgl/demos/transitions.js b/spine-ts/webgl/demos/transitions.js index 458f57e66..968aab432 100644 --- a/spine-ts/webgl/demos/transitions.js +++ b/spine-ts/webgl/demos/transitions.js @@ -123,8 +123,8 @@ var transitionsDemo = function(loadingComplete, bgColor) { renderer.camera.position.x = offset.x + size.x - 50; renderer.camera.position.y = offset.y + size.y / 2 - 40; - renderer.camera.viewportWidth = size.x * 2.4; - renderer.camera.viewportHeight = size.y * 1.2; + renderer.camera.viewportWidth = size.x * 2; + renderer.camera.viewportHeight = size.y * 2; renderer.resize(spine.webgl.ResizeMode.Fit); gl.clearColor(bgColor.r, bgColor.g, bgColor.b, bgColor.a); @@ -134,13 +134,15 @@ var transitionsDemo = function(loadingComplete, bgColor) { state.update(delta); state.apply(skeleton); skeleton.updateWorldTransform(); - skeleton.x = -10; + skeleton.x = -300; + skeleton.y = -100; renderer.drawSkeleton(skeleton, true); stateNoMix.update(delta); stateNoMix.apply(skeletonNoMix); skeletonNoMix.updateWorldTransform(); skeletonNoMix.x = size.x + 45; + skeletonNoMix.y = -100; renderer.drawSkeleton(skeletonNoMix, true); renderer.end();