From ca9a3ff7c2126a58e964b5bcc5419986ed4d0202 Mon Sep 17 00:00:00 2001 From: Nathan Sweet Date: Fri, 18 Jun 2021 21:48:40 -0400 Subject: [PATCH] [ts] Set path for demos, update order. --- spine-ts/build.sh | 4 +-- spine-ts/webgl/demos/additiveblending.js | 2 +- spine-ts/webgl/demos/clipping.js | 2 +- spine-ts/webgl/demos/demos.html | 34 ++++++++++++------------ spine-ts/webgl/demos/demos.js | 10 +++---- spine-ts/webgl/demos/hoverboard.js | 2 +- spine-ts/webgl/demos/imagechanges.js | 2 +- spine-ts/webgl/demos/meshes.js | 2 +- spine-ts/webgl/demos/skins.js | 2 +- spine-ts/webgl/demos/spritesheets.js | 2 +- spine-ts/webgl/demos/stretchyman.js | 2 +- spine-ts/webgl/demos/tank.js | 2 +- spine-ts/webgl/demos/transforms.js | 2 +- spine-ts/webgl/demos/transitions.js | 2 +- spine-ts/webgl/demos/utils.js | 3 ++- spine-ts/webgl/demos/vine.js | 2 +- 16 files changed, 37 insertions(+), 38 deletions(-) diff --git a/spine-ts/build.sh b/spine-ts/build.sh index b51c72b6e..52b39cbe0 100755 --- a/spine-ts/build.sh +++ b/spine-ts/build.sh @@ -17,8 +17,6 @@ tsc -p tsconfig.threejs.json tsc -p tsconfig.player.json ls build/*.js build/*.ts | awk '{print "unexpand -t 4 ", $0, " > /tmp/e; mv /tmp/e ", $0}' | sh - - if ! [ -z "$TS_UPDATE_URL" ] && ! [ -z "$BRANCH" ]; then echo "Deploying spine-ts $BRANCH artifacts" @@ -26,4 +24,4 @@ then curl -F "file=@spine-ts.zip" "$TS_UPDATE_URL$BRANCH" else echo "Not deploying artifacts. TS_UPDATE_URL and/or BRANCH not set." -fi \ No newline at end of file +fi diff --git a/spine-ts/webgl/demos/additiveblending.js b/spine-ts/webgl/demos/additiveblending.js index 295ba1b00..3967f5200 100644 --- a/spine-ts/webgl/demos/additiveblending.js +++ b/spine-ts/webgl/demos/additiveblending.js @@ -30,7 +30,7 @@ var additiveBlendingDemo = function(canvas, bgColor) { gl = canvas.ctx.gl; renderer = new spine.webgl.SceneRenderer(canvas, gl); - assetManager = new spine.webgl.AssetManager(gl, "assets/", spineDemos.downloader); + assetManager = new spine.webgl.AssetManager(gl, spineDemos.path, spineDemos.downloader); assetManager.loadTextureAtlas("atlas2.atlas"); assetManager.loadJson("demos.json"); timeKeeper = new spine.TimeKeeper(); diff --git a/spine-ts/webgl/demos/clipping.js b/spine-ts/webgl/demos/clipping.js index 8cb393510..2f4efe8b9 100644 --- a/spine-ts/webgl/demos/clipping.js +++ b/spine-ts/webgl/demos/clipping.js @@ -11,7 +11,7 @@ var clippingDemo = function(canvas, bgColor) { gl = canvas.ctx.gl; renderer = new spine.webgl.SceneRenderer(canvas, gl); - assetManager = new spine.webgl.AssetManager(gl, "assets/", spineDemos.downloader); + assetManager = new spine.webgl.AssetManager(gl, spineDemos.path, spineDemos.downloader); assetManager.loadTextureAtlas("atlas1.atlas"); assetManager.loadJson("demos.json"); timeKeeper = new spine.TimeKeeper(); diff --git a/spine-ts/webgl/demos/demos.html b/spine-ts/webgl/demos/demos.html index c24b2f748..18d0d454e 100644 --- a/spine-ts/webgl/demos/demos.html +++ b/spine-ts/webgl/demos/demos.html @@ -217,6 +217,23 @@ +
+
+
+

Additive Blending

+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -332,22 +349,5 @@
-
-
-
-

Additive Blending

-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file diff --git a/spine-ts/webgl/demos/demos.js b/spine-ts/webgl/demos/demos.js index 50b4a710d..e7ceb9d34 100644 --- a/spine-ts/webgl/demos/demos.js +++ b/spine-ts/webgl/demos/demos.js @@ -1,7 +1,7 @@ $(function () { - window.onerror = function(message, url, lineNo) { - alert("Error: " + message + "\n" + "URL:" + url + "\nLine: " + lineNo); + window.onerror = function (message, url, lineNo) { + alert("Error: " + message + "\n" + "URL: " + url + "\nLine: " + lineNo); } spineDemos.init(); @@ -13,12 +13,12 @@ $(function () { meshesDemo, skinsDemo, hoverboardDemo, + additiveBlendingDemo, vineDemo, - clippingDemo, stretchymanDemo, + clippingDemo, tankDemo, - transformsDemo, - additiveBlendingDemo + transformsDemo ]; var placeholders = document.getElementsByClassName("aspect"); diff --git a/spine-ts/webgl/demos/hoverboard.js b/spine-ts/webgl/demos/hoverboard.js index 108ab766c..631b87432 100644 --- a/spine-ts/webgl/demos/hoverboard.js +++ b/spine-ts/webgl/demos/hoverboard.js @@ -20,7 +20,7 @@ var hoverboardDemo = function(canvas, bgColor) { gl = canvas.ctx.gl; renderer = new spine.webgl.SceneRenderer(canvas, gl); - assetManager = new spine.webgl.AssetManager(gl, "assets/", spineDemos.downloader); + assetManager = new spine.webgl.AssetManager(gl, spineDemos.path, spineDemos.downloader); assetManager.loadTextureAtlas("atlas1.atlas"); assetManager.loadJson("demos.json"); input = new spine.webgl.Input(canvas); diff --git a/spine-ts/webgl/demos/imagechanges.js b/spine-ts/webgl/demos/imagechanges.js index 74687a17e..66b7afe7f 100644 --- a/spine-ts/webgl/demos/imagechanges.js +++ b/spine-ts/webgl/demos/imagechanges.js @@ -15,7 +15,7 @@ var imageChangesDemo = function(canvas, bgColor) { gl = canvas.ctx.gl; renderer = new spine.webgl.SceneRenderer(canvas, gl); - assetManager = new spine.webgl.AssetManager(gl, "assets/", spineDemos.downloader); + assetManager = new spine.webgl.AssetManager(gl, spineDemos.path, spineDemos.downloader); assetManager.loadTextureAtlas("atlas1.atlas"); assetManager.loadJson("demos.json"); timeKeeper = new spine.TimeKeeper(); diff --git a/spine-ts/webgl/demos/meshes.js b/spine-ts/webgl/demos/meshes.js index 1f5116e56..0cb1a6cf6 100644 --- a/spine-ts/webgl/demos/meshes.js +++ b/spine-ts/webgl/demos/meshes.js @@ -13,7 +13,7 @@ var meshesDemo = function(canvas, bgColor) { gl = canvas.ctx.gl; renderer = new spine.webgl.SceneRenderer(canvas, gl); renderer.skeletonDebugRenderer.drawRegionAttachments = false; - assetManager = new spine.webgl.AssetManager(gl, "assets/", spineDemos.downloader); + assetManager = new spine.webgl.AssetManager(gl, spineDemos.path, spineDemos.downloader); assetManager.loadTextureAtlas("atlas2.atlas"); assetManager.loadJson("demos.json"); timeKeeper = new spine.TimeKeeper(); diff --git a/spine-ts/webgl/demos/skins.js b/spine-ts/webgl/demos/skins.js index e7201f99d..14862a24f 100644 --- a/spine-ts/webgl/demos/skins.js +++ b/spine-ts/webgl/demos/skins.js @@ -12,7 +12,7 @@ var skinsDemo = function(canvas, bgColor) { gl = canvas.ctx.gl; renderer = new spine.webgl.SceneRenderer(canvas, gl); - assetManager = new spine.webgl.AssetManager(gl, "assets/", spineDemos.downloader); + assetManager = new spine.webgl.AssetManager(gl, spineDemos.path, spineDemos.downloader); assetManager.loadTextureAtlas("heroes.atlas"); assetManager.loadJson("demos.json"); input = new spine.webgl.Input(canvas); diff --git a/spine-ts/webgl/demos/spritesheets.js b/spine-ts/webgl/demos/spritesheets.js index 202c18cdf..cde66409c 100644 --- a/spine-ts/webgl/demos/spritesheets.js +++ b/spine-ts/webgl/demos/spritesheets.js @@ -18,7 +18,7 @@ var spritesheetsDemo = function(canvas, bgColor) { gl = canvas.ctx.gl; renderer = new spine.webgl.SceneRenderer(canvas, gl); - assetManager = new spine.webgl.AssetManager(gl, "assets/", spineDemos.downloader); + assetManager = new spine.webgl.AssetManager(gl, spineDemos.path, spineDemos.downloader); assetManager.loadTextureAtlas("atlas1.atlas"); assetManager.loadJson("demos.json"); timeKeeper = new spine.TimeKeeper(); diff --git a/spine-ts/webgl/demos/stretchyman.js b/spine-ts/webgl/demos/stretchyman.js index 76fd87fa3..6a4736ab5 100644 --- a/spine-ts/webgl/demos/stretchyman.js +++ b/spine-ts/webgl/demos/stretchyman.js @@ -28,7 +28,7 @@ var stretchymanDemo = function(canvas, bgColor) { gl = canvas.ctx.gl; renderer = new spine.webgl.SceneRenderer(canvas, gl); - assetManager = new spine.webgl.AssetManager(gl, "assets/", spineDemos.downloader); + assetManager = new spine.webgl.AssetManager(gl, spineDemos.path, spineDemos.downloader); assetManager.loadTextureAtlas("atlas2.atlas"); assetManager.loadJson("demos.json"); timeKeeper = new spine.TimeKeeper(); diff --git a/spine-ts/webgl/demos/tank.js b/spine-ts/webgl/demos/tank.js index c4861c200..90e043a35 100644 --- a/spine-ts/webgl/demos/tank.js +++ b/spine-ts/webgl/demos/tank.js @@ -11,7 +11,7 @@ var tankDemo = function(canvas, bgColor) { gl = canvas.ctx.gl; renderer = new spine.webgl.SceneRenderer(canvas, gl); - assetManager = new spine.webgl.AssetManager(gl, "assets/", spineDemos.downloader); + assetManager = new spine.webgl.AssetManager(gl, spineDemos.path, spineDemos.downloader); assetManager.loadTextureAtlas("atlas2.atlas"); assetManager.loadJson("demos.json"); timeKeeper = new spine.TimeKeeper(); diff --git a/spine-ts/webgl/demos/transforms.js b/spine-ts/webgl/demos/transforms.js index 7ff2ed83e..2de3b9cb7 100644 --- a/spine-ts/webgl/demos/transforms.js +++ b/spine-ts/webgl/demos/transforms.js @@ -22,7 +22,7 @@ var transformsDemo = function(canvas, bgColor) { gl = canvas.ctx.gl; renderer = new spine.webgl.SceneRenderer(canvas, gl); - assetManager = new spine.webgl.AssetManager(gl, "assets/", spineDemos.downloader); + assetManager = new spine.webgl.AssetManager(gl, spineDemos.path, spineDemos.downloader); assetManager.loadTextureAtlas("atlas2.atlas"); assetManager.loadJson("demos.json"); input = new spine.webgl.Input(canvas); diff --git a/spine-ts/webgl/demos/transitions.js b/spine-ts/webgl/demos/transitions.js index 1d539252d..76cc58641 100644 --- a/spine-ts/webgl/demos/transitions.js +++ b/spine-ts/webgl/demos/transitions.js @@ -17,7 +17,7 @@ var transitionsDemo = function(canvas, loadingComplete, bgColor) { gl = canvas.ctx.gl; renderer = new spine.webgl.SceneRenderer(canvas, gl); - assetManager = new spine.webgl.AssetManager(gl, "assets/", spineDemos.downloader); + assetManager = new spine.webgl.AssetManager(gl, spineDemos.path, spineDemos.downloader); assetManager.loadTextureAtlas("atlas1.atlas"); assetManager.loadJson("demos.json"); diff --git a/spine-ts/webgl/demos/utils.js b/spine-ts/webgl/demos/utils.js index 06d523372..9db881459 100644 --- a/spine-ts/webgl/demos/utils.js +++ b/spine-ts/webgl/demos/utils.js @@ -6,7 +6,8 @@ var spineDemos = { demos: [], loopRunning: false, canvases: [], - downloader: new spine.Downloader() + downloader: new spine.Downloader(), + path: "assets/" }; window.onerror = function (msg, url, lineNo, columnNo, error) { diff --git a/spine-ts/webgl/demos/vine.js b/spine-ts/webgl/demos/vine.js index adb8335af..c1fac58c6 100644 --- a/spine-ts/webgl/demos/vine.js +++ b/spine-ts/webgl/demos/vine.js @@ -21,7 +21,7 @@ var vineDemo = function(canvas, bgColor) { renderer = new spine.webgl.SceneRenderer(canvas, gl); input = new spine.webgl.Input(canvas); - assetManager = new spine.webgl.AssetManager(gl, "assets/", spineDemos.downloader); + assetManager = new spine.webgl.AssetManager(gl, spineDemos.path, spineDemos.downloader); assetManager.loadTextureAtlas("atlas2.atlas"); assetManager.loadJson("demos.json"); timeKeeper = new spine.TimeKeeper();