diff --git a/package.json b/package.json index ea8f631..785daa2 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,6 @@ "brfs": "^1.4.0", "eventemitter3": "^1.0.1", "object-assign": "^2.0.0", - "pixi-spine": "^1.0.1", "resource-loader": "^1.4.2" }, "devDependencies": { diff --git a/package.json b/package.json index ea8f631..785daa2 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,6 @@ "brfs": "^1.4.0", "eventemitter3": "^1.0.1", "object-assign": "^2.0.0", - "pixi-spine": "^1.0.1", "resource-loader": "^1.4.2" }, "devDependencies": { diff --git a/src/core/utils/index.js b/src/core/utils/index.js index 2a454c7..a1a46da 100644 --- a/src/core/utils/index.js +++ b/src/core/utils/index.js @@ -9,6 +9,7 @@ pluginTarget: require('./pluginTarget'), PolyK: require('./PolyK'), + async: require('async'), /** diff --git a/package.json b/package.json index ea8f631..785daa2 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,6 @@ "brfs": "^1.4.0", "eventemitter3": "^1.0.1", "object-assign": "^2.0.0", - "pixi-spine": "^1.0.1", "resource-loader": "^1.4.2" }, "devDependencies": { diff --git a/src/core/utils/index.js b/src/core/utils/index.js index 2a454c7..a1a46da 100644 --- a/src/core/utils/index.js +++ b/src/core/utils/index.js @@ -9,6 +9,7 @@ pluginTarget: require('./pluginTarget'), PolyK: require('./PolyK'), + async: require('async'), /** diff --git a/src/index.js b/src/index.js index 0c4b3d9..8f51010 100644 --- a/src/index.js +++ b/src/index.js @@ -9,7 +9,6 @@ core.interaction = require('./interaction'); core.loaders = require('./loaders'); core.mesh = require('./mesh'); -core.spine = require('pixi-spine'); core.ticker = require('./ticker'); // export a premade loader instance diff --git a/package.json b/package.json index ea8f631..785daa2 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,6 @@ "brfs": "^1.4.0", "eventemitter3": "^1.0.1", "object-assign": "^2.0.0", - "pixi-spine": "^1.0.1", "resource-loader": "^1.4.2" }, "devDependencies": { diff --git a/src/core/utils/index.js b/src/core/utils/index.js index 2a454c7..a1a46da 100644 --- a/src/core/utils/index.js +++ b/src/core/utils/index.js @@ -9,6 +9,7 @@ pluginTarget: require('./pluginTarget'), PolyK: require('./PolyK'), + async: require('async'), /** diff --git a/src/index.js b/src/index.js index 0c4b3d9..8f51010 100644 --- a/src/index.js +++ b/src/index.js @@ -9,7 +9,6 @@ core.interaction = require('./interaction'); core.loaders = require('./loaders'); core.mesh = require('./mesh'); -core.spine = require('pixi-spine'); core.ticker = require('./ticker'); // export a premade loader instance diff --git a/src/loaders/index.js b/src/loaders/index.js index ec5a4d3..5d513e5 100644 --- a/src/loaders/index.js +++ b/src/loaders/index.js @@ -13,7 +13,7 @@ // parsers bitmapFontParser: require('./bitmapFontParser'), - spineAtlasParser: require('./spineAtlasParser'), spritesheetParser: require('./spritesheetParser'), - textureParser: require('./textureParser') + textureParser: require('./textureParser'), + Resource: require('resource-loader').Resource }; diff --git a/package.json b/package.json index ea8f631..785daa2 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,6 @@ "brfs": "^1.4.0", "eventemitter3": "^1.0.1", "object-assign": "^2.0.0", - "pixi-spine": "^1.0.1", "resource-loader": "^1.4.2" }, "devDependencies": { diff --git a/src/core/utils/index.js b/src/core/utils/index.js index 2a454c7..a1a46da 100644 --- a/src/core/utils/index.js +++ b/src/core/utils/index.js @@ -9,6 +9,7 @@ pluginTarget: require('./pluginTarget'), PolyK: require('./PolyK'), + async: require('async'), /** diff --git a/src/index.js b/src/index.js index 0c4b3d9..8f51010 100644 --- a/src/index.js +++ b/src/index.js @@ -9,7 +9,6 @@ core.interaction = require('./interaction'); core.loaders = require('./loaders'); core.mesh = require('./mesh'); -core.spine = require('pixi-spine'); core.ticker = require('./ticker'); // export a premade loader instance diff --git a/src/loaders/index.js b/src/loaders/index.js index ec5a4d3..5d513e5 100644 --- a/src/loaders/index.js +++ b/src/loaders/index.js @@ -13,7 +13,7 @@ // parsers bitmapFontParser: require('./bitmapFontParser'), - spineAtlasParser: require('./spineAtlasParser'), spritesheetParser: require('./spritesheetParser'), - textureParser: require('./textureParser') + textureParser: require('./textureParser'), + Resource: require('resource-loader').Resource }; diff --git a/src/loaders/loader.js b/src/loaders/loader.js index 3d96fbf..97aca51 100644 --- a/src/loaders/loader.js +++ b/src/loaders/loader.js @@ -1,7 +1,6 @@ var ResourceLoader = require('resource-loader'), textureParser = require('./textureParser'), spritesheetParser = require('./spritesheetParser'), - spineAtlasParser = require('./spineAtlasParser'), bitmapFontParser = require('./bitmapFontParser'); /** @@ -11,7 +10,7 @@ * ```js * var loader = new PIXI.loader(); * - * loader.add('spineboy',"data/spineboy.json"); + * loader.add('bunny',"data/bunny.png"); * * loader.once('complete',onAssetsLoaded); * @@ -37,9 +36,6 @@ // parse any spritesheet data into multiple textures this.use(spritesheetParser()); - // parse any spine data into a spine object - this.use(spineAtlasParser()); - // parse any spritesheet data into multiple textures this.use(bitmapFontParser()); } diff --git a/package.json b/package.json index ea8f631..785daa2 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,6 @@ "brfs": "^1.4.0", "eventemitter3": "^1.0.1", "object-assign": "^2.0.0", - "pixi-spine": "^1.0.1", "resource-loader": "^1.4.2" }, "devDependencies": { diff --git a/src/core/utils/index.js b/src/core/utils/index.js index 2a454c7..a1a46da 100644 --- a/src/core/utils/index.js +++ b/src/core/utils/index.js @@ -9,6 +9,7 @@ pluginTarget: require('./pluginTarget'), PolyK: require('./PolyK'), + async: require('async'), /** diff --git a/src/index.js b/src/index.js index 0c4b3d9..8f51010 100644 --- a/src/index.js +++ b/src/index.js @@ -9,7 +9,6 @@ core.interaction = require('./interaction'); core.loaders = require('./loaders'); core.mesh = require('./mesh'); -core.spine = require('pixi-spine'); core.ticker = require('./ticker'); // export a premade loader instance diff --git a/src/loaders/index.js b/src/loaders/index.js index ec5a4d3..5d513e5 100644 --- a/src/loaders/index.js +++ b/src/loaders/index.js @@ -13,7 +13,7 @@ // parsers bitmapFontParser: require('./bitmapFontParser'), - spineAtlasParser: require('./spineAtlasParser'), spritesheetParser: require('./spritesheetParser'), - textureParser: require('./textureParser') + textureParser: require('./textureParser'), + Resource: require('resource-loader').Resource }; diff --git a/src/loaders/loader.js b/src/loaders/loader.js index 3d96fbf..97aca51 100644 --- a/src/loaders/loader.js +++ b/src/loaders/loader.js @@ -1,7 +1,6 @@ var ResourceLoader = require('resource-loader'), textureParser = require('./textureParser'), spritesheetParser = require('./spritesheetParser'), - spineAtlasParser = require('./spineAtlasParser'), bitmapFontParser = require('./bitmapFontParser'); /** @@ -11,7 +10,7 @@ * ```js * var loader = new PIXI.loader(); * - * loader.add('spineboy',"data/spineboy.json"); + * loader.add('bunny',"data/bunny.png"); * * loader.once('complete',onAssetsLoaded); * @@ -37,9 +36,6 @@ // parse any spritesheet data into multiple textures this.use(spritesheetParser()); - // parse any spine data into a spine object - this.use(spineAtlasParser()); - // parse any spritesheet data into multiple textures this.use(bitmapFontParser()); } diff --git a/src/loaders/spineAtlasParser.js b/src/loaders/spineAtlasParser.js deleted file mode 100644 index 2bf5fdc..0000000 --- a/src/loaders/spineAtlasParser.js +++ /dev/null @@ -1,55 +0,0 @@ -var Resource = require('resource-loader').Resource, - async = require('async'), - spine = require('pixi-spine'); - -module.exports = function () -{ - return function (resource, next) - { - // skip if no data, its not json, or it isn't atlas data - if (!resource.data || !resource.isJson || !resource.data.bones) - { - return next(); - } - - /** - * use a bit of hackery to load the atlas file, here we assume that the .json, .atlas and .png files - * that correspond to the spine file are in the same base URL and that the .json and .atlas files - * have the same name - */ - var atlasPath = resource.url.substr(0, resource.url.lastIndexOf('.')) + '.atlas'; - var atlasOptions = { - crossOrigin: resource.crossOrigin, - xhrType: Resource.XHR_RESPONSE_TYPE.TEXT - }; - var baseUrl = resource.url.substr(0, resource.url.lastIndexOf('/') + 1); - - - this.add(resource.name + '_atlas', atlasPath, atlasOptions, function (res) - { - // create a spine atlas using the loaded text - var spineAtlas = new spine.SpineRuntime.Atlas(this.xhr.responseText, baseUrl, res.crossOrigin); - - // spine animation - var spineJsonParser = new spine.SpineRuntime.SkeletonJsonParser(new spine.SpineRuntime.AtlasAttachmentParser(spineAtlas)); - var skeletonData = spineJsonParser.readSkeletonData(resource.data); - - resource.spineData = skeletonData; - resource.spineAtlas = spineAtlas; - - // Go through each spineAtlas.pages and wait for page.rendererObject (a baseTexture) to - // load. Once all loaded, then call the next function. - async.each(spineAtlas.pages, function (page, done) - { - if (page.rendererObject.hasLoaded) - { - done(); - } - else - { - page.rendererObject.once('loaded', done); - } - }, next); - }); - }; -};