[ts] Set path for demos, update order.

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 "[email protected]" "$TS_UPDATE_URL$BRANCH"
 else
 	echo "Not deploying artifacts. TS_UPDATE_URL and/or BRANCH not set."
-fi
+fi

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();

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();

spine-ts/webgl/demos/demos.html

@@ -217,6 +217,23 @@
 			</div>
 		</div>
 	</div>
+	<div class="demo" id="demo-additive-blending">
+		<div>
+			<div>
+				<h2 id="Additive-blending"><a href="#Additive-blending">Additive Blending</a></h2>
+				<div class="demo-container">
+					<div class="aspect"></div>
+					<div class="resize"></div>
+				</div>
+				<div class="demo-text">
+					<div class="controls">
+						<div class="control" style="padding-bottom:6px">
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
 	<div class="demo" id="demo-path-constraint">
 		<div>
 			<div>
@@ -332,22 +349,5 @@
 			</div>
 		</div>
 	</div>
-	<div class="demo" id="demo-additive-blending">
-		<div>
-			<div>
-				<h2 id="Additive-blending"><a href="#Additive-blending">Additive Blending</a></h2>
-				<div class="demo-container">
-					<div class="aspect"></div>
-					<div class="resize"></div>
-				</div>
-				<div class="demo-text">
-					<div class="controls">
-						<div class="control" style="padding-bottom:6px">
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
 </div>
 </body></html>

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");

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);

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();

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();

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);

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();

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();

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();

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);

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");
 

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) {

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();