UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-28 04:31:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.6' into 3.7-beta

Browse Source
This commit is contained in:
badlogic 2017-10-30 14:14:05 +01:00
commit 0837774cfa
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spine-ts/webgl/tests/test-pma-tintblack.html
View File

@ -84,8 +84,8 @@
var ivanShader = loadIvanShader(context, shader); var ivanShader = loadIvanShader(context, shader);
var assetManager = new spine.webgl.AssetManager(context); var assetManager = new spine.webgl.AssetManager(context);
assetManager.loadTexture("assets/spineboy.png"); assetManager.loadTexture("../example/assets/spineboy.png");
assetManager.loadTexture("assets/spineboy-pma.png"); assetManager.loadTexture("../example/assets/spineboy-pma.png");
var camMatrix = new spine.webgl.Matrix4(); var camMatrix = new spine.webgl.Matrix4();
@ -95,8 +95,8 @@
function load () { function load () {
if (assetManager.isLoadingComplete()) { if (assetManager.isLoadingComplete()) {
texture = assetManager.get("assets/spineboy.png"); texture = assetManager.get("../example/assets/spineboy.png");
texturePma = assetManager.get("assets/spineboy-pma.png"); texturePma = assetManager.get("../example/assets/spineboy-pma.png");
requestAnimationFrame(render); requestAnimationFrame(render);
} else requestAnimationFrame(load); } else requestAnimationFrame(load);
} }

2
spine-ts/webgl/tests/test.html
View File

@ -45,7 +45,7 @@ function init() {
swirlEffect.centerY = 200; swirlEffect.centerY = 200;
swirlEffect.radius = 500; swirlEffect.radius = 500;
assetManager = new spine.webgl.AssetManager(context, "assets/"); assetManager = new spine.webgl.AssetManager(context, "../example/assets/");
var textureLoader = function(img) { return new spine.webgl.GLTexture(gl, img); }; var textureLoader = function(img) { return new spine.webgl.GLTexture(gl, img); };
input = new spine.webgl.Input(canvas); input = new spine.webgl.Input(canvas);

4
spine-ts/webgl/tests/test2.html
View File

@ -30,7 +30,7 @@ mesh.setIndices(indices);
var shader = spine.webgl.Shader.newTwoColoredTextured(context); var shader = spine.webgl.Shader.newTwoColoredTextured(context);
var assetManager = new spine.webgl.AssetManager(context); var assetManager = new spine.webgl.AssetManager(context);
assetManager.loadTexture("assets/spineboy.png"); assetManager.loadTexture("../example/assets/spineboy.png");
var camMatrix = new spine.webgl.Matrix4(); var camMatrix = new spine.webgl.Matrix4();
@ -40,7 +40,7 @@ requestAnimationFrame(load);
function load () { function load () {
if (assetManager.isLoadingComplete()) { if (assetManager.isLoadingComplete()) {
texture = assetManager.get("assets/spineboy.png"); texture = assetManager.get("../example/assets/spineboy.png");
requestAnimationFrame(render); requestAnimationFrame(render);
} else requestAnimationFrame(load); } else requestAnimationFrame(load);
} }