diff --git a/src/core/graphics/webgl/WebGLGraphicsData.js b/src/core/graphics/webgl/WebGLGraphicsData.js index f93e589..2fdbb48 100644 --- a/src/core/graphics/webgl/WebGLGraphicsData.js +++ b/src/core/graphics/webgl/WebGLGraphicsData.js @@ -2,53 +2,64 @@ * An object containing WebGL specific properties to be used by the WebGL renderer * * @class + * @memberof PIXI * @param gl {WebGLRenderingContext} the current WebGL drawing context * @private */ function WebGLGraphicsData(gl) { - /* - * @member {WebGLRenderingContext} the current WebGL drawing context + /** + * the current WebGL drawing context + * + * @member {WebGLRenderingContext} */ this.gl = gl; //TODO does this need to be split before uploding?? - /* - * @member {Array} An array of color components (r,g,b) + /** + * An array of color components (r,g,b) + * @member {Array} */ this.color = [0,0,0]; // color split! - /* - * @member {Array} An array of points to draw + /** + * An array of points to draw + * @member {Array} */ this.points = []; - /* - * @member {Array} The indices of the vertices + /** + * The indices of the vertices + * @member {Array} */ this.indices = []; - /* - * @member {WebGLBuffer} The main buffer + /** + * The main buffer + * @member {WebGLBuffer} */ this.buffer = gl.createBuffer(); - /* - * @member {WebGLBuffer} The index buffer + /** + * The index buffer + * @member {WebGLBuffer} */ this.indexBuffer = gl.createBuffer(); - /* - * @member {number} todo @alvin + /** + * todo @alvin + * @member {number} */ this.mode = 1; - /* - * @member {number} The alpha of the graphics + /** + * The alpha of the graphics + * @member {number} */ this.alpha = 1; - /* - * @member {boolean} Whether this graphics is dirty or not + /** + * Whether this graphics is dirty or not + * @member {boolean} */ this.dirty = true; } diff --git a/src/core/graphics/webgl/WebGLGraphicsData.js b/src/core/graphics/webgl/WebGLGraphicsData.js index f93e589..2fdbb48 100644 --- a/src/core/graphics/webgl/WebGLGraphicsData.js +++ b/src/core/graphics/webgl/WebGLGraphicsData.js @@ -2,53 +2,64 @@ * An object containing WebGL specific properties to be used by the WebGL renderer * * @class + * @memberof PIXI * @param gl {WebGLRenderingContext} the current WebGL drawing context * @private */ function WebGLGraphicsData(gl) { - /* - * @member {WebGLRenderingContext} the current WebGL drawing context + /** + * the current WebGL drawing context + * + * @member {WebGLRenderingContext} */ this.gl = gl; //TODO does this need to be split before uploding?? - /* - * @member {Array} An array of color components (r,g,b) + /** + * An array of color components (r,g,b) + * @member {Array} */ this.color = [0,0,0]; // color split! - /* - * @member {Array} An array of points to draw + /** + * An array of points to draw + * @member {Array} */ this.points = []; - /* - * @member {Array} The indices of the vertices + /** + * The indices of the vertices + * @member {Array} */ this.indices = []; - /* - * @member {WebGLBuffer} The main buffer + /** + * The main buffer + * @member {WebGLBuffer} */ this.buffer = gl.createBuffer(); - /* - * @member {WebGLBuffer} The index buffer + /** + * The index buffer + * @member {WebGLBuffer} */ this.indexBuffer = gl.createBuffer(); - /* - * @member {number} todo @alvin + /** + * todo @alvin + * @member {number} */ this.mode = 1; - /* - * @member {number} The alpha of the graphics + /** + * The alpha of the graphics + * @member {number} */ this.alpha = 1; - /* - * @member {boolean} Whether this graphics is dirty or not + /** + * Whether this graphics is dirty or not + * @member {boolean} */ this.dirty = true; } diff --git a/src/core/particles/webgl/ParticleBuffer.js b/src/core/particles/webgl/ParticleBuffer.js index 75be710..6fad028 100644 --- a/src/core/particles/webgl/ParticleBuffer.js +++ b/src/core/particles/webgl/ParticleBuffer.js @@ -20,7 +20,8 @@ function ParticleBuffer(gl, properties, size) { /** - * @member {WebGLRenderingContext} the current WebGL drawing context + * the current WebGL drawing context + * @member {WebGLRenderingContext} */ this.gl = gl; diff --git a/src/core/graphics/webgl/WebGLGraphicsData.js b/src/core/graphics/webgl/WebGLGraphicsData.js index f93e589..2fdbb48 100644 --- a/src/core/graphics/webgl/WebGLGraphicsData.js +++ b/src/core/graphics/webgl/WebGLGraphicsData.js @@ -2,53 +2,64 @@ * An object containing WebGL specific properties to be used by the WebGL renderer * * @class + * @memberof PIXI * @param gl {WebGLRenderingContext} the current WebGL drawing context * @private */ function WebGLGraphicsData(gl) { - /* - * @member {WebGLRenderingContext} the current WebGL drawing context + /** + * the current WebGL drawing context + * + * @member {WebGLRenderingContext} */ this.gl = gl; //TODO does this need to be split before uploding?? - /* - * @member {Array} An array of color components (r,g,b) + /** + * An array of color components (r,g,b) + * @member {Array} */ this.color = [0,0,0]; // color split! - /* - * @member {Array} An array of points to draw + /** + * An array of points to draw + * @member {Array} */ this.points = []; - /* - * @member {Array} The indices of the vertices + /** + * The indices of the vertices + * @member {Array} */ this.indices = []; - /* - * @member {WebGLBuffer} The main buffer + /** + * The main buffer + * @member {WebGLBuffer} */ this.buffer = gl.createBuffer(); - /* - * @member {WebGLBuffer} The index buffer + /** + * The index buffer + * @member {WebGLBuffer} */ this.indexBuffer = gl.createBuffer(); - /* - * @member {number} todo @alvin + /** + * todo @alvin + * @member {number} */ this.mode = 1; - /* - * @member {number} The alpha of the graphics + /** + * The alpha of the graphics + * @member {number} */ this.alpha = 1; - /* - * @member {boolean} Whether this graphics is dirty or not + /** + * Whether this graphics is dirty or not + * @member {boolean} */ this.dirty = true; } diff --git a/src/core/particles/webgl/ParticleBuffer.js b/src/core/particles/webgl/ParticleBuffer.js index 75be710..6fad028 100644 --- a/src/core/particles/webgl/ParticleBuffer.js +++ b/src/core/particles/webgl/ParticleBuffer.js @@ -20,7 +20,8 @@ function ParticleBuffer(gl, properties, size) { /** - * @member {WebGLRenderingContext} the current WebGL drawing context + * the current WebGL drawing context + * @member {WebGLRenderingContext} */ this.gl = gl; diff --git a/src/core/renderers/SystemRenderer.js b/src/core/renderers/SystemRenderer.js index 7390be4..34c8db6 100644 --- a/src/core/renderers/SystemRenderer.js +++ b/src/core/renderers/SystemRenderer.js @@ -151,11 +151,9 @@ this.backgroundColor = options.backgroundColor || this._backgroundColor; // run bg color setter - - /** * This temporary display object used as the parent of the currently being rendered item - * @member DisplayObject + * @member {DisplayObject} * @private */ this._tempDisplayObjectParent = {worldTransform:new math.Matrix(), worldAlpha:1, children:[]}; diff --git a/src/core/graphics/webgl/WebGLGraphicsData.js b/src/core/graphics/webgl/WebGLGraphicsData.js index f93e589..2fdbb48 100644 --- a/src/core/graphics/webgl/WebGLGraphicsData.js +++ b/src/core/graphics/webgl/WebGLGraphicsData.js @@ -2,53 +2,64 @@ * An object containing WebGL specific properties to be used by the WebGL renderer * * @class + * @memberof PIXI * @param gl {WebGLRenderingContext} the current WebGL drawing context * @private */ function WebGLGraphicsData(gl) { - /* - * @member {WebGLRenderingContext} the current WebGL drawing context + /** + * the current WebGL drawing context + * + * @member {WebGLRenderingContext} */ this.gl = gl; //TODO does this need to be split before uploding?? - /* - * @member {Array} An array of color components (r,g,b) + /** + * An array of color components (r,g,b) + * @member {Array} */ this.color = [0,0,0]; // color split! - /* - * @member {Array} An array of points to draw + /** + * An array of points to draw + * @member {Array} */ this.points = []; - /* - * @member {Array} The indices of the vertices + /** + * The indices of the vertices + * @member {Array} */ this.indices = []; - /* - * @member {WebGLBuffer} The main buffer + /** + * The main buffer + * @member {WebGLBuffer} */ this.buffer = gl.createBuffer(); - /* - * @member {WebGLBuffer} The index buffer + /** + * The index buffer + * @member {WebGLBuffer} */ this.indexBuffer = gl.createBuffer(); - /* - * @member {number} todo @alvin + /** + * todo @alvin + * @member {number} */ this.mode = 1; - /* - * @member {number} The alpha of the graphics + /** + * The alpha of the graphics + * @member {number} */ this.alpha = 1; - /* - * @member {boolean} Whether this graphics is dirty or not + /** + * Whether this graphics is dirty or not + * @member {boolean} */ this.dirty = true; } diff --git a/src/core/particles/webgl/ParticleBuffer.js b/src/core/particles/webgl/ParticleBuffer.js index 75be710..6fad028 100644 --- a/src/core/particles/webgl/ParticleBuffer.js +++ b/src/core/particles/webgl/ParticleBuffer.js @@ -20,7 +20,8 @@ function ParticleBuffer(gl, properties, size) { /** - * @member {WebGLRenderingContext} the current WebGL drawing context + * the current WebGL drawing context + * @member {WebGLRenderingContext} */ this.gl = gl; diff --git a/src/core/renderers/SystemRenderer.js b/src/core/renderers/SystemRenderer.js index 7390be4..34c8db6 100644 --- a/src/core/renderers/SystemRenderer.js +++ b/src/core/renderers/SystemRenderer.js @@ -151,11 +151,9 @@ this.backgroundColor = options.backgroundColor || this._backgroundColor; // run bg color setter - - /** * This temporary display object used as the parent of the currently being rendered item - * @member DisplayObject + * @member {DisplayObject} * @private */ this._tempDisplayObjectParent = {worldTransform:new math.Matrix(), worldAlpha:1, children:[]}; diff --git a/src/core/renderers/canvas/CanvasRenderer.js b/src/core/renderers/canvas/CanvasRenderer.js index 389ae5e..8d6c465 100644 --- a/src/core/renderers/canvas/CanvasRenderer.js +++ b/src/core/renderers/canvas/CanvasRenderer.js @@ -105,7 +105,7 @@ /** * This temporary display object used as the parent of the currently being rendered item * - * @member DisplayObject + * @member {DisplayObject} * @private */ this._tempDisplayObjectParent = { diff --git a/src/core/graphics/webgl/WebGLGraphicsData.js b/src/core/graphics/webgl/WebGLGraphicsData.js index f93e589..2fdbb48 100644 --- a/src/core/graphics/webgl/WebGLGraphicsData.js +++ b/src/core/graphics/webgl/WebGLGraphicsData.js @@ -2,53 +2,64 @@ * An object containing WebGL specific properties to be used by the WebGL renderer * * @class + * @memberof PIXI * @param gl {WebGLRenderingContext} the current WebGL drawing context * @private */ function WebGLGraphicsData(gl) { - /* - * @member {WebGLRenderingContext} the current WebGL drawing context + /** + * the current WebGL drawing context + * + * @member {WebGLRenderingContext} */ this.gl = gl; //TODO does this need to be split before uploding?? - /* - * @member {Array} An array of color components (r,g,b) + /** + * An array of color components (r,g,b) + * @member {Array} */ this.color = [0,0,0]; // color split! - /* - * @member {Array} An array of points to draw + /** + * An array of points to draw + * @member {Array} */ this.points = []; - /* - * @member {Array} The indices of the vertices + /** + * The indices of the vertices + * @member {Array} */ this.indices = []; - /* - * @member {WebGLBuffer} The main buffer + /** + * The main buffer + * @member {WebGLBuffer} */ this.buffer = gl.createBuffer(); - /* - * @member {WebGLBuffer} The index buffer + /** + * The index buffer + * @member {WebGLBuffer} */ this.indexBuffer = gl.createBuffer(); - /* - * @member {number} todo @alvin + /** + * todo @alvin + * @member {number} */ this.mode = 1; - /* - * @member {number} The alpha of the graphics + /** + * The alpha of the graphics + * @member {number} */ this.alpha = 1; - /* - * @member {boolean} Whether this graphics is dirty or not + /** + * Whether this graphics is dirty or not + * @member {boolean} */ this.dirty = true; } diff --git a/src/core/particles/webgl/ParticleBuffer.js b/src/core/particles/webgl/ParticleBuffer.js index 75be710..6fad028 100644 --- a/src/core/particles/webgl/ParticleBuffer.js +++ b/src/core/particles/webgl/ParticleBuffer.js @@ -20,7 +20,8 @@ function ParticleBuffer(gl, properties, size) { /** - * @member {WebGLRenderingContext} the current WebGL drawing context + * the current WebGL drawing context + * @member {WebGLRenderingContext} */ this.gl = gl; diff --git a/src/core/renderers/SystemRenderer.js b/src/core/renderers/SystemRenderer.js index 7390be4..34c8db6 100644 --- a/src/core/renderers/SystemRenderer.js +++ b/src/core/renderers/SystemRenderer.js @@ -151,11 +151,9 @@ this.backgroundColor = options.backgroundColor || this._backgroundColor; // run bg color setter - - /** * This temporary display object used as the parent of the currently being rendered item - * @member DisplayObject + * @member {DisplayObject} * @private */ this._tempDisplayObjectParent = {worldTransform:new math.Matrix(), worldAlpha:1, children:[]}; diff --git a/src/core/renderers/canvas/CanvasRenderer.js b/src/core/renderers/canvas/CanvasRenderer.js index 389ae5e..8d6c465 100644 --- a/src/core/renderers/canvas/CanvasRenderer.js +++ b/src/core/renderers/canvas/CanvasRenderer.js @@ -105,7 +105,7 @@ /** * This temporary display object used as the parent of the currently being rendered item * - * @member DisplayObject + * @member {DisplayObject} * @private */ this._tempDisplayObjectParent = { diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index 6bfb6de..132618a 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -140,8 +140,8 @@ this.currentRenderTarget = this.renderTarget; /** - * - * @member {ObjectRenderer} @alvin + * object renderer @alvin + * @member {ObjectRenderer} */ this.currentRenderer = new ObjectRenderer(this); @@ -155,7 +155,7 @@ /** * An array of render targets - * @member {Array} TODO @alvin + * @member {Array} * @private */ this._renderTargetStack = []; diff --git a/src/core/graphics/webgl/WebGLGraphicsData.js b/src/core/graphics/webgl/WebGLGraphicsData.js index f93e589..2fdbb48 100644 --- a/src/core/graphics/webgl/WebGLGraphicsData.js +++ b/src/core/graphics/webgl/WebGLGraphicsData.js @@ -2,53 +2,64 @@ * An object containing WebGL specific properties to be used by the WebGL renderer * * @class + * @memberof PIXI * @param gl {WebGLRenderingContext} the current WebGL drawing context * @private */ function WebGLGraphicsData(gl) { - /* - * @member {WebGLRenderingContext} the current WebGL drawing context + /** + * the current WebGL drawing context + * + * @member {WebGLRenderingContext} */ this.gl = gl; //TODO does this need to be split before uploding?? - /* - * @member {Array} An array of color components (r,g,b) + /** + * An array of color components (r,g,b) + * @member {Array} */ this.color = [0,0,0]; // color split! - /* - * @member {Array} An array of points to draw + /** + * An array of points to draw + * @member {Array} */ this.points = []; - /* - * @member {Array} The indices of the vertices + /** + * The indices of the vertices + * @member {Array} */ this.indices = []; - /* - * @member {WebGLBuffer} The main buffer + /** + * The main buffer + * @member {WebGLBuffer} */ this.buffer = gl.createBuffer(); - /* - * @member {WebGLBuffer} The index buffer + /** + * The index buffer + * @member {WebGLBuffer} */ this.indexBuffer = gl.createBuffer(); - /* - * @member {number} todo @alvin + /** + * todo @alvin + * @member {number} */ this.mode = 1; - /* - * @member {number} The alpha of the graphics + /** + * The alpha of the graphics + * @member {number} */ this.alpha = 1; - /* - * @member {boolean} Whether this graphics is dirty or not + /** + * Whether this graphics is dirty or not + * @member {boolean} */ this.dirty = true; } diff --git a/src/core/particles/webgl/ParticleBuffer.js b/src/core/particles/webgl/ParticleBuffer.js index 75be710..6fad028 100644 --- a/src/core/particles/webgl/ParticleBuffer.js +++ b/src/core/particles/webgl/ParticleBuffer.js @@ -20,7 +20,8 @@ function ParticleBuffer(gl, properties, size) { /** - * @member {WebGLRenderingContext} the current WebGL drawing context + * the current WebGL drawing context + * @member {WebGLRenderingContext} */ this.gl = gl; diff --git a/src/core/renderers/SystemRenderer.js b/src/core/renderers/SystemRenderer.js index 7390be4..34c8db6 100644 --- a/src/core/renderers/SystemRenderer.js +++ b/src/core/renderers/SystemRenderer.js @@ -151,11 +151,9 @@ this.backgroundColor = options.backgroundColor || this._backgroundColor; // run bg color setter - - /** * This temporary display object used as the parent of the currently being rendered item - * @member DisplayObject + * @member {DisplayObject} * @private */ this._tempDisplayObjectParent = {worldTransform:new math.Matrix(), worldAlpha:1, children:[]}; diff --git a/src/core/renderers/canvas/CanvasRenderer.js b/src/core/renderers/canvas/CanvasRenderer.js index 389ae5e..8d6c465 100644 --- a/src/core/renderers/canvas/CanvasRenderer.js +++ b/src/core/renderers/canvas/CanvasRenderer.js @@ -105,7 +105,7 @@ /** * This temporary display object used as the parent of the currently being rendered item * - * @member DisplayObject + * @member {DisplayObject} * @private */ this._tempDisplayObjectParent = { diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index 6bfb6de..132618a 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -140,8 +140,8 @@ this.currentRenderTarget = this.renderTarget; /** - * - * @member {ObjectRenderer} @alvin + * object renderer @alvin + * @member {ObjectRenderer} */ this.currentRenderer = new ObjectRenderer(this); @@ -155,7 +155,7 @@ /** * An array of render targets - * @member {Array} TODO @alvin + * @member {Array} * @private */ this._renderTargetStack = []; diff --git a/src/core/renderers/webgl/shaders/Shader.js b/src/core/renderers/webgl/shaders/Shader.js index 20079d7..16e6af8 100644 --- a/src/core/renderers/webgl/shaders/Shader.js +++ b/src/core/renderers/webgl/shaders/Shader.js @@ -18,13 +18,13 @@ } /** - * @member number + * @member {number} * @readonly */ this.uuid = utils.uuid(); /** - * @member WebGLRenderingContext + * @member {WebGLRenderingContext} * @readonly */ this.gl = shaderManager.renderer.gl; @@ -32,7 +32,7 @@ /** * The WebGL program. * - * @member WebGLProgram + * @member {WebGLProgram} * @readonly */ this.program = null; @@ -61,14 +61,14 @@ /** * The vertex shader. * - * @member Array + * @member {Array} */ this.vertexSrc = vertexSrc; /** * The fragment shader. * - * @member Array + * @member {Array} */ this.fragmentSrc = fragmentSrc; diff --git a/src/core/graphics/webgl/WebGLGraphicsData.js b/src/core/graphics/webgl/WebGLGraphicsData.js index f93e589..2fdbb48 100644 --- a/src/core/graphics/webgl/WebGLGraphicsData.js +++ b/src/core/graphics/webgl/WebGLGraphicsData.js @@ -2,53 +2,64 @@ * An object containing WebGL specific properties to be used by the WebGL renderer * * @class + * @memberof PIXI * @param gl {WebGLRenderingContext} the current WebGL drawing context * @private */ function WebGLGraphicsData(gl) { - /* - * @member {WebGLRenderingContext} the current WebGL drawing context + /** + * the current WebGL drawing context + * + * @member {WebGLRenderingContext} */ this.gl = gl; //TODO does this need to be split before uploding?? - /* - * @member {Array} An array of color components (r,g,b) + /** + * An array of color components (r,g,b) + * @member {Array} */ this.color = [0,0,0]; // color split! - /* - * @member {Array} An array of points to draw + /** + * An array of points to draw + * @member {Array} */ this.points = []; - /* - * @member {Array} The indices of the vertices + /** + * The indices of the vertices + * @member {Array} */ this.indices = []; - /* - * @member {WebGLBuffer} The main buffer + /** + * The main buffer + * @member {WebGLBuffer} */ this.buffer = gl.createBuffer(); - /* - * @member {WebGLBuffer} The index buffer + /** + * The index buffer + * @member {WebGLBuffer} */ this.indexBuffer = gl.createBuffer(); - /* - * @member {number} todo @alvin + /** + * todo @alvin + * @member {number} */ this.mode = 1; - /* - * @member {number} The alpha of the graphics + /** + * The alpha of the graphics + * @member {number} */ this.alpha = 1; - /* - * @member {boolean} Whether this graphics is dirty or not + /** + * Whether this graphics is dirty or not + * @member {boolean} */ this.dirty = true; } diff --git a/src/core/particles/webgl/ParticleBuffer.js b/src/core/particles/webgl/ParticleBuffer.js index 75be710..6fad028 100644 --- a/src/core/particles/webgl/ParticleBuffer.js +++ b/src/core/particles/webgl/ParticleBuffer.js @@ -20,7 +20,8 @@ function ParticleBuffer(gl, properties, size) { /** - * @member {WebGLRenderingContext} the current WebGL drawing context + * the current WebGL drawing context + * @member {WebGLRenderingContext} */ this.gl = gl; diff --git a/src/core/renderers/SystemRenderer.js b/src/core/renderers/SystemRenderer.js index 7390be4..34c8db6 100644 --- a/src/core/renderers/SystemRenderer.js +++ b/src/core/renderers/SystemRenderer.js @@ -151,11 +151,9 @@ this.backgroundColor = options.backgroundColor || this._backgroundColor; // run bg color setter - - /** * This temporary display object used as the parent of the currently being rendered item - * @member DisplayObject + * @member {DisplayObject} * @private */ this._tempDisplayObjectParent = {worldTransform:new math.Matrix(), worldAlpha:1, children:[]}; diff --git a/src/core/renderers/canvas/CanvasRenderer.js b/src/core/renderers/canvas/CanvasRenderer.js index 389ae5e..8d6c465 100644 --- a/src/core/renderers/canvas/CanvasRenderer.js +++ b/src/core/renderers/canvas/CanvasRenderer.js @@ -105,7 +105,7 @@ /** * This temporary display object used as the parent of the currently being rendered item * - * @member DisplayObject + * @member {DisplayObject} * @private */ this._tempDisplayObjectParent = { diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index 6bfb6de..132618a 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -140,8 +140,8 @@ this.currentRenderTarget = this.renderTarget; /** - * - * @member {ObjectRenderer} @alvin + * object renderer @alvin + * @member {ObjectRenderer} */ this.currentRenderer = new ObjectRenderer(this); @@ -155,7 +155,7 @@ /** * An array of render targets - * @member {Array} TODO @alvin + * @member {Array} * @private */ this._renderTargetStack = []; diff --git a/src/core/renderers/webgl/shaders/Shader.js b/src/core/renderers/webgl/shaders/Shader.js index 20079d7..16e6af8 100644 --- a/src/core/renderers/webgl/shaders/Shader.js +++ b/src/core/renderers/webgl/shaders/Shader.js @@ -18,13 +18,13 @@ } /** - * @member number + * @member {number} * @readonly */ this.uuid = utils.uuid(); /** - * @member WebGLRenderingContext + * @member {WebGLRenderingContext} * @readonly */ this.gl = shaderManager.renderer.gl; @@ -32,7 +32,7 @@ /** * The WebGL program. * - * @member WebGLProgram + * @member {WebGLProgram} * @readonly */ this.program = null; @@ -61,14 +61,14 @@ /** * The vertex shader. * - * @member Array + * @member {Array} */ this.vertexSrc = vertexSrc; /** * The fragment shader. * - * @member Array + * @member {Array} */ this.fragmentSrc = fragmentSrc; diff --git a/src/core/renderers/webgl/utils/Quad.js b/src/core/renderers/webgl/utils/Quad.js index ca49ceb..0c51505 100644 --- a/src/core/renderers/webgl/utils/Quad.js +++ b/src/core/renderers/webgl/utils/Quad.js @@ -7,7 +7,9 @@ function Quad(gl) { /* - * @member {WebGLRenderingContext} the current WebGL drawing context + * the current WebGL drawing context + * + * @member {WebGLRenderingContext} */ this.gl = gl; diff --git a/src/core/graphics/webgl/WebGLGraphicsData.js b/src/core/graphics/webgl/WebGLGraphicsData.js index f93e589..2fdbb48 100644 --- a/src/core/graphics/webgl/WebGLGraphicsData.js +++ b/src/core/graphics/webgl/WebGLGraphicsData.js @@ -2,53 +2,64 @@ * An object containing WebGL specific properties to be used by the WebGL renderer * * @class + * @memberof PIXI * @param gl {WebGLRenderingContext} the current WebGL drawing context * @private */ function WebGLGraphicsData(gl) { - /* - * @member {WebGLRenderingContext} the current WebGL drawing context + /** + * the current WebGL drawing context + * + * @member {WebGLRenderingContext} */ this.gl = gl; //TODO does this need to be split before uploding?? - /* - * @member {Array} An array of color components (r,g,b) + /** + * An array of color components (r,g,b) + * @member {Array} */ this.color = [0,0,0]; // color split! - /* - * @member {Array} An array of points to draw + /** + * An array of points to draw + * @member {Array} */ this.points = []; - /* - * @member {Array} The indices of the vertices + /** + * The indices of the vertices + * @member {Array} */ this.indices = []; - /* - * @member {WebGLBuffer} The main buffer + /** + * The main buffer + * @member {WebGLBuffer} */ this.buffer = gl.createBuffer(); - /* - * @member {WebGLBuffer} The index buffer + /** + * The index buffer + * @member {WebGLBuffer} */ this.indexBuffer = gl.createBuffer(); - /* - * @member {number} todo @alvin + /** + * todo @alvin + * @member {number} */ this.mode = 1; - /* - * @member {number} The alpha of the graphics + /** + * The alpha of the graphics + * @member {number} */ this.alpha = 1; - /* - * @member {boolean} Whether this graphics is dirty or not + /** + * Whether this graphics is dirty or not + * @member {boolean} */ this.dirty = true; } diff --git a/src/core/particles/webgl/ParticleBuffer.js b/src/core/particles/webgl/ParticleBuffer.js index 75be710..6fad028 100644 --- a/src/core/particles/webgl/ParticleBuffer.js +++ b/src/core/particles/webgl/ParticleBuffer.js @@ -20,7 +20,8 @@ function ParticleBuffer(gl, properties, size) { /** - * @member {WebGLRenderingContext} the current WebGL drawing context + * the current WebGL drawing context + * @member {WebGLRenderingContext} */ this.gl = gl; diff --git a/src/core/renderers/SystemRenderer.js b/src/core/renderers/SystemRenderer.js index 7390be4..34c8db6 100644 --- a/src/core/renderers/SystemRenderer.js +++ b/src/core/renderers/SystemRenderer.js @@ -151,11 +151,9 @@ this.backgroundColor = options.backgroundColor || this._backgroundColor; // run bg color setter - - /** * This temporary display object used as the parent of the currently being rendered item - * @member DisplayObject + * @member {DisplayObject} * @private */ this._tempDisplayObjectParent = {worldTransform:new math.Matrix(), worldAlpha:1, children:[]}; diff --git a/src/core/renderers/canvas/CanvasRenderer.js b/src/core/renderers/canvas/CanvasRenderer.js index 389ae5e..8d6c465 100644 --- a/src/core/renderers/canvas/CanvasRenderer.js +++ b/src/core/renderers/canvas/CanvasRenderer.js @@ -105,7 +105,7 @@ /** * This temporary display object used as the parent of the currently being rendered item * - * @member DisplayObject + * @member {DisplayObject} * @private */ this._tempDisplayObjectParent = { diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index 6bfb6de..132618a 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -140,8 +140,8 @@ this.currentRenderTarget = this.renderTarget; /** - * - * @member {ObjectRenderer} @alvin + * object renderer @alvin + * @member {ObjectRenderer} */ this.currentRenderer = new ObjectRenderer(this); @@ -155,7 +155,7 @@ /** * An array of render targets - * @member {Array} TODO @alvin + * @member {Array} * @private */ this._renderTargetStack = []; diff --git a/src/core/renderers/webgl/shaders/Shader.js b/src/core/renderers/webgl/shaders/Shader.js index 20079d7..16e6af8 100644 --- a/src/core/renderers/webgl/shaders/Shader.js +++ b/src/core/renderers/webgl/shaders/Shader.js @@ -18,13 +18,13 @@ } /** - * @member number + * @member {number} * @readonly */ this.uuid = utils.uuid(); /** - * @member WebGLRenderingContext + * @member {WebGLRenderingContext} * @readonly */ this.gl = shaderManager.renderer.gl; @@ -32,7 +32,7 @@ /** * The WebGL program. * - * @member WebGLProgram + * @member {WebGLProgram} * @readonly */ this.program = null; @@ -61,14 +61,14 @@ /** * The vertex shader. * - * @member Array + * @member {Array} */ this.vertexSrc = vertexSrc; /** * The fragment shader. * - * @member Array + * @member {Array} */ this.fragmentSrc = fragmentSrc; diff --git a/src/core/renderers/webgl/utils/Quad.js b/src/core/renderers/webgl/utils/Quad.js index ca49ceb..0c51505 100644 --- a/src/core/renderers/webgl/utils/Quad.js +++ b/src/core/renderers/webgl/utils/Quad.js @@ -7,7 +7,9 @@ function Quad(gl) { /* - * @member {WebGLRenderingContext} the current WebGL drawing context + * the current WebGL drawing context + * + * @member {WebGLRenderingContext} */ this.gl = gl; diff --git a/src/core/renderers/webgl/utils/RenderTarget.js b/src/core/renderers/webgl/utils/RenderTarget.js index 4e63203..8390359 100644 --- a/src/core/renderers/webgl/utils/RenderTarget.js +++ b/src/core/renderers/webgl/utils/RenderTarget.js @@ -24,7 +24,7 @@ /** * The current WebGL drawing context - * member {WebGLRenderingContext} + * @member {WebGLRenderingContext} */ this.gl = gl; diff --git a/src/core/graphics/webgl/WebGLGraphicsData.js b/src/core/graphics/webgl/WebGLGraphicsData.js index f93e589..2fdbb48 100644 --- a/src/core/graphics/webgl/WebGLGraphicsData.js +++ b/src/core/graphics/webgl/WebGLGraphicsData.js @@ -2,53 +2,64 @@ * An object containing WebGL specific properties to be used by the WebGL renderer * * @class + * @memberof PIXI * @param gl {WebGLRenderingContext} the current WebGL drawing context * @private */ function WebGLGraphicsData(gl) { - /* - * @member {WebGLRenderingContext} the current WebGL drawing context + /** + * the current WebGL drawing context + * + * @member {WebGLRenderingContext} */ this.gl = gl; //TODO does this need to be split before uploding?? - /* - * @member {Array} An array of color components (r,g,b) + /** + * An array of color components (r,g,b) + * @member {Array} */ this.color = [0,0,0]; // color split! - /* - * @member {Array} An array of points to draw + /** + * An array of points to draw + * @member {Array} */ this.points = []; - /* - * @member {Array} The indices of the vertices + /** + * The indices of the vertices + * @member {Array} */ this.indices = []; - /* - * @member {WebGLBuffer} The main buffer + /** + * The main buffer + * @member {WebGLBuffer} */ this.buffer = gl.createBuffer(); - /* - * @member {WebGLBuffer} The index buffer + /** + * The index buffer + * @member {WebGLBuffer} */ this.indexBuffer = gl.createBuffer(); - /* - * @member {number} todo @alvin + /** + * todo @alvin + * @member {number} */ this.mode = 1; - /* - * @member {number} The alpha of the graphics + /** + * The alpha of the graphics + * @member {number} */ this.alpha = 1; - /* - * @member {boolean} Whether this graphics is dirty or not + /** + * Whether this graphics is dirty or not + * @member {boolean} */ this.dirty = true; } diff --git a/src/core/particles/webgl/ParticleBuffer.js b/src/core/particles/webgl/ParticleBuffer.js index 75be710..6fad028 100644 --- a/src/core/particles/webgl/ParticleBuffer.js +++ b/src/core/particles/webgl/ParticleBuffer.js @@ -20,7 +20,8 @@ function ParticleBuffer(gl, properties, size) { /** - * @member {WebGLRenderingContext} the current WebGL drawing context + * the current WebGL drawing context + * @member {WebGLRenderingContext} */ this.gl = gl; diff --git a/src/core/renderers/SystemRenderer.js b/src/core/renderers/SystemRenderer.js index 7390be4..34c8db6 100644 --- a/src/core/renderers/SystemRenderer.js +++ b/src/core/renderers/SystemRenderer.js @@ -151,11 +151,9 @@ this.backgroundColor = options.backgroundColor || this._backgroundColor; // run bg color setter - - /** * This temporary display object used as the parent of the currently being rendered item - * @member DisplayObject + * @member {DisplayObject} * @private */ this._tempDisplayObjectParent = {worldTransform:new math.Matrix(), worldAlpha:1, children:[]}; diff --git a/src/core/renderers/canvas/CanvasRenderer.js b/src/core/renderers/canvas/CanvasRenderer.js index 389ae5e..8d6c465 100644 --- a/src/core/renderers/canvas/CanvasRenderer.js +++ b/src/core/renderers/canvas/CanvasRenderer.js @@ -105,7 +105,7 @@ /** * This temporary display object used as the parent of the currently being rendered item * - * @member DisplayObject + * @member {DisplayObject} * @private */ this._tempDisplayObjectParent = { diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index 6bfb6de..132618a 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -140,8 +140,8 @@ this.currentRenderTarget = this.renderTarget; /** - * - * @member {ObjectRenderer} @alvin + * object renderer @alvin + * @member {ObjectRenderer} */ this.currentRenderer = new ObjectRenderer(this); @@ -155,7 +155,7 @@ /** * An array of render targets - * @member {Array} TODO @alvin + * @member {Array} * @private */ this._renderTargetStack = []; diff --git a/src/core/renderers/webgl/shaders/Shader.js b/src/core/renderers/webgl/shaders/Shader.js index 20079d7..16e6af8 100644 --- a/src/core/renderers/webgl/shaders/Shader.js +++ b/src/core/renderers/webgl/shaders/Shader.js @@ -18,13 +18,13 @@ } /** - * @member number + * @member {number} * @readonly */ this.uuid = utils.uuid(); /** - * @member WebGLRenderingContext + * @member {WebGLRenderingContext} * @readonly */ this.gl = shaderManager.renderer.gl; @@ -32,7 +32,7 @@ /** * The WebGL program. * - * @member WebGLProgram + * @member {WebGLProgram} * @readonly */ this.program = null; @@ -61,14 +61,14 @@ /** * The vertex shader. * - * @member Array + * @member {Array} */ this.vertexSrc = vertexSrc; /** * The fragment shader. * - * @member Array + * @member {Array} */ this.fragmentSrc = fragmentSrc; diff --git a/src/core/renderers/webgl/utils/Quad.js b/src/core/renderers/webgl/utils/Quad.js index ca49ceb..0c51505 100644 --- a/src/core/renderers/webgl/utils/Quad.js +++ b/src/core/renderers/webgl/utils/Quad.js @@ -7,7 +7,9 @@ function Quad(gl) { /* - * @member {WebGLRenderingContext} the current WebGL drawing context + * the current WebGL drawing context + * + * @member {WebGLRenderingContext} */ this.gl = gl; diff --git a/src/core/renderers/webgl/utils/RenderTarget.js b/src/core/renderers/webgl/utils/RenderTarget.js index 4e63203..8390359 100644 --- a/src/core/renderers/webgl/utils/RenderTarget.js +++ b/src/core/renderers/webgl/utils/RenderTarget.js @@ -24,7 +24,7 @@ /** * The current WebGL drawing context - * member {WebGLRenderingContext} + * @member {WebGLRenderingContext} */ this.gl = gl; diff --git a/src/core/textures/VideoBaseTexture.js b/src/core/textures/VideoBaseTexture.js index 4475bc8..7ead661 100644 --- a/src/core/textures/VideoBaseTexture.js +++ b/src/core/textures/VideoBaseTexture.js @@ -184,7 +184,6 @@ * Helper function that creates a new BaseTexture based on the given video element. * This BaseTexture can then be used to create a texture * - * @alias fromUrls * @static * @param videoSrc {string|object|string[]|object[]} The URL(s) for the video. * @param [videoSrc.src] {string} One of the source urls for the video diff --git a/src/core/graphics/webgl/WebGLGraphicsData.js b/src/core/graphics/webgl/WebGLGraphicsData.js index f93e589..2fdbb48 100644 --- a/src/core/graphics/webgl/WebGLGraphicsData.js +++ b/src/core/graphics/webgl/WebGLGraphicsData.js @@ -2,53 +2,64 @@ * An object containing WebGL specific properties to be used by the WebGL renderer * * @class + * @memberof PIXI * @param gl {WebGLRenderingContext} the current WebGL drawing context * @private */ function WebGLGraphicsData(gl) { - /* - * @member {WebGLRenderingContext} the current WebGL drawing context + /** + * the current WebGL drawing context + * + * @member {WebGLRenderingContext} */ this.gl = gl; //TODO does this need to be split before uploding?? - /* - * @member {Array} An array of color components (r,g,b) + /** + * An array of color components (r,g,b) + * @member {Array} */ this.color = [0,0,0]; // color split! - /* - * @member {Array} An array of points to draw + /** + * An array of points to draw + * @member {Array} */ this.points = []; - /* - * @member {Array} The indices of the vertices + /** + * The indices of the vertices + * @member {Array} */ this.indices = []; - /* - * @member {WebGLBuffer} The main buffer + /** + * The main buffer + * @member {WebGLBuffer} */ this.buffer = gl.createBuffer(); - /* - * @member {WebGLBuffer} The index buffer + /** + * The index buffer + * @member {WebGLBuffer} */ this.indexBuffer = gl.createBuffer(); - /* - * @member {number} todo @alvin + /** + * todo @alvin + * @member {number} */ this.mode = 1; - /* - * @member {number} The alpha of the graphics + /** + * The alpha of the graphics + * @member {number} */ this.alpha = 1; - /* - * @member {boolean} Whether this graphics is dirty or not + /** + * Whether this graphics is dirty or not + * @member {boolean} */ this.dirty = true; } diff --git a/src/core/particles/webgl/ParticleBuffer.js b/src/core/particles/webgl/ParticleBuffer.js index 75be710..6fad028 100644 --- a/src/core/particles/webgl/ParticleBuffer.js +++ b/src/core/particles/webgl/ParticleBuffer.js @@ -20,7 +20,8 @@ function ParticleBuffer(gl, properties, size) { /** - * @member {WebGLRenderingContext} the current WebGL drawing context + * the current WebGL drawing context + * @member {WebGLRenderingContext} */ this.gl = gl; diff --git a/src/core/renderers/SystemRenderer.js b/src/core/renderers/SystemRenderer.js index 7390be4..34c8db6 100644 --- a/src/core/renderers/SystemRenderer.js +++ b/src/core/renderers/SystemRenderer.js @@ -151,11 +151,9 @@ this.backgroundColor = options.backgroundColor || this._backgroundColor; // run bg color setter - - /** * This temporary display object used as the parent of the currently being rendered item - * @member DisplayObject + * @member {DisplayObject} * @private */ this._tempDisplayObjectParent = {worldTransform:new math.Matrix(), worldAlpha:1, children:[]}; diff --git a/src/core/renderers/canvas/CanvasRenderer.js b/src/core/renderers/canvas/CanvasRenderer.js index 389ae5e..8d6c465 100644 --- a/src/core/renderers/canvas/CanvasRenderer.js +++ b/src/core/renderers/canvas/CanvasRenderer.js @@ -105,7 +105,7 @@ /** * This temporary display object used as the parent of the currently being rendered item * - * @member DisplayObject + * @member {DisplayObject} * @private */ this._tempDisplayObjectParent = { diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index 6bfb6de..132618a 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -140,8 +140,8 @@ this.currentRenderTarget = this.renderTarget; /** - * - * @member {ObjectRenderer} @alvin + * object renderer @alvin + * @member {ObjectRenderer} */ this.currentRenderer = new ObjectRenderer(this); @@ -155,7 +155,7 @@ /** * An array of render targets - * @member {Array} TODO @alvin + * @member {Array} * @private */ this._renderTargetStack = []; diff --git a/src/core/renderers/webgl/shaders/Shader.js b/src/core/renderers/webgl/shaders/Shader.js index 20079d7..16e6af8 100644 --- a/src/core/renderers/webgl/shaders/Shader.js +++ b/src/core/renderers/webgl/shaders/Shader.js @@ -18,13 +18,13 @@ } /** - * @member number + * @member {number} * @readonly */ this.uuid = utils.uuid(); /** - * @member WebGLRenderingContext + * @member {WebGLRenderingContext} * @readonly */ this.gl = shaderManager.renderer.gl; @@ -32,7 +32,7 @@ /** * The WebGL program. * - * @member WebGLProgram + * @member {WebGLProgram} * @readonly */ this.program = null; @@ -61,14 +61,14 @@ /** * The vertex shader. * - * @member Array + * @member {Array} */ this.vertexSrc = vertexSrc; /** * The fragment shader. * - * @member Array + * @member {Array} */ this.fragmentSrc = fragmentSrc; diff --git a/src/core/renderers/webgl/utils/Quad.js b/src/core/renderers/webgl/utils/Quad.js index ca49ceb..0c51505 100644 --- a/src/core/renderers/webgl/utils/Quad.js +++ b/src/core/renderers/webgl/utils/Quad.js @@ -7,7 +7,9 @@ function Quad(gl) { /* - * @member {WebGLRenderingContext} the current WebGL drawing context + * the current WebGL drawing context + * + * @member {WebGLRenderingContext} */ this.gl = gl; diff --git a/src/core/renderers/webgl/utils/RenderTarget.js b/src/core/renderers/webgl/utils/RenderTarget.js index 4e63203..8390359 100644 --- a/src/core/renderers/webgl/utils/RenderTarget.js +++ b/src/core/renderers/webgl/utils/RenderTarget.js @@ -24,7 +24,7 @@ /** * The current WebGL drawing context - * member {WebGLRenderingContext} + * @member {WebGLRenderingContext} */ this.gl = gl; diff --git a/src/core/textures/VideoBaseTexture.js b/src/core/textures/VideoBaseTexture.js index 4475bc8..7ead661 100644 --- a/src/core/textures/VideoBaseTexture.js +++ b/src/core/textures/VideoBaseTexture.js @@ -184,7 +184,6 @@ * Helper function that creates a new BaseTexture based on the given video element. * This BaseTexture can then be used to create a texture * - * @alias fromUrls * @static * @param videoSrc {string|object|string[]|object[]} The URL(s) for the video. * @param [videoSrc.src] {string} One of the source urls for the video diff --git a/src/core/utils/index.js b/src/core/utils/index.js index af2e7d9..bf0ded9 100644 --- a/src/core/utils/index.js +++ b/src/core/utils/index.js @@ -185,11 +185,11 @@ 'color: #ff2424; background: #fff' ]; - console.log.apply(console, args); //jshint ignore:line + window.console.log.apply(console, args); //jshint ignore:line } else if (window.console) { - console.log('Pixi.js ' + CONST.VERSION + ' - ' + type + ' - http://www.pixijs.com/'); //jshint ignore:line + window.console.log('Pixi.js ' + CONST.VERSION + ' - ' + type + ' - http://www.pixijs.com/'); //jshint ignore:line } utils._saidHello = true; diff --git a/src/core/graphics/webgl/WebGLGraphicsData.js b/src/core/graphics/webgl/WebGLGraphicsData.js index f93e589..2fdbb48 100644 --- a/src/core/graphics/webgl/WebGLGraphicsData.js +++ b/src/core/graphics/webgl/WebGLGraphicsData.js @@ -2,53 +2,64 @@ * An object containing WebGL specific properties to be used by the WebGL renderer * * @class + * @memberof PIXI * @param gl {WebGLRenderingContext} the current WebGL drawing context * @private */ function WebGLGraphicsData(gl) { - /* - * @member {WebGLRenderingContext} the current WebGL drawing context + /** + * the current WebGL drawing context + * + * @member {WebGLRenderingContext} */ this.gl = gl; //TODO does this need to be split before uploding?? - /* - * @member {Array} An array of color components (r,g,b) + /** + * An array of color components (r,g,b) + * @member {Array} */ this.color = [0,0,0]; // color split! - /* - * @member {Array} An array of points to draw + /** + * An array of points to draw + * @member {Array} */ this.points = []; - /* - * @member {Array} The indices of the vertices + /** + * The indices of the vertices + * @member {Array} */ this.indices = []; - /* - * @member {WebGLBuffer} The main buffer + /** + * The main buffer + * @member {WebGLBuffer} */ this.buffer = gl.createBuffer(); - /* - * @member {WebGLBuffer} The index buffer + /** + * The index buffer + * @member {WebGLBuffer} */ this.indexBuffer = gl.createBuffer(); - /* - * @member {number} todo @alvin + /** + * todo @alvin + * @member {number} */ this.mode = 1; - /* - * @member {number} The alpha of the graphics + /** + * The alpha of the graphics + * @member {number} */ this.alpha = 1; - /* - * @member {boolean} Whether this graphics is dirty or not + /** + * Whether this graphics is dirty or not + * @member {boolean} */ this.dirty = true; } diff --git a/src/core/particles/webgl/ParticleBuffer.js b/src/core/particles/webgl/ParticleBuffer.js index 75be710..6fad028 100644 --- a/src/core/particles/webgl/ParticleBuffer.js +++ b/src/core/particles/webgl/ParticleBuffer.js @@ -20,7 +20,8 @@ function ParticleBuffer(gl, properties, size) { /** - * @member {WebGLRenderingContext} the current WebGL drawing context + * the current WebGL drawing context + * @member {WebGLRenderingContext} */ this.gl = gl; diff --git a/src/core/renderers/SystemRenderer.js b/src/core/renderers/SystemRenderer.js index 7390be4..34c8db6 100644 --- a/src/core/renderers/SystemRenderer.js +++ b/src/core/renderers/SystemRenderer.js @@ -151,11 +151,9 @@ this.backgroundColor = options.backgroundColor || this._backgroundColor; // run bg color setter - - /** * This temporary display object used as the parent of the currently being rendered item - * @member DisplayObject + * @member {DisplayObject} * @private */ this._tempDisplayObjectParent = {worldTransform:new math.Matrix(), worldAlpha:1, children:[]}; diff --git a/src/core/renderers/canvas/CanvasRenderer.js b/src/core/renderers/canvas/CanvasRenderer.js index 389ae5e..8d6c465 100644 --- a/src/core/renderers/canvas/CanvasRenderer.js +++ b/src/core/renderers/canvas/CanvasRenderer.js @@ -105,7 +105,7 @@ /** * This temporary display object used as the parent of the currently being rendered item * - * @member DisplayObject + * @member {DisplayObject} * @private */ this._tempDisplayObjectParent = { diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index 6bfb6de..132618a 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -140,8 +140,8 @@ this.currentRenderTarget = this.renderTarget; /** - * - * @member {ObjectRenderer} @alvin + * object renderer @alvin + * @member {ObjectRenderer} */ this.currentRenderer = new ObjectRenderer(this); @@ -155,7 +155,7 @@ /** * An array of render targets - * @member {Array} TODO @alvin + * @member {Array} * @private */ this._renderTargetStack = []; diff --git a/src/core/renderers/webgl/shaders/Shader.js b/src/core/renderers/webgl/shaders/Shader.js index 20079d7..16e6af8 100644 --- a/src/core/renderers/webgl/shaders/Shader.js +++ b/src/core/renderers/webgl/shaders/Shader.js @@ -18,13 +18,13 @@ } /** - * @member number + * @member {number} * @readonly */ this.uuid = utils.uuid(); /** - * @member WebGLRenderingContext + * @member {WebGLRenderingContext} * @readonly */ this.gl = shaderManager.renderer.gl; @@ -32,7 +32,7 @@ /** * The WebGL program. * - * @member WebGLProgram + * @member {WebGLProgram} * @readonly */ this.program = null; @@ -61,14 +61,14 @@ /** * The vertex shader. * - * @member Array + * @member {Array} */ this.vertexSrc = vertexSrc; /** * The fragment shader. * - * @member Array + * @member {Array} */ this.fragmentSrc = fragmentSrc; diff --git a/src/core/renderers/webgl/utils/Quad.js b/src/core/renderers/webgl/utils/Quad.js index ca49ceb..0c51505 100644 --- a/src/core/renderers/webgl/utils/Quad.js +++ b/src/core/renderers/webgl/utils/Quad.js @@ -7,7 +7,9 @@ function Quad(gl) { /* - * @member {WebGLRenderingContext} the current WebGL drawing context + * the current WebGL drawing context + * + * @member {WebGLRenderingContext} */ this.gl = gl; diff --git a/src/core/renderers/webgl/utils/RenderTarget.js b/src/core/renderers/webgl/utils/RenderTarget.js index 4e63203..8390359 100644 --- a/src/core/renderers/webgl/utils/RenderTarget.js +++ b/src/core/renderers/webgl/utils/RenderTarget.js @@ -24,7 +24,7 @@ /** * The current WebGL drawing context - * member {WebGLRenderingContext} + * @member {WebGLRenderingContext} */ this.gl = gl; diff --git a/src/core/textures/VideoBaseTexture.js b/src/core/textures/VideoBaseTexture.js index 4475bc8..7ead661 100644 --- a/src/core/textures/VideoBaseTexture.js +++ b/src/core/textures/VideoBaseTexture.js @@ -184,7 +184,6 @@ * Helper function that creates a new BaseTexture based on the given video element. * This BaseTexture can then be used to create a texture * - * @alias fromUrls * @static * @param videoSrc {string|object|string[]|object[]} The URL(s) for the video. * @param [videoSrc.src] {string} One of the source urls for the video diff --git a/src/core/utils/index.js b/src/core/utils/index.js index af2e7d9..bf0ded9 100644 --- a/src/core/utils/index.js +++ b/src/core/utils/index.js @@ -185,11 +185,11 @@ 'color: #ff2424; background: #fff' ]; - console.log.apply(console, args); //jshint ignore:line + window.console.log.apply(console, args); //jshint ignore:line } else if (window.console) { - console.log('Pixi.js ' + CONST.VERSION + ' - ' + type + ' - http://www.pixijs.com/'); //jshint ignore:line + window.console.log('Pixi.js ' + CONST.VERSION + ' - ' + type + ' - http://www.pixijs.com/'); //jshint ignore:line } utils._saidHello = true; diff --git a/src/extras/MovieClip.js b/src/extras/MovieClip.js index 433b49c..359200c 100644 --- a/src/extras/MovieClip.js +++ b/src/extras/MovieClip.js @@ -18,14 +18,14 @@ /** * The array of textures that make up the animation * - * @member Texture[] + * @member {Texture[]} */ this._textures = textures; /** * The speed that the MovieClip will play at. Higher is faster, lower is slower * - * @member number + * @member {number} * @default 1 */ this.animationSpeed = 1; @@ -33,7 +33,7 @@ /** * Whether or not the movie clip repeats after playing. * - * @member boolean + * @member {boolean} * @default true */ this.loop = true; @@ -49,7 +49,7 @@ /** * The MovieClips current frame index (this may not have to be a whole number) * - * @member number + * @member {number} * @default 0 * @readonly */ @@ -58,7 +58,7 @@ /** * Indicates if the MovieClip is currently playing * - * @member boolean + * @member {boolean} * @readonly */ this.playing = false; @@ -66,7 +66,7 @@ /** * private cache of the bound function * - * @member function + * @member {function} */ this._updateBound = this.update.bind(this); }