Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2024-11-24 05:33:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed issue with disabled vertex attribute

Browse source
This commit is contained in:
Felipe Alfonso 2016-07-19 22:06:37 -04:00
parent 601573b62c
commit 1f72355e8a
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -98,10 +98,8 @@ PIXI.PixiShader.prototype.init = function()
'const vec4 PINK = vec4(1.0, 0.0, 1.0, 1.0);',
'const vec4 GREEN = vec4(0.0, 1.0, 0.0, 1.0);',
'void main(void) {',
//dynamicIfs,
'if (vTextureIndex == 0.0) gl_FragColor = texture2D(uSamplerArray[0], vTextureCoord) * vColor;',
'else if(vTextureIndex == 1.0) gl_FragColor = PINK;',
'else gl_FragColor = GREEN;',
dynamicIfs,
'else gl_FragColor = PINK;',
'}'
];
@ -144,7 +142,7 @@ PIXI.PixiShader.prototype.init = function()
this.colorAttribute = 2;
}
this.attributes = [this.aVertexPosition, this.aTextureCoord, this.colorAttribute];
this.attributes = [this.aVertexPosition, this.aTextureCoord, this.colorAttribute, this.aTextureIndex];
// End worst hack eva //
@ -417,6 +415,7 @@ PIXI.PixiShader.defaultVertexSrc = [
'const vec2 center = vec2(-1.0, 1.0);',
'void main(void) {',
' if (aTextureIndex > 0.0) gl_Position = vec4(0.0);',
' gl_Position = vec4( ((aVertexPosition + offsetVector) / projectionVector) + center , 0.0, 1.0);',
' vTextureCoord = aTextureCoord;',
' vColor = vec4(aColor.rgb * aColor.a, aColor.a);',