diff --git a/package.json b/package.json index 51217d5..5a19dc4 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ }, "dependencies": { "async": "^0.9.0", - "resource-loader": "^1.0.0", + "resource-loader": "^1.1.0", "webgl-enabled": "^1.0.2" }, "browserify": { diff --git a/package.json b/package.json index 51217d5..5a19dc4 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ }, "dependencies": { "async": "^0.9.0", - "resource-loader": "^1.0.0", + "resource-loader": "^1.1.0", "webgl-enabled": "^1.0.2" }, "browserify": { diff --git a/src/loaders/bitmapFontParser.js b/src/loaders/bitmapFontParser.js index e3e522f..8c1fa35 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(textureUrl, loadOptions), function (res) + this.loadResource(new Resource(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 51217d5..5a19dc4 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ }, "dependencies": { "async": "^0.9.0", - "resource-loader": "^1.0.0", + "resource-loader": "^1.1.0", "webgl-enabled": "^1.0.2" }, "browserify": { diff --git a/src/loaders/bitmapFontParser.js b/src/loaders/bitmapFontParser.js index e3e522f..8c1fa35 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(textureUrl, loadOptions), function (res) + this.loadResource(new Resource(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 3083c4a..b7694cc 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(atlasPath, atlasOptions), function (res) + this.loadResource(new Resource(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 51217d5..5a19dc4 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ }, "dependencies": { "async": "^0.9.0", - "resource-loader": "^1.0.0", + "resource-loader": "^1.1.0", "webgl-enabled": "^1.0.2" }, "browserify": { diff --git a/src/loaders/bitmapFontParser.js b/src/loaders/bitmapFontParser.js index e3e522f..8c1fa35 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(textureUrl, loadOptions), function (res) + this.loadResource(new Resource(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 3083c4a..b7694cc 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(atlasPath, atlasOptions), function (res) + this.loadResource(new Resource(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 859633a..bb1f665 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(this.baseUrl + route + '/' + resource.data.meta.image, loadOptions), function (res) + this.loadResource(new Resource(resource.name + '_image', this.baseUrl + route + '/' + resource.data.meta.image, loadOptions), function (res) { resource.textures = {}; @@ -53,8 +53,8 @@ resource.textures[i] = new core.Texture(res.texture.baseTexture, size, size.clone(), trim); if (frames[i].rotated) { - resource.textures[i].spritePivot.x = frames[i].pivot.x; - resource.textures[i].spritePivot.y = frames[i].pivot.y; + // resource.textures[i].pivot.x = frames[i].pivot.x; + // resource.textures[i].pivot.y = frames[i].pivot.y; resource.textures[i].rotation = -Math.PI / 2; } }