diff --git a/package.json b/package.json index f891a71..832c5f4 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,7 @@ "watchify": "^2.2.1" }, "dependencies": { + "async": "^0.9.0", "resource-loader": "^1.0.0", "webgl-enabled": "^1.0.2" }, diff --git a/package.json b/package.json index f891a71..832c5f4 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,7 @@ "watchify": "^2.2.1" }, "dependencies": { + "async": "^0.9.0", "resource-loader": "^1.0.0", "webgl-enabled": "^1.0.2" }, diff --git a/src/index.js b/src/index.js index 9910c8d..f864027 100644 --- a/src/index.js +++ b/src/index.js @@ -4,6 +4,6 @@ core.extras = require('./extras'); core.filters = require('./filters'); core.interaction = require('./interaction'); -//core.loaders = require('./loaders'); -//core.spine = require('./spine'); +core.loaders = require('./loaders'); +core.spine = require('./spine'); core.text = require('./text'); diff --git a/package.json b/package.json index f891a71..832c5f4 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,7 @@ "watchify": "^2.2.1" }, "dependencies": { + "async": "^0.9.0", "resource-loader": "^1.0.0", "webgl-enabled": "^1.0.2" }, diff --git a/src/index.js b/src/index.js index 9910c8d..f864027 100644 --- a/src/index.js +++ b/src/index.js @@ -4,6 +4,6 @@ core.extras = require('./extras'); core.filters = require('./filters'); core.interaction = require('./interaction'); -//core.loaders = require('./loaders'); -//core.spine = require('./spine'); +core.loaders = require('./loaders'); +core.spine = require('./spine'); core.text = require('./text'); diff --git a/src/loaders/bitmapFontParser.js b/src/loaders/bitmapFontParser.js index 6320ae4..d12425e 100644 --- a/src/loaders/bitmapFontParser.js +++ b/src/loaders/bitmapFontParser.js @@ -1,4 +1,4 @@ -var Resource = require('asset-loader').Resource, +var Resource = require('resource-loader').Resource, core = require('../core'); module.exports = function () diff --git a/package.json b/package.json index f891a71..832c5f4 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,7 @@ "watchify": "^2.2.1" }, "dependencies": { + "async": "^0.9.0", "resource-loader": "^1.0.0", "webgl-enabled": "^1.0.2" }, diff --git a/src/index.js b/src/index.js index 9910c8d..f864027 100644 --- a/src/index.js +++ b/src/index.js @@ -4,6 +4,6 @@ core.extras = require('./extras'); core.filters = require('./filters'); core.interaction = require('./interaction'); -//core.loaders = require('./loaders'); -//core.spine = require('./spine'); +core.loaders = require('./loaders'); +core.spine = require('./spine'); core.text = require('./text'); diff --git a/src/loaders/bitmapFontParser.js b/src/loaders/bitmapFontParser.js index 6320ae4..d12425e 100644 --- a/src/loaders/bitmapFontParser.js +++ b/src/loaders/bitmapFontParser.js @@ -1,4 +1,4 @@ -var Resource = require('asset-loader').Resource, +var Resource = require('resource-loader').Resource, core = require('../core'); module.exports = function () diff --git a/src/loaders/index.js b/src/loaders/index.js index c269ffb..a3a8db4 100644 --- a/src/loaders/index.js +++ b/src/loaders/index.js @@ -9,11 +9,12 @@ * @namespace PIXI */ module.exports = { - Loader: require('asset-loader'), + Loader: require('resource-loader'), loader: require('./loader'), // parsers - textureParser: require('./textureParser'), + bitmapFontParser: require('./bitmapFontParser'), + spineAtlasParser: require('./spineAtlasParser'), spritesheetParser: require('./spritesheetParser'), - spineAtlasParser: require('./spineAtlasParser') + textureParser: require('./textureParser') }; diff --git a/package.json b/package.json index f891a71..832c5f4 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,7 @@ "watchify": "^2.2.1" }, "dependencies": { + "async": "^0.9.0", "resource-loader": "^1.0.0", "webgl-enabled": "^1.0.2" }, diff --git a/src/index.js b/src/index.js index 9910c8d..f864027 100644 --- a/src/index.js +++ b/src/index.js @@ -4,6 +4,6 @@ core.extras = require('./extras'); core.filters = require('./filters'); core.interaction = require('./interaction'); -//core.loaders = require('./loaders'); -//core.spine = require('./spine'); +core.loaders = require('./loaders'); +core.spine = require('./spine'); core.text = require('./text'); diff --git a/src/loaders/bitmapFontParser.js b/src/loaders/bitmapFontParser.js index 6320ae4..d12425e 100644 --- a/src/loaders/bitmapFontParser.js +++ b/src/loaders/bitmapFontParser.js @@ -1,4 +1,4 @@ -var Resource = require('asset-loader').Resource, +var Resource = require('resource-loader').Resource, core = require('../core'); module.exports = function () diff --git a/src/loaders/index.js b/src/loaders/index.js index c269ffb..a3a8db4 100644 --- a/src/loaders/index.js +++ b/src/loaders/index.js @@ -9,11 +9,12 @@ * @namespace PIXI */ module.exports = { - Loader: require('asset-loader'), + Loader: require('resource-loader'), loader: require('./loader'), // parsers - textureParser: require('./textureParser'), + bitmapFontParser: require('./bitmapFontParser'), + spineAtlasParser: require('./spineAtlasParser'), spritesheetParser: require('./spritesheetParser'), - spineAtlasParser: require('./spineAtlasParser') + textureParser: require('./textureParser') }; diff --git a/src/loaders/spineAtlasParser.js b/src/loaders/spineAtlasParser.js index ce636c8..3083c4a 100644 --- a/src/loaders/spineAtlasParser.js +++ b/src/loaders/spineAtlasParser.js @@ -1,4 +1,4 @@ -var Resource = require('asset-loader').Resource, +var Resource = require('resource-loader').Resource, async = require('async'), spine = require('../spine'); diff --git a/package.json b/package.json index f891a71..832c5f4 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,7 @@ "watchify": "^2.2.1" }, "dependencies": { + "async": "^0.9.0", "resource-loader": "^1.0.0", "webgl-enabled": "^1.0.2" }, diff --git a/src/index.js b/src/index.js index 9910c8d..f864027 100644 --- a/src/index.js +++ b/src/index.js @@ -4,6 +4,6 @@ core.extras = require('./extras'); core.filters = require('./filters'); core.interaction = require('./interaction'); -//core.loaders = require('./loaders'); -//core.spine = require('./spine'); +core.loaders = require('./loaders'); +core.spine = require('./spine'); core.text = require('./text'); diff --git a/src/loaders/bitmapFontParser.js b/src/loaders/bitmapFontParser.js index 6320ae4..d12425e 100644 --- a/src/loaders/bitmapFontParser.js +++ b/src/loaders/bitmapFontParser.js @@ -1,4 +1,4 @@ -var Resource = require('asset-loader').Resource, +var Resource = require('resource-loader').Resource, core = require('../core'); module.exports = function () diff --git a/src/loaders/index.js b/src/loaders/index.js index c269ffb..a3a8db4 100644 --- a/src/loaders/index.js +++ b/src/loaders/index.js @@ -9,11 +9,12 @@ * @namespace PIXI */ module.exports = { - Loader: require('asset-loader'), + Loader: require('resource-loader'), loader: require('./loader'), // parsers - textureParser: require('./textureParser'), + bitmapFontParser: require('./bitmapFontParser'), + spineAtlasParser: require('./spineAtlasParser'), spritesheetParser: require('./spritesheetParser'), - spineAtlasParser: require('./spineAtlasParser') + textureParser: require('./textureParser') }; diff --git a/src/loaders/spineAtlasParser.js b/src/loaders/spineAtlasParser.js index ce636c8..3083c4a 100644 --- a/src/loaders/spineAtlasParser.js +++ b/src/loaders/spineAtlasParser.js @@ -1,4 +1,4 @@ -var Resource = require('asset-loader').Resource, +var Resource = require('resource-loader').Resource, async = require('async'), spine = require('../spine'); diff --git a/src/loaders/spritesheetParser.js b/src/loaders/spritesheetParser.js index 934e1d7..2d778b7 100644 --- a/src/loaders/spritesheetParser.js +++ b/src/loaders/spritesheetParser.js @@ -1,4 +1,4 @@ -var Resource = require('asset-loader').Resource, +var Resource = require('resource-loader').Resource, core = require('../core'); module.exports = function ()