From 7646c28f9d91c51bee7b25bedf9500d00572a296 Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Sat, 3 Sep 2016 16:35:42 +0200 Subject: [PATCH] [ts] Little more refactoring. --- .../{ikconstraints.html => ikconstraint.html} | 4 ++-- .../{ikconstraints.js => ikconstraint.js} | 4 ++-- spine-ts/webgl/demos/pathconstraint.html | 24 +++++++++++++++++++ .../demos/{vine.js => pathconstraint.js} | 12 +++++----- spine-ts/webgl/demos/vine.html | 24 ------------------- 5 files changed, 34 insertions(+), 34 deletions(-) rename spine-ts/webgl/demos/{ikconstraints.html => ikconstraint.html} (82%) rename spine-ts/webgl/demos/{ikconstraints.js => ikconstraint.js} (98%) create mode 100644 spine-ts/webgl/demos/pathconstraint.html rename spine-ts/webgl/demos/{vine.js => pathconstraint.js} (95%) delete mode 100644 spine-ts/webgl/demos/vine.html diff --git a/spine-ts/webgl/demos/ikconstraints.html b/spine-ts/webgl/demos/ikconstraint.html similarity index 82% rename from spine-ts/webgl/demos/ikconstraints.html rename to spine-ts/webgl/demos/ikconstraint.html index 4a3f68be2..12646277a 100644 --- a/spine-ts/webgl/demos/ikconstraints.html +++ b/spine-ts/webgl/demos/ikconstraint.html @@ -3,7 +3,7 @@ - + @@ -13,7 +13,7 @@ diff --git a/spine-ts/webgl/demos/ikconstraints.js b/spine-ts/webgl/demos/ikconstraint.js similarity index 98% rename from spine-ts/webgl/demos/ikconstraints.js rename to spine-ts/webgl/demos/ikconstraint.js index 43323eb70..d33f41f72 100644 --- a/spine-ts/webgl/demos/ikconstraints.js +++ b/spine-ts/webgl/demos/ikconstraint.js @@ -1,4 +1,4 @@ -var ikConstraintsDemo = function(loadingComplete, bgColor) { +var ikConstraintDemo = function(loadingComplete, bgColor) { var COLOR_INNER = new spine.Color(0.8, 0, 0, 0.5); var COLOR_OUTER = new spine.Color(0.8, 0, 0, 0.8); var COLOR_INNER_SELECTED = new spine.Color(0.0, 0, 0.8, 0.5); @@ -13,7 +13,7 @@ var ikConstraintsDemo = function(loadingComplete, bgColor) { var coords = new spine.webgl.Vector3(), temp = new spine.webgl.Vector3(), temp2 = new spine.Vector2(), temp3 = new spine.webgl.Vector3(); var isPlaying = true; - var DEMO_NAME = "IkConstraintsDemo"; + var DEMO_NAME = "IkConstraintDemo"; if (!bgColor) bgColor = new spine.Color(1, 1, 1, 1); diff --git a/spine-ts/webgl/demos/pathconstraint.html b/spine-ts/webgl/demos/pathconstraint.html new file mode 100644 index 000000000..47764170f --- /dev/null +++ b/spine-ts/webgl/demos/pathconstraint.html @@ -0,0 +1,24 @@ + + + + + + + + + +
+
+
Display bones & path
+ +
+
+
+ + + + + \ No newline at end of file diff --git a/spine-ts/webgl/demos/vine.js b/spine-ts/webgl/demos/pathconstraint.js similarity index 95% rename from spine-ts/webgl/demos/vine.js rename to spine-ts/webgl/demos/pathconstraint.js index 3dfc7df0a..1cfaac2a7 100644 --- a/spine-ts/webgl/demos/vine.js +++ b/spine-ts/webgl/demos/pathconstraint.js @@ -1,4 +1,4 @@ -var vineDemo = function(loadingComplete, bgColor) { +var pathConstraintDemo = function(loadingComplete, bgColor) { var COLOR_INNER = new spine.Color(0.8, 0, 0, 0.5); var COLOR_OUTER = new spine.Color(0.8, 0, 0, 0.8); var COLOR_INNER_SELECTED = new spine.Color(0.0, 0, 0.8, 0.5); @@ -13,12 +13,12 @@ var vineDemo = function(loadingComplete, bgColor) { var coords = new spine.webgl.Vector3(), temp = new spine.webgl.Vector3(), temp2 = new spine.Vector2(); var playButton, timeLine, isPlaying = true, playTime = 0; - var DEMO_NAME = "vineDemo"; + var DEMO_NAME = "PathConstraintDemo"; if (!bgColor) bgColor = new spine.Color(1, 1, 1, 1); function init () { - canvas = document.getElementById("vinedemo-canvas"); + canvas = document.getElementById("pathconstraintdemo-canvas"); canvas.width = canvas.clientWidth; canvas.height = canvas.clientHeight; gl = canvas.getContext("webgl", { alpha: false }) || canvas.getContext("experimental-webgl", { alpha: false }); @@ -72,7 +72,7 @@ var vineDemo = function(loadingComplete, bgColor) { } function setupUI() { - playButton = $("#vinedemo-playbutton"); + playButton = $("#pathconstraintdemo-playbutton"); var playButtonUpdate = function () { isPlaying = !isPlaying; if (isPlaying) { @@ -86,7 +86,7 @@ var vineDemo = function(loadingComplete, bgColor) { playButton.click(playButtonUpdate); playButton.addClass("pause"); - timeLine = $("#vinedemo-timeline").data("slider"); + timeLine = $("#pathconstraintdemo-timeline").data("slider"); timeLine.changed = function (percent) { if (isPlaying) playButton.click(); if (!isPlaying) { @@ -101,7 +101,7 @@ var vineDemo = function(loadingComplete, bgColor) { renderer.skeletonDebugRenderer.drawPaths = false; renderer.skeletonDebugRenderer.drawBones = false; - var checkbox = $("#vinedemo-drawbones"); + var checkbox = $("#pathconstraintdemo-drawbones"); checkbox.change(function() { renderer.skeletonDebugRenderer.drawPaths = this.checked; renderer.skeletonDebugRenderer.drawBones = this.checked; diff --git a/spine-ts/webgl/demos/vine.html b/spine-ts/webgl/demos/vine.html deleted file mode 100644 index 04952d527..000000000 --- a/spine-ts/webgl/demos/vine.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - -
-
-
Display bones & path
- -
-
-
- - - - - \ No newline at end of file