diff --git a/src/core/display/Container.js b/src/core/display/Container.js index d0f345b..df4d0f6 100644 --- a/src/core/display/Container.js +++ b/src/core/display/Container.js @@ -498,7 +498,7 @@ * @param renderer {WebGLRenderer} The renderer * @private */ -Container.prototype._renderWebGL = function (renderer) +Container.prototype._renderWebGL = function (renderer) // jshint unused:false { // this is where content itself gets rendered... }; @@ -509,7 +509,7 @@ * @param renderer {CanvasRenderer} The renderer * @private */ -Container.prototype._renderCanvas = function (renderer) +Container.prototype._renderCanvas = function (renderer) // jshint unused:false { // this is where content itself gets rendered... }; diff --git a/src/core/display/Container.js b/src/core/display/Container.js index d0f345b..df4d0f6 100644 --- a/src/core/display/Container.js +++ b/src/core/display/Container.js @@ -498,7 +498,7 @@ * @param renderer {WebGLRenderer} The renderer * @private */ -Container.prototype._renderWebGL = function (renderer) +Container.prototype._renderWebGL = function (renderer) // jshint unused:false { // this is where content itself gets rendered... }; @@ -509,7 +509,7 @@ * @param renderer {CanvasRenderer} The renderer * @private */ -Container.prototype._renderCanvas = function (renderer) +Container.prototype._renderCanvas = function (renderer) // jshint unused:false { // this is where content itself gets rendered... }; diff --git a/src/core/display/DisplayObject.js b/src/core/display/DisplayObject.js index 048b84a..5fbb708 100644 --- a/src/core/display/DisplayObject.js +++ b/src/core/display/DisplayObject.js @@ -349,7 +349,7 @@ * @param matrix {Matrix} * @return {Rectangle} the rectangular bounding area */ -DisplayObject.prototype.getBounds = function (matrix) +DisplayObject.prototype.getBounds = function (matrix) // jshint unused:false { return math.Rectangle.EMPTY; }; @@ -402,7 +402,7 @@ * @param renderer {WebGLRenderer} The renderer * @private */ -DisplayObject.prototype.renderWebGL = function (renderer) +DisplayObject.prototype.renderWebGL = function (renderer) // jshint unused:false { // OVERWRITE; }; @@ -413,7 +413,7 @@ * @param renderer {CanvasRenderer} The renderer * @private */ -DisplayObject.prototype.renderCanvas = function (renderer) +DisplayObject.prototype.renderCanvas = function (renderer) // jshint unused:false { // OVERWRITE; }; diff --git a/src/core/display/Container.js b/src/core/display/Container.js index d0f345b..df4d0f6 100644 --- a/src/core/display/Container.js +++ b/src/core/display/Container.js @@ -498,7 +498,7 @@ * @param renderer {WebGLRenderer} The renderer * @private */ -Container.prototype._renderWebGL = function (renderer) +Container.prototype._renderWebGL = function (renderer) // jshint unused:false { // this is where content itself gets rendered... }; @@ -509,7 +509,7 @@ * @param renderer {CanvasRenderer} The renderer * @private */ -Container.prototype._renderCanvas = function (renderer) +Container.prototype._renderCanvas = function (renderer) // jshint unused:false { // this is where content itself gets rendered... }; diff --git a/src/core/display/DisplayObject.js b/src/core/display/DisplayObject.js index 048b84a..5fbb708 100644 --- a/src/core/display/DisplayObject.js +++ b/src/core/display/DisplayObject.js @@ -349,7 +349,7 @@ * @param matrix {Matrix} * @return {Rectangle} the rectangular bounding area */ -DisplayObject.prototype.getBounds = function (matrix) +DisplayObject.prototype.getBounds = function (matrix) // jshint unused:false { return math.Rectangle.EMPTY; }; @@ -402,7 +402,7 @@ * @param renderer {WebGLRenderer} The renderer * @private */ -DisplayObject.prototype.renderWebGL = function (renderer) +DisplayObject.prototype.renderWebGL = function (renderer) // jshint unused:false { // OVERWRITE; }; @@ -413,7 +413,7 @@ * @param renderer {CanvasRenderer} The renderer * @private */ -DisplayObject.prototype.renderCanvas = function (renderer) +DisplayObject.prototype.renderCanvas = function (renderer) // jshint unused:false { // OVERWRITE; }; diff --git a/src/core/renderers/webgl/shaders/Shader.js b/src/core/renderers/webgl/shaders/Shader.js index 9f4ad0e..44de077 100644 --- a/src/core/renderers/webgl/shaders/Shader.js +++ b/src/core/renderers/webgl/shaders/Shader.js @@ -1,5 +1,5 @@ -var utils = require('../../../utils'), - CONST = require('../../../const'); +/*global console */ +var utils = require('../../../utils'); /** * @class @@ -444,7 +444,7 @@ break; default: - window.console.warn('Pixi.js Shader Warning: Unknown uniform type: ' + uniform.type); + console.warn('Pixi.js Shader Warning: Unknown uniform type: ' + uniform.type); } }; @@ -539,7 +539,7 @@ if (!this.gl.getShaderParameter(shader, this.gl.COMPILE_STATUS)) { - window.console.log(this.gl.getShaderInfoLog(shader)); + console.log(this.gl.getShaderInfoLog(shader)); return null; } diff --git a/src/core/display/Container.js b/src/core/display/Container.js index d0f345b..df4d0f6 100644 --- a/src/core/display/Container.js +++ b/src/core/display/Container.js @@ -498,7 +498,7 @@ * @param renderer {WebGLRenderer} The renderer * @private */ -Container.prototype._renderWebGL = function (renderer) +Container.prototype._renderWebGL = function (renderer) // jshint unused:false { // this is where content itself gets rendered... }; @@ -509,7 +509,7 @@ * @param renderer {CanvasRenderer} The renderer * @private */ -Container.prototype._renderCanvas = function (renderer) +Container.prototype._renderCanvas = function (renderer) // jshint unused:false { // this is where content itself gets rendered... }; diff --git a/src/core/display/DisplayObject.js b/src/core/display/DisplayObject.js index 048b84a..5fbb708 100644 --- a/src/core/display/DisplayObject.js +++ b/src/core/display/DisplayObject.js @@ -349,7 +349,7 @@ * @param matrix {Matrix} * @return {Rectangle} the rectangular bounding area */ -DisplayObject.prototype.getBounds = function (matrix) +DisplayObject.prototype.getBounds = function (matrix) // jshint unused:false { return math.Rectangle.EMPTY; }; @@ -402,7 +402,7 @@ * @param renderer {WebGLRenderer} The renderer * @private */ -DisplayObject.prototype.renderWebGL = function (renderer) +DisplayObject.prototype.renderWebGL = function (renderer) // jshint unused:false { // OVERWRITE; }; @@ -413,7 +413,7 @@ * @param renderer {CanvasRenderer} The renderer * @private */ -DisplayObject.prototype.renderCanvas = function (renderer) +DisplayObject.prototype.renderCanvas = function (renderer) // jshint unused:false { // OVERWRITE; }; diff --git a/src/core/renderers/webgl/shaders/Shader.js b/src/core/renderers/webgl/shaders/Shader.js index 9f4ad0e..44de077 100644 --- a/src/core/renderers/webgl/shaders/Shader.js +++ b/src/core/renderers/webgl/shaders/Shader.js @@ -1,5 +1,5 @@ -var utils = require('../../../utils'), - CONST = require('../../../const'); +/*global console */ +var utils = require('../../../utils'); /** * @class @@ -444,7 +444,7 @@ break; default: - window.console.warn('Pixi.js Shader Warning: Unknown uniform type: ' + uniform.type); + console.warn('Pixi.js Shader Warning: Unknown uniform type: ' + uniform.type); } }; @@ -539,7 +539,7 @@ if (!this.gl.getShaderParameter(shader, this.gl.COMPILE_STATUS)) { - window.console.log(this.gl.getShaderInfoLog(shader)); + console.log(this.gl.getShaderInfoLog(shader)); return null; } diff --git a/src/core/renderers/webgl/utils/ObjectRenderer.js b/src/core/renderers/webgl/utils/ObjectRenderer.js index 9edbd1a..5609f81 100644 --- a/src/core/renderers/webgl/utils/ObjectRenderer.js +++ b/src/core/renderers/webgl/utils/ObjectRenderer.js @@ -49,7 +49,7 @@ * Renders an object * */ -ObjectRenderer.prototype.render = function (object) +ObjectRenderer.prototype.render = function (object) // jshint unused:false { // render the object }; diff --git a/src/core/display/Container.js b/src/core/display/Container.js index d0f345b..df4d0f6 100644 --- a/src/core/display/Container.js +++ b/src/core/display/Container.js @@ -498,7 +498,7 @@ * @param renderer {WebGLRenderer} The renderer * @private */ -Container.prototype._renderWebGL = function (renderer) +Container.prototype._renderWebGL = function (renderer) // jshint unused:false { // this is where content itself gets rendered... }; @@ -509,7 +509,7 @@ * @param renderer {CanvasRenderer} The renderer * @private */ -Container.prototype._renderCanvas = function (renderer) +Container.prototype._renderCanvas = function (renderer) // jshint unused:false { // this is where content itself gets rendered... }; diff --git a/src/core/display/DisplayObject.js b/src/core/display/DisplayObject.js index 048b84a..5fbb708 100644 --- a/src/core/display/DisplayObject.js +++ b/src/core/display/DisplayObject.js @@ -349,7 +349,7 @@ * @param matrix {Matrix} * @return {Rectangle} the rectangular bounding area */ -DisplayObject.prototype.getBounds = function (matrix) +DisplayObject.prototype.getBounds = function (matrix) // jshint unused:false { return math.Rectangle.EMPTY; }; @@ -402,7 +402,7 @@ * @param renderer {WebGLRenderer} The renderer * @private */ -DisplayObject.prototype.renderWebGL = function (renderer) +DisplayObject.prototype.renderWebGL = function (renderer) // jshint unused:false { // OVERWRITE; }; @@ -413,7 +413,7 @@ * @param renderer {CanvasRenderer} The renderer * @private */ -DisplayObject.prototype.renderCanvas = function (renderer) +DisplayObject.prototype.renderCanvas = function (renderer) // jshint unused:false { // OVERWRITE; }; diff --git a/src/core/renderers/webgl/shaders/Shader.js b/src/core/renderers/webgl/shaders/Shader.js index 9f4ad0e..44de077 100644 --- a/src/core/renderers/webgl/shaders/Shader.js +++ b/src/core/renderers/webgl/shaders/Shader.js @@ -1,5 +1,5 @@ -var utils = require('../../../utils'), - CONST = require('../../../const'); +/*global console */ +var utils = require('../../../utils'); /** * @class @@ -444,7 +444,7 @@ break; default: - window.console.warn('Pixi.js Shader Warning: Unknown uniform type: ' + uniform.type); + console.warn('Pixi.js Shader Warning: Unknown uniform type: ' + uniform.type); } }; @@ -539,7 +539,7 @@ if (!this.gl.getShaderParameter(shader, this.gl.COMPILE_STATUS)) { - window.console.log(this.gl.getShaderInfoLog(shader)); + console.log(this.gl.getShaderInfoLog(shader)); return null; } diff --git a/src/core/renderers/webgl/utils/ObjectRenderer.js b/src/core/renderers/webgl/utils/ObjectRenderer.js index 9edbd1a..5609f81 100644 --- a/src/core/renderers/webgl/utils/ObjectRenderer.js +++ b/src/core/renderers/webgl/utils/ObjectRenderer.js @@ -49,7 +49,7 @@ * Renders an object * */ -ObjectRenderer.prototype.render = function (object) +ObjectRenderer.prototype.render = function (object) // jshint unused:false { // render the object }; diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js index 9c51a5a..d6302bd 100644 --- a/src/core/sprites/webgl/SpriteRenderer.js +++ b/src/core/sprites/webgl/SpriteRenderer.js @@ -1,5 +1,4 @@ var ObjectRenderer = require('../../renderers/webgl/utils/ObjectRenderer'), - Shader = require('../../renderers/webgl/shaders/Shader'), WebGLRenderer = require('../../renderers/webgl/WebGLRenderer'), CONST = require('../../const'); diff --git a/src/core/display/Container.js b/src/core/display/Container.js index d0f345b..df4d0f6 100644 --- a/src/core/display/Container.js +++ b/src/core/display/Container.js @@ -498,7 +498,7 @@ * @param renderer {WebGLRenderer} The renderer * @private */ -Container.prototype._renderWebGL = function (renderer) +Container.prototype._renderWebGL = function (renderer) // jshint unused:false { // this is where content itself gets rendered... }; @@ -509,7 +509,7 @@ * @param renderer {CanvasRenderer} The renderer * @private */ -Container.prototype._renderCanvas = function (renderer) +Container.prototype._renderCanvas = function (renderer) // jshint unused:false { // this is where content itself gets rendered... }; diff --git a/src/core/display/DisplayObject.js b/src/core/display/DisplayObject.js index 048b84a..5fbb708 100644 --- a/src/core/display/DisplayObject.js +++ b/src/core/display/DisplayObject.js @@ -349,7 +349,7 @@ * @param matrix {Matrix} * @return {Rectangle} the rectangular bounding area */ -DisplayObject.prototype.getBounds = function (matrix) +DisplayObject.prototype.getBounds = function (matrix) // jshint unused:false { return math.Rectangle.EMPTY; }; @@ -402,7 +402,7 @@ * @param renderer {WebGLRenderer} The renderer * @private */ -DisplayObject.prototype.renderWebGL = function (renderer) +DisplayObject.prototype.renderWebGL = function (renderer) // jshint unused:false { // OVERWRITE; }; @@ -413,7 +413,7 @@ * @param renderer {CanvasRenderer} The renderer * @private */ -DisplayObject.prototype.renderCanvas = function (renderer) +DisplayObject.prototype.renderCanvas = function (renderer) // jshint unused:false { // OVERWRITE; }; diff --git a/src/core/renderers/webgl/shaders/Shader.js b/src/core/renderers/webgl/shaders/Shader.js index 9f4ad0e..44de077 100644 --- a/src/core/renderers/webgl/shaders/Shader.js +++ b/src/core/renderers/webgl/shaders/Shader.js @@ -1,5 +1,5 @@ -var utils = require('../../../utils'), - CONST = require('../../../const'); +/*global console */ +var utils = require('../../../utils'); /** * @class @@ -444,7 +444,7 @@ break; default: - window.console.warn('Pixi.js Shader Warning: Unknown uniform type: ' + uniform.type); + console.warn('Pixi.js Shader Warning: Unknown uniform type: ' + uniform.type); } }; @@ -539,7 +539,7 @@ if (!this.gl.getShaderParameter(shader, this.gl.COMPILE_STATUS)) { - window.console.log(this.gl.getShaderInfoLog(shader)); + console.log(this.gl.getShaderInfoLog(shader)); return null; } diff --git a/src/core/renderers/webgl/utils/ObjectRenderer.js b/src/core/renderers/webgl/utils/ObjectRenderer.js index 9edbd1a..5609f81 100644 --- a/src/core/renderers/webgl/utils/ObjectRenderer.js +++ b/src/core/renderers/webgl/utils/ObjectRenderer.js @@ -49,7 +49,7 @@ * Renders an object * */ -ObjectRenderer.prototype.render = function (object) +ObjectRenderer.prototype.render = function (object) // jshint unused:false { // render the object }; diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js index 9c51a5a..d6302bd 100644 --- a/src/core/sprites/webgl/SpriteRenderer.js +++ b/src/core/sprites/webgl/SpriteRenderer.js @@ -1,5 +1,4 @@ var ObjectRenderer = require('../../renderers/webgl/utils/ObjectRenderer'), - Shader = require('../../renderers/webgl/shaders/Shader'), WebGLRenderer = require('../../renderers/webgl/WebGLRenderer'), CONST = require('../../const'); diff --git a/src/deprecation.js b/src/deprecation.js index 0543d0b..c873997 100644 --- a/src/deprecation.js +++ b/src/deprecation.js @@ -1,5 +1,4 @@ var core = require('./core'), - extras = require('./extras'), mesh = require('./mesh'), text = require('./text'); diff --git a/src/core/display/Container.js b/src/core/display/Container.js index d0f345b..df4d0f6 100644 --- a/src/core/display/Container.js +++ b/src/core/display/Container.js @@ -498,7 +498,7 @@ * @param renderer {WebGLRenderer} The renderer * @private */ -Container.prototype._renderWebGL = function (renderer) +Container.prototype._renderWebGL = function (renderer) // jshint unused:false { // this is where content itself gets rendered... }; @@ -509,7 +509,7 @@ * @param renderer {CanvasRenderer} The renderer * @private */ -Container.prototype._renderCanvas = function (renderer) +Container.prototype._renderCanvas = function (renderer) // jshint unused:false { // this is where content itself gets rendered... }; diff --git a/src/core/display/DisplayObject.js b/src/core/display/DisplayObject.js index 048b84a..5fbb708 100644 --- a/src/core/display/DisplayObject.js +++ b/src/core/display/DisplayObject.js @@ -349,7 +349,7 @@ * @param matrix {Matrix} * @return {Rectangle} the rectangular bounding area */ -DisplayObject.prototype.getBounds = function (matrix) +DisplayObject.prototype.getBounds = function (matrix) // jshint unused:false { return math.Rectangle.EMPTY; }; @@ -402,7 +402,7 @@ * @param renderer {WebGLRenderer} The renderer * @private */ -DisplayObject.prototype.renderWebGL = function (renderer) +DisplayObject.prototype.renderWebGL = function (renderer) // jshint unused:false { // OVERWRITE; }; @@ -413,7 +413,7 @@ * @param renderer {CanvasRenderer} The renderer * @private */ -DisplayObject.prototype.renderCanvas = function (renderer) +DisplayObject.prototype.renderCanvas = function (renderer) // jshint unused:false { // OVERWRITE; }; diff --git a/src/core/renderers/webgl/shaders/Shader.js b/src/core/renderers/webgl/shaders/Shader.js index 9f4ad0e..44de077 100644 --- a/src/core/renderers/webgl/shaders/Shader.js +++ b/src/core/renderers/webgl/shaders/Shader.js @@ -1,5 +1,5 @@ -var utils = require('../../../utils'), - CONST = require('../../../const'); +/*global console */ +var utils = require('../../../utils'); /** * @class @@ -444,7 +444,7 @@ break; default: - window.console.warn('Pixi.js Shader Warning: Unknown uniform type: ' + uniform.type); + console.warn('Pixi.js Shader Warning: Unknown uniform type: ' + uniform.type); } }; @@ -539,7 +539,7 @@ if (!this.gl.getShaderParameter(shader, this.gl.COMPILE_STATUS)) { - window.console.log(this.gl.getShaderInfoLog(shader)); + console.log(this.gl.getShaderInfoLog(shader)); return null; } diff --git a/src/core/renderers/webgl/utils/ObjectRenderer.js b/src/core/renderers/webgl/utils/ObjectRenderer.js index 9edbd1a..5609f81 100644 --- a/src/core/renderers/webgl/utils/ObjectRenderer.js +++ b/src/core/renderers/webgl/utils/ObjectRenderer.js @@ -49,7 +49,7 @@ * Renders an object * */ -ObjectRenderer.prototype.render = function (object) +ObjectRenderer.prototype.render = function (object) // jshint unused:false { // render the object }; diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js index 9c51a5a..d6302bd 100644 --- a/src/core/sprites/webgl/SpriteRenderer.js +++ b/src/core/sprites/webgl/SpriteRenderer.js @@ -1,5 +1,4 @@ var ObjectRenderer = require('../../renderers/webgl/utils/ObjectRenderer'), - Shader = require('../../renderers/webgl/shaders/Shader'), WebGLRenderer = require('../../renderers/webgl/WebGLRenderer'), CONST = require('../../const'); diff --git a/src/deprecation.js b/src/deprecation.js index 0543d0b..c873997 100644 --- a/src/deprecation.js +++ b/src/deprecation.js @@ -1,5 +1,4 @@ var core = require('./core'), - extras = require('./extras'), mesh = require('./mesh'), text = require('./text'); diff --git a/src/filters/color/ColorMatrixFilter.js b/src/filters/color/ColorMatrixFilter.js index 58b04c4..62ba739 100644 --- a/src/filters/color/ColorMatrixFilter.js +++ b/src/filters/color/ColorMatrixFilter.js @@ -270,7 +270,7 @@ * * @param multiply {boolean} refer to ._loadMatrix() method */ -ColorMatrixFilter.prototype.desaturate = function(multiply) +ColorMatrixFilter.prototype.desaturate = function(multiply) // jshint unused:false { this.saturation(-1); }; diff --git a/src/core/display/Container.js b/src/core/display/Container.js index d0f345b..df4d0f6 100644 --- a/src/core/display/Container.js +++ b/src/core/display/Container.js @@ -498,7 +498,7 @@ * @param renderer {WebGLRenderer} The renderer * @private */ -Container.prototype._renderWebGL = function (renderer) +Container.prototype._renderWebGL = function (renderer) // jshint unused:false { // this is where content itself gets rendered... }; @@ -509,7 +509,7 @@ * @param renderer {CanvasRenderer} The renderer * @private */ -Container.prototype._renderCanvas = function (renderer) +Container.prototype._renderCanvas = function (renderer) // jshint unused:false { // this is where content itself gets rendered... }; diff --git a/src/core/display/DisplayObject.js b/src/core/display/DisplayObject.js index 048b84a..5fbb708 100644 --- a/src/core/display/DisplayObject.js +++ b/src/core/display/DisplayObject.js @@ -349,7 +349,7 @@ * @param matrix {Matrix} * @return {Rectangle} the rectangular bounding area */ -DisplayObject.prototype.getBounds = function (matrix) +DisplayObject.prototype.getBounds = function (matrix) // jshint unused:false { return math.Rectangle.EMPTY; }; @@ -402,7 +402,7 @@ * @param renderer {WebGLRenderer} The renderer * @private */ -DisplayObject.prototype.renderWebGL = function (renderer) +DisplayObject.prototype.renderWebGL = function (renderer) // jshint unused:false { // OVERWRITE; }; @@ -413,7 +413,7 @@ * @param renderer {CanvasRenderer} The renderer * @private */ -DisplayObject.prototype.renderCanvas = function (renderer) +DisplayObject.prototype.renderCanvas = function (renderer) // jshint unused:false { // OVERWRITE; }; diff --git a/src/core/renderers/webgl/shaders/Shader.js b/src/core/renderers/webgl/shaders/Shader.js index 9f4ad0e..44de077 100644 --- a/src/core/renderers/webgl/shaders/Shader.js +++ b/src/core/renderers/webgl/shaders/Shader.js @@ -1,5 +1,5 @@ -var utils = require('../../../utils'), - CONST = require('../../../const'); +/*global console */ +var utils = require('../../../utils'); /** * @class @@ -444,7 +444,7 @@ break; default: - window.console.warn('Pixi.js Shader Warning: Unknown uniform type: ' + uniform.type); + console.warn('Pixi.js Shader Warning: Unknown uniform type: ' + uniform.type); } }; @@ -539,7 +539,7 @@ if (!this.gl.getShaderParameter(shader, this.gl.COMPILE_STATUS)) { - window.console.log(this.gl.getShaderInfoLog(shader)); + console.log(this.gl.getShaderInfoLog(shader)); return null; } diff --git a/src/core/renderers/webgl/utils/ObjectRenderer.js b/src/core/renderers/webgl/utils/ObjectRenderer.js index 9edbd1a..5609f81 100644 --- a/src/core/renderers/webgl/utils/ObjectRenderer.js +++ b/src/core/renderers/webgl/utils/ObjectRenderer.js @@ -49,7 +49,7 @@ * Renders an object * */ -ObjectRenderer.prototype.render = function (object) +ObjectRenderer.prototype.render = function (object) // jshint unused:false { // render the object }; diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js index 9c51a5a..d6302bd 100644 --- a/src/core/sprites/webgl/SpriteRenderer.js +++ b/src/core/sprites/webgl/SpriteRenderer.js @@ -1,5 +1,4 @@ var ObjectRenderer = require('../../renderers/webgl/utils/ObjectRenderer'), - Shader = require('../../renderers/webgl/shaders/Shader'), WebGLRenderer = require('../../renderers/webgl/WebGLRenderer'), CONST = require('../../const'); diff --git a/src/deprecation.js b/src/deprecation.js index 0543d0b..c873997 100644 --- a/src/deprecation.js +++ b/src/deprecation.js @@ -1,5 +1,4 @@ var core = require('./core'), - extras = require('./extras'), mesh = require('./mesh'), text = require('./text'); diff --git a/src/filters/color/ColorMatrixFilter.js b/src/filters/color/ColorMatrixFilter.js index 58b04c4..62ba739 100644 --- a/src/filters/color/ColorMatrixFilter.js +++ b/src/filters/color/ColorMatrixFilter.js @@ -270,7 +270,7 @@ * * @param multiply {boolean} refer to ._loadMatrix() method */ -ColorMatrixFilter.prototype.desaturate = function(multiply) +ColorMatrixFilter.prototype.desaturate = function(multiply) // jshint unused:false { this.saturation(-1); }; diff --git a/src/filters/dropshadow/BlurYTintFilter.js b/src/filters/dropshadow/BlurYTintFilter.js index 7e68d1b..d4eeb8a 100644 --- a/src/filters/dropshadow/BlurYTintFilter.js +++ b/src/filters/dropshadow/BlurYTintFilter.js @@ -1,5 +1,4 @@ -var core = require('../../core'), - blurFactor = 1 / 7000; +var core = require('../../core'); var fs = require('fs'); /** diff --git a/src/core/display/Container.js b/src/core/display/Container.js index d0f345b..df4d0f6 100644 --- a/src/core/display/Container.js +++ b/src/core/display/Container.js @@ -498,7 +498,7 @@ * @param renderer {WebGLRenderer} The renderer * @private */ -Container.prototype._renderWebGL = function (renderer) +Container.prototype._renderWebGL = function (renderer) // jshint unused:false { // this is where content itself gets rendered... }; @@ -509,7 +509,7 @@ * @param renderer {CanvasRenderer} The renderer * @private */ -Container.prototype._renderCanvas = function (renderer) +Container.prototype._renderCanvas = function (renderer) // jshint unused:false { // this is where content itself gets rendered... }; diff --git a/src/core/display/DisplayObject.js b/src/core/display/DisplayObject.js index 048b84a..5fbb708 100644 --- a/src/core/display/DisplayObject.js +++ b/src/core/display/DisplayObject.js @@ -349,7 +349,7 @@ * @param matrix {Matrix} * @return {Rectangle} the rectangular bounding area */ -DisplayObject.prototype.getBounds = function (matrix) +DisplayObject.prototype.getBounds = function (matrix) // jshint unused:false { return math.Rectangle.EMPTY; }; @@ -402,7 +402,7 @@ * @param renderer {WebGLRenderer} The renderer * @private */ -DisplayObject.prototype.renderWebGL = function (renderer) +DisplayObject.prototype.renderWebGL = function (renderer) // jshint unused:false { // OVERWRITE; }; @@ -413,7 +413,7 @@ * @param renderer {CanvasRenderer} The renderer * @private */ -DisplayObject.prototype.renderCanvas = function (renderer) +DisplayObject.prototype.renderCanvas = function (renderer) // jshint unused:false { // OVERWRITE; }; diff --git a/src/core/renderers/webgl/shaders/Shader.js b/src/core/renderers/webgl/shaders/Shader.js index 9f4ad0e..44de077 100644 --- a/src/core/renderers/webgl/shaders/Shader.js +++ b/src/core/renderers/webgl/shaders/Shader.js @@ -1,5 +1,5 @@ -var utils = require('../../../utils'), - CONST = require('../../../const'); +/*global console */ +var utils = require('../../../utils'); /** * @class @@ -444,7 +444,7 @@ break; default: - window.console.warn('Pixi.js Shader Warning: Unknown uniform type: ' + uniform.type); + console.warn('Pixi.js Shader Warning: Unknown uniform type: ' + uniform.type); } }; @@ -539,7 +539,7 @@ if (!this.gl.getShaderParameter(shader, this.gl.COMPILE_STATUS)) { - window.console.log(this.gl.getShaderInfoLog(shader)); + console.log(this.gl.getShaderInfoLog(shader)); return null; } diff --git a/src/core/renderers/webgl/utils/ObjectRenderer.js b/src/core/renderers/webgl/utils/ObjectRenderer.js index 9edbd1a..5609f81 100644 --- a/src/core/renderers/webgl/utils/ObjectRenderer.js +++ b/src/core/renderers/webgl/utils/ObjectRenderer.js @@ -49,7 +49,7 @@ * Renders an object * */ -ObjectRenderer.prototype.render = function (object) +ObjectRenderer.prototype.render = function (object) // jshint unused:false { // render the object }; diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js index 9c51a5a..d6302bd 100644 --- a/src/core/sprites/webgl/SpriteRenderer.js +++ b/src/core/sprites/webgl/SpriteRenderer.js @@ -1,5 +1,4 @@ var ObjectRenderer = require('../../renderers/webgl/utils/ObjectRenderer'), - Shader = require('../../renderers/webgl/shaders/Shader'), WebGLRenderer = require('../../renderers/webgl/WebGLRenderer'), CONST = require('../../const'); diff --git a/src/deprecation.js b/src/deprecation.js index 0543d0b..c873997 100644 --- a/src/deprecation.js +++ b/src/deprecation.js @@ -1,5 +1,4 @@ var core = require('./core'), - extras = require('./extras'), mesh = require('./mesh'), text = require('./text'); diff --git a/src/filters/color/ColorMatrixFilter.js b/src/filters/color/ColorMatrixFilter.js index 58b04c4..62ba739 100644 --- a/src/filters/color/ColorMatrixFilter.js +++ b/src/filters/color/ColorMatrixFilter.js @@ -270,7 +270,7 @@ * * @param multiply {boolean} refer to ._loadMatrix() method */ -ColorMatrixFilter.prototype.desaturate = function(multiply) +ColorMatrixFilter.prototype.desaturate = function(multiply) // jshint unused:false { this.saturation(-1); }; diff --git a/src/filters/dropshadow/BlurYTintFilter.js b/src/filters/dropshadow/BlurYTintFilter.js index 7e68d1b..d4eeb8a 100644 --- a/src/filters/dropshadow/BlurYTintFilter.js +++ b/src/filters/dropshadow/BlurYTintFilter.js @@ -1,5 +1,4 @@ -var core = require('../../core'), - blurFactor = 1 / 7000; +var core = require('../../core'); var fs = require('fs'); /** diff --git a/src/index.js b/src/index.js index c597c78..52b19c8 100644 --- a/src/index.js +++ b/src/index.js @@ -1,4 +1,4 @@ -require('./polyfill/requestAnimationFrame') +require('./polyfill/requestAnimationFrame'); var core = require('./core'); diff --git a/src/core/display/Container.js b/src/core/display/Container.js index d0f345b..df4d0f6 100644 --- a/src/core/display/Container.js +++ b/src/core/display/Container.js @@ -498,7 +498,7 @@ * @param renderer {WebGLRenderer} The renderer * @private */ -Container.prototype._renderWebGL = function (renderer) +Container.prototype._renderWebGL = function (renderer) // jshint unused:false { // this is where content itself gets rendered... }; @@ -509,7 +509,7 @@ * @param renderer {CanvasRenderer} The renderer * @private */ -Container.prototype._renderCanvas = function (renderer) +Container.prototype._renderCanvas = function (renderer) // jshint unused:false { // this is where content itself gets rendered... }; diff --git a/src/core/display/DisplayObject.js b/src/core/display/DisplayObject.js index 048b84a..5fbb708 100644 --- a/src/core/display/DisplayObject.js +++ b/src/core/display/DisplayObject.js @@ -349,7 +349,7 @@ * @param matrix {Matrix} * @return {Rectangle} the rectangular bounding area */ -DisplayObject.prototype.getBounds = function (matrix) +DisplayObject.prototype.getBounds = function (matrix) // jshint unused:false { return math.Rectangle.EMPTY; }; @@ -402,7 +402,7 @@ * @param renderer {WebGLRenderer} The renderer * @private */ -DisplayObject.prototype.renderWebGL = function (renderer) +DisplayObject.prototype.renderWebGL = function (renderer) // jshint unused:false { // OVERWRITE; }; @@ -413,7 +413,7 @@ * @param renderer {CanvasRenderer} The renderer * @private */ -DisplayObject.prototype.renderCanvas = function (renderer) +DisplayObject.prototype.renderCanvas = function (renderer) // jshint unused:false { // OVERWRITE; }; diff --git a/src/core/renderers/webgl/shaders/Shader.js b/src/core/renderers/webgl/shaders/Shader.js index 9f4ad0e..44de077 100644 --- a/src/core/renderers/webgl/shaders/Shader.js +++ b/src/core/renderers/webgl/shaders/Shader.js @@ -1,5 +1,5 @@ -var utils = require('../../../utils'), - CONST = require('../../../const'); +/*global console */ +var utils = require('../../../utils'); /** * @class @@ -444,7 +444,7 @@ break; default: - window.console.warn('Pixi.js Shader Warning: Unknown uniform type: ' + uniform.type); + console.warn('Pixi.js Shader Warning: Unknown uniform type: ' + uniform.type); } }; @@ -539,7 +539,7 @@ if (!this.gl.getShaderParameter(shader, this.gl.COMPILE_STATUS)) { - window.console.log(this.gl.getShaderInfoLog(shader)); + console.log(this.gl.getShaderInfoLog(shader)); return null; } diff --git a/src/core/renderers/webgl/utils/ObjectRenderer.js b/src/core/renderers/webgl/utils/ObjectRenderer.js index 9edbd1a..5609f81 100644 --- a/src/core/renderers/webgl/utils/ObjectRenderer.js +++ b/src/core/renderers/webgl/utils/ObjectRenderer.js @@ -49,7 +49,7 @@ * Renders an object * */ -ObjectRenderer.prototype.render = function (object) +ObjectRenderer.prototype.render = function (object) // jshint unused:false { // render the object }; diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js index 9c51a5a..d6302bd 100644 --- a/src/core/sprites/webgl/SpriteRenderer.js +++ b/src/core/sprites/webgl/SpriteRenderer.js @@ -1,5 +1,4 @@ var ObjectRenderer = require('../../renderers/webgl/utils/ObjectRenderer'), - Shader = require('../../renderers/webgl/shaders/Shader'), WebGLRenderer = require('../../renderers/webgl/WebGLRenderer'), CONST = require('../../const'); diff --git a/src/deprecation.js b/src/deprecation.js index 0543d0b..c873997 100644 --- a/src/deprecation.js +++ b/src/deprecation.js @@ -1,5 +1,4 @@ var core = require('./core'), - extras = require('./extras'), mesh = require('./mesh'), text = require('./text'); diff --git a/src/filters/color/ColorMatrixFilter.js b/src/filters/color/ColorMatrixFilter.js index 58b04c4..62ba739 100644 --- a/src/filters/color/ColorMatrixFilter.js +++ b/src/filters/color/ColorMatrixFilter.js @@ -270,7 +270,7 @@ * * @param multiply {boolean} refer to ._loadMatrix() method */ -ColorMatrixFilter.prototype.desaturate = function(multiply) +ColorMatrixFilter.prototype.desaturate = function(multiply) // jshint unused:false { this.saturation(-1); }; diff --git a/src/filters/dropshadow/BlurYTintFilter.js b/src/filters/dropshadow/BlurYTintFilter.js index 7e68d1b..d4eeb8a 100644 --- a/src/filters/dropshadow/BlurYTintFilter.js +++ b/src/filters/dropshadow/BlurYTintFilter.js @@ -1,5 +1,4 @@ -var core = require('../../core'), - blurFactor = 1 / 7000; +var core = require('../../core'); var fs = require('fs'); /** diff --git a/src/index.js b/src/index.js index c597c78..52b19c8 100644 --- a/src/index.js +++ b/src/index.js @@ -1,4 +1,4 @@ -require('./polyfill/requestAnimationFrame') +require('./polyfill/requestAnimationFrame'); var core = require('./core'); diff --git a/src/mesh/webgl/MeshRenderer.js b/src/mesh/webgl/MeshRenderer.js index a1e1ebc..718466c 100644 --- a/src/mesh/webgl/MeshRenderer.js +++ b/src/mesh/webgl/MeshRenderer.js @@ -194,16 +194,9 @@ */ MeshRenderer.prototype.start = function () { - var gl = this.renderer.gl, - shader = this.renderer.shaderManager.plugins.meshShader; + var shader = this.renderer.shaderManager.plugins.meshShader; this.renderer.shaderManager.setShader(shader); - - // dont need to upload! - //gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this.indices); - - - // this.s }; /** diff --git a/src/core/display/Container.js b/src/core/display/Container.js index d0f345b..df4d0f6 100644 --- a/src/core/display/Container.js +++ b/src/core/display/Container.js @@ -498,7 +498,7 @@ * @param renderer {WebGLRenderer} The renderer * @private */ -Container.prototype._renderWebGL = function (renderer) +Container.prototype._renderWebGL = function (renderer) // jshint unused:false { // this is where content itself gets rendered... }; @@ -509,7 +509,7 @@ * @param renderer {CanvasRenderer} The renderer * @private */ -Container.prototype._renderCanvas = function (renderer) +Container.prototype._renderCanvas = function (renderer) // jshint unused:false { // this is where content itself gets rendered... }; diff --git a/src/core/display/DisplayObject.js b/src/core/display/DisplayObject.js index 048b84a..5fbb708 100644 --- a/src/core/display/DisplayObject.js +++ b/src/core/display/DisplayObject.js @@ -349,7 +349,7 @@ * @param matrix {Matrix} * @return {Rectangle} the rectangular bounding area */ -DisplayObject.prototype.getBounds = function (matrix) +DisplayObject.prototype.getBounds = function (matrix) // jshint unused:false { return math.Rectangle.EMPTY; }; @@ -402,7 +402,7 @@ * @param renderer {WebGLRenderer} The renderer * @private */ -DisplayObject.prototype.renderWebGL = function (renderer) +DisplayObject.prototype.renderWebGL = function (renderer) // jshint unused:false { // OVERWRITE; }; @@ -413,7 +413,7 @@ * @param renderer {CanvasRenderer} The renderer * @private */ -DisplayObject.prototype.renderCanvas = function (renderer) +DisplayObject.prototype.renderCanvas = function (renderer) // jshint unused:false { // OVERWRITE; }; diff --git a/src/core/renderers/webgl/shaders/Shader.js b/src/core/renderers/webgl/shaders/Shader.js index 9f4ad0e..44de077 100644 --- a/src/core/renderers/webgl/shaders/Shader.js +++ b/src/core/renderers/webgl/shaders/Shader.js @@ -1,5 +1,5 @@ -var utils = require('../../../utils'), - CONST = require('../../../const'); +/*global console */ +var utils = require('../../../utils'); /** * @class @@ -444,7 +444,7 @@ break; default: - window.console.warn('Pixi.js Shader Warning: Unknown uniform type: ' + uniform.type); + console.warn('Pixi.js Shader Warning: Unknown uniform type: ' + uniform.type); } }; @@ -539,7 +539,7 @@ if (!this.gl.getShaderParameter(shader, this.gl.COMPILE_STATUS)) { - window.console.log(this.gl.getShaderInfoLog(shader)); + console.log(this.gl.getShaderInfoLog(shader)); return null; } diff --git a/src/core/renderers/webgl/utils/ObjectRenderer.js b/src/core/renderers/webgl/utils/ObjectRenderer.js index 9edbd1a..5609f81 100644 --- a/src/core/renderers/webgl/utils/ObjectRenderer.js +++ b/src/core/renderers/webgl/utils/ObjectRenderer.js @@ -49,7 +49,7 @@ * Renders an object * */ -ObjectRenderer.prototype.render = function (object) +ObjectRenderer.prototype.render = function (object) // jshint unused:false { // render the object }; diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js index 9c51a5a..d6302bd 100644 --- a/src/core/sprites/webgl/SpriteRenderer.js +++ b/src/core/sprites/webgl/SpriteRenderer.js @@ -1,5 +1,4 @@ var ObjectRenderer = require('../../renderers/webgl/utils/ObjectRenderer'), - Shader = require('../../renderers/webgl/shaders/Shader'), WebGLRenderer = require('../../renderers/webgl/WebGLRenderer'), CONST = require('../../const'); diff --git a/src/deprecation.js b/src/deprecation.js index 0543d0b..c873997 100644 --- a/src/deprecation.js +++ b/src/deprecation.js @@ -1,5 +1,4 @@ var core = require('./core'), - extras = require('./extras'), mesh = require('./mesh'), text = require('./text'); diff --git a/src/filters/color/ColorMatrixFilter.js b/src/filters/color/ColorMatrixFilter.js index 58b04c4..62ba739 100644 --- a/src/filters/color/ColorMatrixFilter.js +++ b/src/filters/color/ColorMatrixFilter.js @@ -270,7 +270,7 @@ * * @param multiply {boolean} refer to ._loadMatrix() method */ -ColorMatrixFilter.prototype.desaturate = function(multiply) +ColorMatrixFilter.prototype.desaturate = function(multiply) // jshint unused:false { this.saturation(-1); }; diff --git a/src/filters/dropshadow/BlurYTintFilter.js b/src/filters/dropshadow/BlurYTintFilter.js index 7e68d1b..d4eeb8a 100644 --- a/src/filters/dropshadow/BlurYTintFilter.js +++ b/src/filters/dropshadow/BlurYTintFilter.js @@ -1,5 +1,4 @@ -var core = require('../../core'), - blurFactor = 1 / 7000; +var core = require('../../core'); var fs = require('fs'); /** diff --git a/src/index.js b/src/index.js index c597c78..52b19c8 100644 --- a/src/index.js +++ b/src/index.js @@ -1,4 +1,4 @@ -require('./polyfill/requestAnimationFrame') +require('./polyfill/requestAnimationFrame'); var core = require('./core'); diff --git a/src/mesh/webgl/MeshRenderer.js b/src/mesh/webgl/MeshRenderer.js index a1e1ebc..718466c 100644 --- a/src/mesh/webgl/MeshRenderer.js +++ b/src/mesh/webgl/MeshRenderer.js @@ -194,16 +194,9 @@ */ MeshRenderer.prototype.start = function () { - var gl = this.renderer.gl, - shader = this.renderer.shaderManager.plugins.meshShader; + var shader = this.renderer.shaderManager.plugins.meshShader; this.renderer.shaderManager.setShader(shader); - - // dont need to upload! - //gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this.indices); - - - // this.s }; /** diff --git a/src/polyfill/requestAnimationFrame.js b/src/polyfill/requestAnimationFrame.js index 980a397..a3d1a99 100644 --- a/src/polyfill/requestAnimationFrame.js +++ b/src/polyfill/requestAnimationFrame.js @@ -54,7 +54,7 @@ return setTimeout(function () { lastTime = Date.now(); - callback(performance.now()); + callback(global.performance.now()); }, delay); }; }