jeena/pixi.js
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Jshinted code

Browse source
This commit is contained in:
Mat Groves 2014-01-24 00:08:05 +00:00
parent b45c70574d
commit f127cfe1ef
8 changed files with 37 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

51
bin/pixi.dev.js
View file

@ -4387,11 +4387,11 @@ PIXI.PixiShader.prototype.syncUniforms = function()
PIXI.PixiShader.prototype.destroy = function() PIXI.PixiShader.prototype.destroy = function()
{ {
this.gl.deleteProgram( this.program ); this.gl.deleteProgram( this.program );
this.uniforms = null this.uniforms = null;
this.gl = null; this.gl = null;
this.attributes = null this.attributes = null;
} };
PIXI.PixiShader.defaultVertexSrc = [ PIXI.PixiShader.defaultVertexSrc = [
'attribute vec2 aVertexPosition;', 'attribute vec2 aVertexPosition;',
@ -4543,11 +4543,11 @@ PIXI.PixiFastShader.prototype.init = function()
PIXI.PixiFastShader.prototype.destroy = function() PIXI.PixiFastShader.prototype.destroy = function()
{ {
this.gl.deleteProgram( this.program ); this.gl.deleteProgram( this.program );
this.uniforms = null this.uniforms = null;
this.gl = null; this.gl = null;
this.attributes = null this.attributes = null;
} };
/** /**
* @author Mat Groves http://matgroves.com/ @Doormat23 * @author Mat Groves http://matgroves.com/ @Doormat23
@ -4688,11 +4688,10 @@ PIXI.PrimitiveShader.prototype.init = function()
PIXI.PrimitiveShader.prototype.destroy = function() PIXI.PrimitiveShader.prototype.destroy = function()
{ {
this.gl.deleteProgram( this.program ); this.gl.deleteProgram( this.program );
this.uniforms = null this.uniforms = null;
this.gl = null; this.gl = null;
this.attribute = null;
this.attribute = null
}; };
/** /**
@ -5790,7 +5789,7 @@ PIXI.WebGLMaskManager.prototype.destroy = function()
{ {
this.maskStack = null; this.maskStack = null;
this.gl = null; this.gl = null;
} };
/** /**
* @author Mat Groves http://matgroves.com/ @Doormat23 * @author Mat Groves http://matgroves.com/ @Doormat23
*/ */
@ -5902,19 +5901,19 @@ PIXI.WebGLShaderManager.prototype.deactivatePrimitiveShader = function()
this.setAttribs(this.defaultShader.attributes); this.setAttribs(this.defaultShader.attributes);
}; };
PIXI.WebGLShaderManager.prototype.destroy = function(gl) PIXI.WebGLShaderManager.prototype.destroy = function()
{ {
this.attribState = null; this.attribState = null;
this.tempAttribState = null; this.tempAttribState = null;
this.primitiveShader.destroy() this.primitiveShader.destroy();
this.defaultShader.destroy() this.defaultShader.destroy();
this.fastShader.destroy() this.fastShader.destroy();
this.gl = null this.gl = null;
}; };
@ -6320,29 +6319,9 @@ PIXI.WebGLSpriteBatch.prototype.destroy = function()
this.currentBaseTexture = null; this.currentBaseTexture = null;
this.gl = null this.gl = null;
}; };
PIXI.WebGLSpriteBatch.prototype.setContext = function(gl)
{
this.gl = gl;
// create a couple of buffers
this.vertexBuffer = gl.createBuffer();
this.indexBuffer = gl.createBuffer();
// 65535 is max index, so 65535 / 6 = 10922.
//upload the index data
gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this.indexBuffer);
gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, this.indices, gl.STATIC_DRAW);
gl.bindBuffer(gl.ARRAY_BUFFER, this.vertexBuffer);
gl.bufferData(gl.ARRAY_BUFFER, this.vertices, gl.DYNAMIC_DRAW);
this.currentBlendMode = 99999;
}
/** /**
* @author Mat Groves * @author Mat Groves

10
bin/pixi.js
View file

File diff suppressed because one or more lines are too long

6
src/pixi/renderers/webgl/shaders/PixiFastShader.js
View file

@ -123,8 +123,8 @@ PIXI.PixiFastShader.prototype.init = function()
PIXI.PixiFastShader.prototype.destroy = function() PIXI.PixiFastShader.prototype.destroy = function()
{ {
this.gl.deleteProgram( this.program ); this.gl.deleteProgram( this.program );
this.uniforms = null this.uniforms = null;
this.gl = null; this.gl = null;
this.attributes = null this.attributes = null;
} };

6
src/pixi/renderers/webgl/shaders/PixiShader.js
View file

@ -300,11 +300,11 @@ PIXI.PixiShader.prototype.syncUniforms = function()
PIXI.PixiShader.prototype.destroy = function() PIXI.PixiShader.prototype.destroy = function()
{ {
this.gl.deleteProgram( this.program ); this.gl.deleteProgram( this.program );
this.uniforms = null this.uniforms = null;
this.gl = null; this.gl = null;
this.attributes = null this.attributes = null;
} };
PIXI.PixiShader.defaultVertexSrc = [ PIXI.PixiShader.defaultVertexSrc = [
'attribute vec2 aVertexPosition;', 'attribute vec2 aVertexPosition;',

5
src/pixi/renderers/webgl/shaders/PrimitiveShader.js
View file

@ -69,9 +69,8 @@ PIXI.PrimitiveShader.prototype.init = function()
PIXI.PrimitiveShader.prototype.destroy = function() PIXI.PrimitiveShader.prototype.destroy = function()
{ {
this.gl.deleteProgram( this.program ); this.gl.deleteProgram( this.program );
this.uniforms = null this.uniforms = null;
this.gl = null; this.gl = null;
this.attribute = null;
this.attribute = null
}; };

2
src/pixi/renderers/webgl/utils/WebGLMaskManager.js
View file

@ -66,4 +66,4 @@ PIXI.WebGLMaskManager.prototype.destroy = function()
{ {
this.maskStack = null; this.maskStack = null;
this.gl = null; this.gl = null;
} };

10
src/pixi/renderers/webgl/utils/WebGLShaderManager.js
View file

@ -109,18 +109,18 @@ PIXI.WebGLShaderManager.prototype.deactivatePrimitiveShader = function()
this.setAttribs(this.defaultShader.attributes); this.setAttribs(this.defaultShader.attributes);
}; };
PIXI.WebGLShaderManager.prototype.destroy = function(gl) PIXI.WebGLShaderManager.prototype.destroy = function()
{ {
this.attribState = null; this.attribState = null;
this.tempAttribState = null; this.tempAttribState = null;
this.primitiveShader.destroy() this.primitiveShader.destroy();
this.defaultShader.destroy() this.defaultShader.destroy();
this.fastShader.destroy() this.fastShader.destroy();
this.gl = null this.gl = null;
}; };

22
src/pixi/renderers/webgl/utils/WebGLSpriteBatch.js
View file

@ -400,26 +400,6 @@ PIXI.WebGLSpriteBatch.prototype.destroy = function()
this.currentBaseTexture = null; this.currentBaseTexture = null;
this.gl = null this.gl = null;
}; };
PIXI.WebGLSpriteBatch.prototype.setContext = function(gl)
{
this.gl = gl;
// create a couple of buffers
this.vertexBuffer = gl.createBuffer();
this.indexBuffer = gl.createBuffer();
// 65535 is max index, so 65535 / 6 = 10922.
//upload the index data
gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this.indexBuffer);
gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, this.indices, gl.STATIC_DRAW);
gl.bindBuffer(gl.ARRAY_BUFFER, this.vertexBuffer);
gl.bufferData(gl.ARRAY_BUFFER, this.vertices, gl.DYNAMIC_DRAW);
this.currentBlendMode = 99999;
}