mirror of
https://github.com/photonstorm/phaser
synced 2024-11-10 15:14:47 +00:00
jshint fixes.
This commit is contained in:
parent
f47fb7a7c7
commit
eba1743404
5 changed files with 103 additions and 150 deletions
|
@ -1,49 +0,0 @@
|
|||
{
|
||||
"globals" : { "Phaser": false, "PIXI": false, "p2": false },
|
||||
// Ignore Environment Globals
|
||||
"browser" : true, // Standard browser globals e.g. `window`, `document`.
|
||||
|
||||
// Development
|
||||
"devel" : true, // Allow developments statements e.g. `console.log();`.
|
||||
|
||||
// ECMAScript Support
|
||||
"es3" : true, // Support legacy browser and javascript environments.
|
||||
"esnext" : false, // This option tells JSHint that your code uses ECMAScript 6 specific syntax.
|
||||
"strict" : false, // Require `use strict` pragma in every file.
|
||||
"globalstrict": false, // Allow global "use strict" (also enables 'strict').
|
||||
|
||||
// Functionality
|
||||
"bitwise" : false, // Prohibit bitwise operators (&, |, ^, etc.).
|
||||
"boss" : true, // Tolerate assignments inside if, for & while. Usually conditions & loops are for comparison, not assignments.
|
||||
"camelcase" : false, // Force all variable names to use either camelCase style or UPPER_CASE with underscores.
|
||||
"curly" : true, // Require {} for every new block or scope.
|
||||
"eqeqeq" : false, // Require triple equals i.e. `===`.
|
||||
"eqnull" : true, // Tolerate use of `== null`.
|
||||
"evil" : false, // Tolerate use of `eval`.
|
||||
"expr" : false, // Tolerate `ExpressionStatement` as Programs.
|
||||
"forin" : false, // Tolerate `for in` loops without `hasOwnPrototype`.
|
||||
"freeze" : true, // Prohibits overwriting prototypes of native objects such as Array and Date.
|
||||
"funcscope" : true, // This option suppresses warnings about declaring variables inside of control structures while accessing them later from the outside.
|
||||
"immed" : true, // Require immediate invocations to be wrapped in parens e.g. `( function(){}() );`
|
||||
"latedef" : true, // Prohibit variable use before definition.
|
||||
"laxbreak" : false, // Tolerate unsafe line breaks e.g. `return [\n] x` without semicolons.
|
||||
"laxcomma" : false, // This option suppresses warnings about comma-first coding style.
|
||||
"loopfunc" : true, // Allow functions to be defined within loops.
|
||||
"noarg" : true, // Prohibit use of `arguments.caller` and `arguments.callee`.
|
||||
"notypeof" : false, // This option suppresses warnings about invalid typeof operator values.
|
||||
"shadow" : true, // Allows re-define variables later in code e.g. `var x=1; x=2;`.
|
||||
"smarttabs" : false, // This option suppresses warnings about mixed tabs and spaces when the latter are used for alignmnent only.
|
||||
"supernew" : false, // Tolerate `new function () { ... };` and `new Object;`.
|
||||
"undef" : true, // Require all non-global variables be declared before they are used.
|
||||
"unused" : true, // This option warns when you define and never use your variables.
|
||||
|
||||
// Styling
|
||||
"indent" : false, // Specify indentation spacing
|
||||
"newcap" : true, // Require capitalization of all constructor functions e.g. `new F()`.
|
||||
"noempty" : true, // Prohibit use of empty blocks.
|
||||
"nonew" : true, // Prohibit use of constructors for side-effects.
|
||||
"plusplus" : false, // Prohibit use of `++` & `--`.
|
||||
"quotmark" : false, // This option enforces the consistency of quotation marks used throughout your code.
|
||||
"sub" : true, // Tolerate all forms of subscript notation besides dot notation e.g. `dict['key']` instead of `dict.key`.
|
||||
"trailing" : true // Prohibit trailing whitespaces.
|
||||
}
|
|
@ -58,9 +58,7 @@ PIXI.AlphaMaskFilter = function(texture)
|
|||
' vec4 original = texture2D(uSampler, vTextureCoord);',
|
||||
' float maskAlpha = texture2D(mask, mapCords).r;',
|
||||
' original *= maskAlpha;',
|
||||
//' original.rgb *= maskAlpha;',
|
||||
' gl_FragColor = original;',
|
||||
//' gl_FragColor = gl_FragColor;',
|
||||
'}'
|
||||
];
|
||||
};
|
||||
|
@ -88,9 +86,11 @@ PIXI.AlphaMaskFilter.prototype.onTextureLoaded = function()
|
|||
* @type Texture
|
||||
*/
|
||||
Object.defineProperty(PIXI.AlphaMaskFilter.prototype, 'map', {
|
||||
|
||||
get: function() {
|
||||
return this.uniforms.mask.value;
|
||||
},
|
||||
|
||||
set: function(value) {
|
||||
this.uniforms.mask.value = value;
|
||||
}
|
||||
|
|
|
@ -77,9 +77,11 @@ PIXI.AsciiFilter.prototype.constructor = PIXI.AsciiFilter;
|
|||
* @type Number
|
||||
*/
|
||||
Object.defineProperty(PIXI.AsciiFilter.prototype, 'size', {
|
||||
|
||||
get: function() {
|
||||
return this.uniforms.pixelSize.value;
|
||||
},
|
||||
|
||||
set: function(value) {
|
||||
this.dirty = true;
|
||||
this.uniforms.pixelSize.value = value;
|
||||
|
|
|
@ -132,7 +132,7 @@ PIXI.NormalMapFilter = function(texture)
|
|||
"}"
|
||||
];
|
||||
|
||||
}
|
||||
};
|
||||
|
||||
PIXI.NormalMapFilter.prototype = Object.create( PIXI.AbstractFilter.prototype );
|
||||
PIXI.NormalMapFilter.prototype.constructor = PIXI.NormalMapFilter;
|
||||
|
@ -147,7 +147,7 @@ PIXI.NormalMapFilter.prototype.onTextureLoaded = function()
|
|||
this.uniforms.mapDimensions.value.x = this.uniforms.displacementMap.value.width;
|
||||
this.uniforms.mapDimensions.value.y = this.uniforms.displacementMap.value.height;
|
||||
|
||||
this.uniforms.displacementMap.value.baseTexture.off("loaded", this.boundLoadedFunction)
|
||||
this.uniforms.displacementMap.value.baseTexture.off("loaded", this.boundLoadedFunction);
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in a new issue