From 95e27c5a249aadbeb369432bc6b60f299aa6457e Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Sun, 19 Jan 2014 16:45:54 +0100 Subject: [PATCH] Moved Turbulenz to spine-turbulenz to match other runtimes. Fixed example to not use root bone for positioning. --- .../SpriteBatch.js | 0 .../example}/data/goblins.atlas | 0 .../example}/data/goblins.json | 0 .../example}/data/goblins.png | Bin .../example}/data/spineboy.atlas | 0 .../example}/data/spineboy.json | 0 .../example}/data/spineboy.png | Bin .../example}/index.html | 20 +++++++++--------- .../spine-js/Place spine-js here.txt | 0 .../turbulenz/draw2d.js | 0 .../turbulenz/graphicsdevice.js | 0 .../turbulenz/turbulenzengine.js | 0 12 files changed, 10 insertions(+), 10 deletions(-) rename {spine-js/turbulenz => spine-turbulenz}/SpriteBatch.js (100%) rename {spine-js => spine-turbulenz/example}/data/goblins.atlas (100%) rename {spine-js => spine-turbulenz/example}/data/goblins.json (100%) rename {spine-js => spine-turbulenz/example}/data/goblins.png (100%) rename {spine-js => spine-turbulenz/example}/data/spineboy.atlas (100%) rename {spine-js => spine-turbulenz/example}/data/spineboy.json (100%) rename {spine-js => spine-turbulenz/example}/data/spineboy.png (100%) rename {spine-js/turbulenz => spine-turbulenz/example}/index.html (89%) create mode 100644 spine-turbulenz/spine-js/Place spine-js here.txt rename {spine-js => spine-turbulenz}/turbulenz/draw2d.js (100%) rename {spine-js => spine-turbulenz}/turbulenz/graphicsdevice.js (100%) rename {spine-js => spine-turbulenz}/turbulenz/turbulenzengine.js (100%) diff --git a/spine-js/turbulenz/SpriteBatch.js b/spine-turbulenz/SpriteBatch.js similarity index 100% rename from spine-js/turbulenz/SpriteBatch.js rename to spine-turbulenz/SpriteBatch.js diff --git a/spine-js/data/goblins.atlas b/spine-turbulenz/example/data/goblins.atlas similarity index 100% rename from spine-js/data/goblins.atlas rename to spine-turbulenz/example/data/goblins.atlas diff --git a/spine-js/data/goblins.json b/spine-turbulenz/example/data/goblins.json similarity index 100% rename from spine-js/data/goblins.json rename to spine-turbulenz/example/data/goblins.json diff --git a/spine-js/data/goblins.png b/spine-turbulenz/example/data/goblins.png similarity index 100% rename from spine-js/data/goblins.png rename to spine-turbulenz/example/data/goblins.png diff --git a/spine-js/data/spineboy.atlas b/spine-turbulenz/example/data/spineboy.atlas similarity index 100% rename from spine-js/data/spineboy.atlas rename to spine-turbulenz/example/data/spineboy.atlas diff --git a/spine-js/data/spineboy.json b/spine-turbulenz/example/data/spineboy.json similarity index 100% rename from spine-js/data/spineboy.json rename to spine-turbulenz/example/data/spineboy.json diff --git a/spine-js/data/spineboy.png b/spine-turbulenz/example/data/spineboy.png similarity index 100% rename from spine-js/data/spineboy.png rename to spine-turbulenz/example/data/spineboy.png diff --git a/spine-js/turbulenz/index.html b/spine-turbulenz/example/index.html similarity index 89% rename from spine-js/turbulenz/index.html rename to spine-turbulenz/example/index.html index 3b2594d47..6e1974116 100644 --- a/spine-js/turbulenz/index.html +++ b/spine-turbulenz/example/index.html @@ -2,11 +2,11 @@ spine-js - - - - - + + + + + @@ -30,7 +30,7 @@ load("spineboy"); var skeletonName; function load (name) { skeletonName = name; - TurbulenzEngine.request("../data/" + skeletonName + ".atlas", loadAtlas); + TurbulenzEngine.request("data/" + skeletonName + ".atlas", loadAtlas); } var atlas; @@ -40,7 +40,7 @@ function loadAtlas (atlasText) { load: function (page, path, atlas) { textureCount++; graphicsDevice.createTexture({ - src: "../data/" + path, + src: "data/" + path, mipmaps: true, onload: function (texture) { page.rendererObject = texture; @@ -57,7 +57,7 @@ function loadAtlas (atlasText) { }); function waitForTextures () { if (!textureCount) - TurbulenzEngine.request("../data/" + skeletonName + ".json", loadSkeletonData); + TurbulenzEngine.request("data/" + skeletonName + ".json", loadSkeletonData); else setTimeout(waitForTextures, 100); } @@ -75,8 +75,8 @@ function start () { spine.Bone.yDown = true; var skeleton = new spine.Skeleton(skeletonData); - skeleton.getRootBone().x = 320; - skeleton.getRootBone().y = 440; + skeleton.x = 320; + skeleton.y = 440; skeleton.updateWorldTransform(); var stateData = new spine.AnimationStateData(skeletonData); diff --git a/spine-turbulenz/spine-js/Place spine-js here.txt b/spine-turbulenz/spine-js/Place spine-js here.txt new file mode 100644 index 000000000..e69de29bb diff --git a/spine-js/turbulenz/draw2d.js b/spine-turbulenz/turbulenz/draw2d.js similarity index 100% rename from spine-js/turbulenz/draw2d.js rename to spine-turbulenz/turbulenz/draw2d.js diff --git a/spine-js/turbulenz/graphicsdevice.js b/spine-turbulenz/turbulenz/graphicsdevice.js similarity index 100% rename from spine-js/turbulenz/graphicsdevice.js rename to spine-turbulenz/turbulenz/graphicsdevice.js diff --git a/spine-js/turbulenz/turbulenzengine.js b/spine-turbulenz/turbulenz/turbulenzengine.js similarity index 100% rename from spine-js/turbulenz/turbulenzengine.js rename to spine-turbulenz/turbulenz/turbulenzengine.js