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 @@ +