diff --git a/src/core/index.js b/src/core/index.js index 21c817a..b67c15a 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -86,6 +86,10 @@ { window.console.warn("You don't need to use a PIXI Stage any more, you can simply render any container"); return new core.Container(); + }, + + SpriteBatch: function () { + window.console.warn("SpriteBatch doesn't exist any more, please use the new ParticleContainer instead"); } }; diff --git a/src/core/index.js b/src/core/index.js index 21c817a..b67c15a 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -86,6 +86,10 @@ { window.console.warn("You don't need to use a PIXI Stage any more, you can simply render any container"); return new core.Container(); + }, + + SpriteBatch: function () { + window.console.warn("SpriteBatch doesn't exist any more, please use the new ParticleContainer instead"); } }; diff --git a/src/core/particles/ParticleContainer.js b/src/core/particles/ParticleContainer.js index 5d52916..823fc78 100644 --- a/src/core/particles/ParticleContainer.js +++ b/src/core/particles/ParticleContainer.js @@ -25,6 +25,7 @@ * @memberof PIXI * * @param size {number} The number of images in the SpriteBatch before it flushes. + * @param properties {object} The properties to be uploaded */ function ParticleContainer(size, properties) { @@ -32,11 +33,41 @@ // set properties to be dynamic (true) / static (false) // TODO this could be easier to understand! + /* this._properties = { + scale : false, + position : true, + rotation : false, + uvs : false, + alpha : false + * } + */ + /** + * @member {object} + * @private + */ this._properties = properties || [false, true, false, false, false]; + /** + * @member {number} + * @private + */ this._size = size || 15000; + + /** + * @member {WebGLBuffer} + * @private + */ this._buffers = null; + + /** + * @member {boolean} + * @private + */ this._updateStatic = false; + /** + * @member {boolean} + * + */ this.interactiveChildren = false; } diff --git a/src/core/index.js b/src/core/index.js index 21c817a..b67c15a 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -86,6 +86,10 @@ { window.console.warn("You don't need to use a PIXI Stage any more, you can simply render any container"); return new core.Container(); + }, + + SpriteBatch: function () { + window.console.warn("SpriteBatch doesn't exist any more, please use the new ParticleContainer instead"); } }; diff --git a/src/core/particles/ParticleContainer.js b/src/core/particles/ParticleContainer.js index 5d52916..823fc78 100644 --- a/src/core/particles/ParticleContainer.js +++ b/src/core/particles/ParticleContainer.js @@ -25,6 +25,7 @@ * @memberof PIXI * * @param size {number} The number of images in the SpriteBatch before it flushes. + * @param properties {object} The properties to be uploaded */ function ParticleContainer(size, properties) { @@ -32,11 +33,41 @@ // set properties to be dynamic (true) / static (false) // TODO this could be easier to understand! + /* this._properties = { + scale : false, + position : true, + rotation : false, + uvs : false, + alpha : false + * } + */ + /** + * @member {object} + * @private + */ this._properties = properties || [false, true, false, false, false]; + /** + * @member {number} + * @private + */ this._size = size || 15000; + + /** + * @member {WebGLBuffer} + * @private + */ this._buffers = null; + + /** + * @member {boolean} + * @private + */ this._updateStatic = false; + /** + * @member {boolean} + * + */ this.interactiveChildren = false; } diff --git a/src/core/particles/webgl/ParticleRenderer.js b/src/core/particles/webgl/ParticleRenderer.js index cf40b2f..8b78bc4 100644 --- a/src/core/particles/webgl/ParticleRenderer.js +++ b/src/core/particles/webgl/ParticleRenderer.js @@ -97,7 +97,7 @@ this.properties = [ - //verticiesData + //verticesData { attribute:this.shader.attributes.aVertexPosition, dynamic:false, diff --git a/src/core/index.js b/src/core/index.js index 21c817a..b67c15a 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -86,6 +86,10 @@ { window.console.warn("You don't need to use a PIXI Stage any more, you can simply render any container"); return new core.Container(); + }, + + SpriteBatch: function () { + window.console.warn("SpriteBatch doesn't exist any more, please use the new ParticleContainer instead"); } }; diff --git a/src/core/particles/ParticleContainer.js b/src/core/particles/ParticleContainer.js index 5d52916..823fc78 100644 --- a/src/core/particles/ParticleContainer.js +++ b/src/core/particles/ParticleContainer.js @@ -25,6 +25,7 @@ * @memberof PIXI * * @param size {number} The number of images in the SpriteBatch before it flushes. + * @param properties {object} The properties to be uploaded */ function ParticleContainer(size, properties) { @@ -32,11 +33,41 @@ // set properties to be dynamic (true) / static (false) // TODO this could be easier to understand! + /* this._properties = { + scale : false, + position : true, + rotation : false, + uvs : false, + alpha : false + * } + */ + /** + * @member {object} + * @private + */ this._properties = properties || [false, true, false, false, false]; + /** + * @member {number} + * @private + */ this._size = size || 15000; + + /** + * @member {WebGLBuffer} + * @private + */ this._buffers = null; + + /** + * @member {boolean} + * @private + */ this._updateStatic = false; + /** + * @member {boolean} + * + */ this.interactiveChildren = false; } diff --git a/src/core/particles/webgl/ParticleRenderer.js b/src/core/particles/webgl/ParticleRenderer.js index cf40b2f..8b78bc4 100644 --- a/src/core/particles/webgl/ParticleRenderer.js +++ b/src/core/particles/webgl/ParticleRenderer.js @@ -97,7 +97,7 @@ this.properties = [ - //verticiesData + //verticesData { attribute:this.shader.attributes.aVertexPosition, dynamic:false, diff --git a/src/extras/TilingSprite.js b/src/extras/TilingSprite.js index 087bfb9..804199d 100644 --- a/src/extras/TilingSprite.js +++ b/src/extras/TilingSprite.js @@ -520,5 +520,5 @@ */ TilingSprite.fromImage = function (imageId, width, height, crossorigin, scaleMode) { - return new Sprite(Texture.fromImage(imageId, crossorigin, scaleMode)); + return new TilingSprite(Texture.fromImage(imageId, crossorigin, scaleMode),width,height); }; \ No newline at end of file diff --git a/src/core/index.js b/src/core/index.js index 21c817a..b67c15a 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -86,6 +86,10 @@ { window.console.warn("You don't need to use a PIXI Stage any more, you can simply render any container"); return new core.Container(); + }, + + SpriteBatch: function () { + window.console.warn("SpriteBatch doesn't exist any more, please use the new ParticleContainer instead"); } }; diff --git a/src/core/particles/ParticleContainer.js b/src/core/particles/ParticleContainer.js index 5d52916..823fc78 100644 --- a/src/core/particles/ParticleContainer.js +++ b/src/core/particles/ParticleContainer.js @@ -25,6 +25,7 @@ * @memberof PIXI * * @param size {number} The number of images in the SpriteBatch before it flushes. + * @param properties {object} The properties to be uploaded */ function ParticleContainer(size, properties) { @@ -32,11 +33,41 @@ // set properties to be dynamic (true) / static (false) // TODO this could be easier to understand! + /* this._properties = { + scale : false, + position : true, + rotation : false, + uvs : false, + alpha : false + * } + */ + /** + * @member {object} + * @private + */ this._properties = properties || [false, true, false, false, false]; + /** + * @member {number} + * @private + */ this._size = size || 15000; + + /** + * @member {WebGLBuffer} + * @private + */ this._buffers = null; + + /** + * @member {boolean} + * @private + */ this._updateStatic = false; + /** + * @member {boolean} + * + */ this.interactiveChildren = false; } diff --git a/src/core/particles/webgl/ParticleRenderer.js b/src/core/particles/webgl/ParticleRenderer.js index cf40b2f..8b78bc4 100644 --- a/src/core/particles/webgl/ParticleRenderer.js +++ b/src/core/particles/webgl/ParticleRenderer.js @@ -97,7 +97,7 @@ this.properties = [ - //verticiesData + //verticesData { attribute:this.shader.attributes.aVertexPosition, dynamic:false, diff --git a/src/extras/TilingSprite.js b/src/extras/TilingSprite.js index 087bfb9..804199d 100644 --- a/src/extras/TilingSprite.js +++ b/src/extras/TilingSprite.js @@ -520,5 +520,5 @@ */ TilingSprite.fromImage = function (imageId, width, height, crossorigin, scaleMode) { - return new Sprite(Texture.fromImage(imageId, crossorigin, scaleMode)); + return new TilingSprite(Texture.fromImage(imageId, crossorigin, scaleMode),width,height); }; \ No newline at end of file diff --git a/src/loaders/spineAtlasParser.js b/src/loaders/spineAtlasParser.js index ec0f60d..2a42091 100644 --- a/src/loaders/spineAtlasParser.js +++ b/src/loaders/spineAtlasParser.js @@ -19,17 +19,19 @@ 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.Atlas(this.ajaxRequest.responseText, this.baseUrl, res.crossOrigin); + var spineAtlas = new spine.SpineRuntime.Atlas(this.xhr.responseText, baseUrl, res.crossOrigin); // spine animation - var spineJsonParser = new spine.SkeletonJsonParser(new spine.AtlasAttachmentParser(spineAtlas)); + var spineJsonParser = new spine.SpineRuntime.SkeletonJsonParser(new spine.SpineRuntime.AtlasAttachmentParser(spineAtlas)); var skeletonData = spineJsonParser.readSkeletonData(resource.data); - resource.spine = skeletonData; + resource.spineData = skeletonData; resource.spineAtlas = spineAtlas; // Go through each spineAtlas.pages and wait for page.rendererObject (a baseTexture) to diff --git a/src/core/index.js b/src/core/index.js index 21c817a..b67c15a 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -86,6 +86,10 @@ { window.console.warn("You don't need to use a PIXI Stage any more, you can simply render any container"); return new core.Container(); + }, + + SpriteBatch: function () { + window.console.warn("SpriteBatch doesn't exist any more, please use the new ParticleContainer instead"); } }; diff --git a/src/core/particles/ParticleContainer.js b/src/core/particles/ParticleContainer.js index 5d52916..823fc78 100644 --- a/src/core/particles/ParticleContainer.js +++ b/src/core/particles/ParticleContainer.js @@ -25,6 +25,7 @@ * @memberof PIXI * * @param size {number} The number of images in the SpriteBatch before it flushes. + * @param properties {object} The properties to be uploaded */ function ParticleContainer(size, properties) { @@ -32,11 +33,41 @@ // set properties to be dynamic (true) / static (false) // TODO this could be easier to understand! + /* this._properties = { + scale : false, + position : true, + rotation : false, + uvs : false, + alpha : false + * } + */ + /** + * @member {object} + * @private + */ this._properties = properties || [false, true, false, false, false]; + /** + * @member {number} + * @private + */ this._size = size || 15000; + + /** + * @member {WebGLBuffer} + * @private + */ this._buffers = null; + + /** + * @member {boolean} + * @private + */ this._updateStatic = false; + /** + * @member {boolean} + * + */ this.interactiveChildren = false; } diff --git a/src/core/particles/webgl/ParticleRenderer.js b/src/core/particles/webgl/ParticleRenderer.js index cf40b2f..8b78bc4 100644 --- a/src/core/particles/webgl/ParticleRenderer.js +++ b/src/core/particles/webgl/ParticleRenderer.js @@ -97,7 +97,7 @@ this.properties = [ - //verticiesData + //verticesData { attribute:this.shader.attributes.aVertexPosition, dynamic:false, diff --git a/src/extras/TilingSprite.js b/src/extras/TilingSprite.js index 087bfb9..804199d 100644 --- a/src/extras/TilingSprite.js +++ b/src/extras/TilingSprite.js @@ -520,5 +520,5 @@ */ TilingSprite.fromImage = function (imageId, width, height, crossorigin, scaleMode) { - return new Sprite(Texture.fromImage(imageId, crossorigin, scaleMode)); + return new TilingSprite(Texture.fromImage(imageId, crossorigin, scaleMode),width,height); }; \ No newline at end of file diff --git a/src/loaders/spineAtlasParser.js b/src/loaders/spineAtlasParser.js index ec0f60d..2a42091 100644 --- a/src/loaders/spineAtlasParser.js +++ b/src/loaders/spineAtlasParser.js @@ -19,17 +19,19 @@ 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.Atlas(this.ajaxRequest.responseText, this.baseUrl, res.crossOrigin); + var spineAtlas = new spine.SpineRuntime.Atlas(this.xhr.responseText, baseUrl, res.crossOrigin); // spine animation - var spineJsonParser = new spine.SkeletonJsonParser(new spine.AtlasAttachmentParser(spineAtlas)); + var spineJsonParser = new spine.SpineRuntime.SkeletonJsonParser(new spine.SpineRuntime.AtlasAttachmentParser(spineAtlas)); var skeletonData = spineJsonParser.readSkeletonData(resource.data); - resource.spine = skeletonData; + resource.spineData = skeletonData; resource.spineAtlas = spineAtlas; // Go through each spineAtlas.pages and wait for page.rendererObject (a baseTexture) to diff --git a/src/spine/index.js b/src/spine/index.js index 838d6aa..f48c6c6 100644 --- a/src/spine/index.js +++ b/src/spine/index.js @@ -10,5 +10,5 @@ */ module.exports = { Spine: require('./Spine'), - runtime: require('./SpineRuntime') + SpineRuntime: require('./SpineRuntime') };