diff --git a/package.json b/package.json index e4bc1c6..51445c5 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ }, "dependencies": { "async": "^0.9.0", - "resource-loader": "^1.1.1", + "resource-loader": "^1.1.2", "webgl-enabled": "^1.0.2" }, "browserify": { diff --git a/package.json b/package.json index e4bc1c6..51445c5 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ }, "dependencies": { "async": "^0.9.0", - "resource-loader": "^1.1.1", + "resource-loader": "^1.1.2", "webgl-enabled": "^1.0.2" }, "browserify": { diff --git a/src/loaders/bitmapFontParser.js b/src/loaders/bitmapFontParser.js index 8c1fa35..0ee5702 100644 --- a/src/loaders/bitmapFontParser.js +++ b/src/loaders/bitmapFontParser.js @@ -35,7 +35,7 @@ }; // load the texture for the font - this.loadResource(new Resource(resource.name + '_image', textureUrl, loadOptions), function (res) + this.add(resource.name + '_image', textureUrl, loadOptions, function (res) { var data = {}; var info = resource.data.getElementsByTagName('info')[0]; diff --git a/package.json b/package.json index e4bc1c6..51445c5 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ }, "dependencies": { "async": "^0.9.0", - "resource-loader": "^1.1.1", + "resource-loader": "^1.1.2", "webgl-enabled": "^1.0.2" }, "browserify": { diff --git a/src/loaders/bitmapFontParser.js b/src/loaders/bitmapFontParser.js index 8c1fa35..0ee5702 100644 --- a/src/loaders/bitmapFontParser.js +++ b/src/loaders/bitmapFontParser.js @@ -35,7 +35,7 @@ }; // load the texture for the font - this.loadResource(new Resource(resource.name + '_image', textureUrl, loadOptions), function (res) + this.add(resource.name + '_image', textureUrl, loadOptions, function (res) { var data = {}; var info = resource.data.getElementsByTagName('info')[0]; diff --git a/src/loaders/spineAtlasParser.js b/src/loaders/spineAtlasParser.js index b7694cc..ec0f60d 100644 --- a/src/loaders/spineAtlasParser.js +++ b/src/loaders/spineAtlasParser.js @@ -20,7 +20,7 @@ xhrType: Resource.XHR_RESPONSE_TYPE.TEXT }; - this.loadResource(new Resource(resource.name + '_atlas', atlasPath, atlasOptions), function (res) + this.add(resource.name + '_atlas', atlasPath, atlasOptions, function (res) { // create a spine atlas using the loaded text var spineAtlas = new spine.Atlas(this.ajaxRequest.responseText, this.baseUrl, res.crossOrigin); diff --git a/package.json b/package.json index e4bc1c6..51445c5 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ }, "dependencies": { "async": "^0.9.0", - "resource-loader": "^1.1.1", + "resource-loader": "^1.1.2", "webgl-enabled": "^1.0.2" }, "browserify": { diff --git a/src/loaders/bitmapFontParser.js b/src/loaders/bitmapFontParser.js index 8c1fa35..0ee5702 100644 --- a/src/loaders/bitmapFontParser.js +++ b/src/loaders/bitmapFontParser.js @@ -35,7 +35,7 @@ }; // load the texture for the font - this.loadResource(new Resource(resource.name + '_image', textureUrl, loadOptions), function (res) + this.add(resource.name + '_image', textureUrl, loadOptions, function (res) { var data = {}; var info = resource.data.getElementsByTagName('info')[0]; diff --git a/src/loaders/spineAtlasParser.js b/src/loaders/spineAtlasParser.js index b7694cc..ec0f60d 100644 --- a/src/loaders/spineAtlasParser.js +++ b/src/loaders/spineAtlasParser.js @@ -20,7 +20,7 @@ xhrType: Resource.XHR_RESPONSE_TYPE.TEXT }; - this.loadResource(new Resource(resource.name + '_atlas', atlasPath, atlasOptions), function (res) + this.add(resource.name + '_atlas', atlasPath, atlasOptions, function (res) { // create a spine atlas using the loaded text var spineAtlas = new spine.Atlas(this.ajaxRequest.responseText, this.baseUrl, res.crossOrigin); diff --git a/src/loaders/spritesheetParser.js b/src/loaders/spritesheetParser.js index bb1f665..f97a477 100644 --- a/src/loaders/spritesheetParser.js +++ b/src/loaders/spritesheetParser.js @@ -17,7 +17,7 @@ var route = path.dirname(resource.url.replace(this.baseUrl, '')); // load the image for this sheet - this.loadResource(new Resource(resource.name + '_image', this.baseUrl + route + '/' + resource.data.meta.image, loadOptions), function (res) + this.add(resource.name + '_image', this.baseUrl + route + '/' + resource.data.meta.image, loadOptions, function (res) { resource.textures = {};