[ts] Set path for demos, update order.

This commit is contained in:
Nathan Sweet 2021-06-18 21:48:40 -04:00
parent 46416099c4
commit ca9a3ff7c2
16 changed files with 37 additions and 38 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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