Skip to content

Commit

Permalink
Merge pull request #817 from dingpinglv/Iss1615_WebGLRendering
Browse files Browse the repository at this point in the history 
Fixed #1615 rename constant variable for Compatible with JSB
  • Loading branch information
SeanLin committed Mar 17, 2013
2 parents 98e831e + 5adc66e commit e37dfab
Show file tree
Hide file tree
Showing 14 changed files with 25 additions and 24 deletions.
2 changes: 1 addition & 1 deletion cocos2d/Draw_Nodes/CCDrawNode.js
View file
Expand Up @@ -327,7 +327,7 @@ cc.DrawNodeWebGL = cc.Node.extend(/** @lends cc.DrawNodeWebGL# */{

// texcood
gl.bindBuffer(gl.ARRAY_BUFFER, this._texCoordF32Buffer);
gl.vertexAttribPointer(cc.VERTEX_ATTRIB_TEXCOORDS, 2, gl.FLOAT, false, 0, 0);
gl.vertexAttribPointer(cc.VERTEX_ATTRIB_TEX_COORDS, 2, gl.FLOAT, false, 0, 0);

gl.drawArrays(gl.TRIANGLES, 0, this._buffer.length * 3);
cc.INCREMENT_GL_DRAWS(1);
Expand Down
4 changes: 2 additions & 2 deletions cocos2d/effects/CCGrid.js
View file
Expand Up @@ -331,7 +331,7 @@ cc.Grid3D = cc.GridBase.extend(/** @lends cc.Grid3D# */{
gl.bindBuffer(gl.ARRAY_BUFFER, this._texCoordinateBuffer);
if (this._dirty)
gl.bufferData(gl.ARRAY_BUFFER, this._texCoordinates, gl.DYNAMIC_DRAW);
gl.vertexAttribPointer(cc.VERTEX_ATTRIB_TEXCOORDS, 2, gl.FLOAT, false, 0, 0);
gl.vertexAttribPointer(cc.VERTEX_ATTRIB_TEX_COORDS, 2, gl.FLOAT, false, 0, 0);

gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this._indicesBuffer);
if (this._dirty)
Expand Down Expand Up @@ -525,7 +525,7 @@ cc.TiledGrid3D = cc.GridBase.extend(/** @lends cc.TiledGrid3D# */{
gl.bindBuffer(gl.ARRAY_BUFFER, this._texCoordinateBuffer);
if (this._dirty)
gl.bufferData(gl.ARRAY_BUFFER, this._texCoordinates, gl.DYNAMIC_DRAW);
gl.vertexAttribPointer(cc.VERTEX_ATTRIB_TEXCOORDS, 2, gl.FLOAT, false, 0, this._texCoordinates);
gl.vertexAttribPointer(cc.VERTEX_ATTRIB_TEX_COORDS, 2, gl.FLOAT, false, 0, this._texCoordinates);

gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this._indicesBuffer);
if (this._dirty)
Expand Down
2 changes: 1 addition & 1 deletion cocos2d/misc_nodes/CCClippingNode.js
View file
Expand Up @@ -207,7 +207,7 @@ cc.ClippingNode = cc.Node.extend(/** @lends cc.ClippingNode# */{
// since glAlphaTest do not exists in OES, use a shader that writes
// pixel only if greater than an alpha threshold
var program = cc.ShaderCache.getInstance().programForKey(cc.SHADER_POSITION_TEXTURECOLORALPHATEST);
var alphaValueLocation = gl.getUniformLocation(program.getProgram(), cc.UNIFORM_ALPHATEST_VALUE);
var alphaValueLocation = gl.getUniformLocation(program.getProgram(), cc.UNIFORM_ALPHA_TEST_VALUE_S);
// set our alphaThreshold
cc.glUseProgram(program.getProgram());
program.setUniformLocationWith1f(alphaValueLocation, this._alphaThreshold);
Expand Down
2 changes: 1 addition & 1 deletion cocos2d/misc_nodes/CCMotionStreak.js
View file
Expand Up @@ -276,7 +276,7 @@ cc.MotionStreak = cc.Node.extend(/** @lends cc.MotionStreak# */{
//texcoords
ctx.bindBuffer(ctx.ARRAY_BUFFER, this._texCoordsBuffer);
ctx.bufferData(ctx.ARRAY_BUFFER, this._texCoords, ctx.DYNAMIC_DRAW);
ctx.vertexAttribPointer(cc.VERTEX_ATTRIB_TEXCOORDS, 2, ctx.FLOAT, false, 0, 0);
ctx.vertexAttribPointer(cc.VERTEX_ATTRIB_TEX_COORDS, 2, ctx.FLOAT, false, 0, 0);

//colors
ctx.bindBuffer(ctx.ARRAY_BUFFER, this._colorPointerBuffer);
Expand Down
2 changes: 1 addition & 1 deletion cocos2d/misc_nodes/CCProgressTimer.js
View file
Expand Up @@ -753,7 +753,7 @@ cc.ProgressTimerWebGL = cc.Node.extend(/** @lends cc.ProgressTimerWebGL# */{
context.vertexAttribPointer(cc.VERTEX_ATTRIB_POSITION, 2, context.FLOAT, false, 0, 0);

context.bindBuffer(context.ARRAY_BUFFER, this._textureCoordsFloat32Buffer);
context.vertexAttribPointer(cc.VERTEX_ATTRIB_TEXCOORDS, 2, context.FLOAT, false, 0, 0);
context.vertexAttribPointer(cc.VERTEX_ATTRIB_TEX_COORDS, 2, context.FLOAT, false, 0, 0);

context.bindBuffer(context.ARRAY_BUFFER, this._colorsUint8Buffer);
context.vertexAttribPointer(cc.VERTEX_ATTRIB_COLOR, 4, context.UNSIGNED_BYTE, true, 0, 0);
Expand Down
2 changes: 1 addition & 1 deletion cocos2d/particle_nodes/CCParticleSystemQuad.js
View file
Expand Up @@ -629,7 +629,7 @@ cc.ParticleSystemQuad = cc.ParticleSystem.extend(/** @lends cc.ParticleSystemQua

// tex coords
gl.bindBuffer(gl.ARRAY_BUFFER, this._texCoordsArrayBuffer);
gl.vertexAttribPointer(cc.VERTEX_ATTRIB_TEXCOORDS, 2, gl.FLOAT, false, 0, 0);
gl.vertexAttribPointer(cc.VERTEX_ATTRIB_TEX_COORDS, 2, gl.FLOAT, false, 0, 0);

gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this._buffersVBO[1]);

Expand Down
3 changes: 2 additions & 1 deletion cocos2d/platform/CCEGLView.js
View file
Expand Up @@ -100,7 +100,8 @@ cc.EGLView = cc.Class.extend(/** @lends cc.EGLView# */{
var ele = document.documentElement;
cc.canvas.width = ele.clientWidth;
cc.canvas.height = ele.clientHeight;
cc.renderContext.translate(0, cc.canvas.height);
if(!("opengl" in sys.capabilities))
cc.renderContext.translate(0, cc.canvas.height);
var parent = document.querySelector("#" + document['ccConfig']['tag']).parentNode;
if (parent) {
parent.style.width = cc.canvas.width + "px";
Expand Down
6 changes: 3 additions & 3 deletions cocos2d/shaders/CCGLProgram.js
View file
Expand Up @@ -41,7 +41,7 @@ cc.VERTEX_ATTRIB_COLOR = 1;
* @constant
* @type {Number}
*/
cc.VERTEX_ATTRIB_TEXCOORDS = 2;
cc.VERTEX_ATTRIB_TEX_COORDS = 2;
/**
* @constant
* @type {Number}
Expand Down Expand Up @@ -182,7 +182,7 @@ cc.UNIFORM_SAMPLER_S = "CC_Texture0";
* @constant
* @type {String}
*/
cc.UNIFORM_ALPHATEST_VALUE = "CC_alpha_value";
cc.UNIFORM_ALPHA_TEST_VALUE_S = "CC_alpha_value";

//------------Attribute names--------------
/**
Expand All @@ -199,7 +199,7 @@ cc.ATTRIBUTE_NAME_POSITION = "a_position";
* @constant
* @type {String}
*/
cc.ATTRIBUTE_NAME_TEXCOORD = "a_texCoord";
cc.ATTRIBUTE_NAME_TEX_COORD = "a_texCoord";

cc.HashUniformEntry = function (value, location, hh) {
this.value = value;
Expand Down
4 changes: 2 additions & 2 deletions cocos2d/shaders/ccGLStateCache.js
View file
Expand Up @@ -213,9 +213,9 @@ cc.glEnableVertexAttribs = function (flags) {

if (enableTexCoords != cc._vertexAttribTexCoords) {
if (enableTexCoords)
cc.renderContext.enableVertexAttribArray(cc.VERTEX_ATTRIB_TEXCOORDS);
cc.renderContext.enableVertexAttribArray(cc.VERTEX_ATTRIB_TEX_COORDS);
else
cc.renderContext.disableVertexAttribArray(cc.VERTEX_ATTRIB_TEXCOORDS);
cc.renderContext.disableVertexAttribArray(cc.VERTEX_ATTRIB_TEX_COORDS);

cc._vertexAttribTexCoords = enableTexCoords;
}
Expand Down
12 changes: 6 additions & 6 deletions cocos2d/shaders/ccShaderCache.js
View file
Expand Up @@ -92,14 +92,14 @@ cc.ShaderCache = cc.Class.extend({

program.addAttribute(cc.ATTRIBUTE_NAME_POSITION, cc.VERTEX_ATTRIB_POSITION);
program.addAttribute(cc.ATTRIBUTE_NAME_COLOR, cc.VERTEX_ATTRIB_COLOR);
program.addAttribute(cc.ATTRIBUTE_NAME_TEXCOORD, cc.VERTEX_ATTRIB_TEXCOORDS);
program.addAttribute(cc.ATTRIBUTE_NAME_TEX_COORD, cc.VERTEX_ATTRIB_TEX_COORDS);
break;
case cc.SHADERTYPE_POSITION_TEXTURECOLOR_ALPHATEST:
program.initWithVertexShaderByteArray(cc.SHADER_POSITION_TEXTURE_COLOR_VERT, cc.SHADER_POSITION_TEXTURE_COLOR_ALPHATEST_FRAG);

program.addAttribute(cc.ATTRIBUTE_NAME_POSITION, cc.VERTEX_ATTRIB_POSITION);
program.addAttribute(cc.ATTRIBUTE_NAME_COLOR, cc.VERTEX_ATTRIB_COLOR);
program.addAttribute(cc.ATTRIBUTE_NAME_TEXCOORD, cc.VERTEX_ATTRIB_TEXCOORDS);
program.addAttribute(cc.ATTRIBUTE_NAME_TEX_COORD, cc.VERTEX_ATTRIB_TEX_COORDS);
break;
case cc.SHADERTYPE_POSITION_COLOR:
program.initWithVertexShaderByteArray(cc.SHADER_POSITION_COLOR_VERT, cc.SHADER_POSITION_COLOR_FRAG);
Expand All @@ -111,20 +111,20 @@ cc.ShaderCache = cc.Class.extend({
program.initWithVertexShaderByteArray(cc.SHADER_POSITION_TEXTURE_VERT, cc.SHADER_POSITION_TEXTURE_FRAG);

program.addAttribute(cc.ATTRIBUTE_NAME_POSITION, cc.VERTEX_ATTRIB_POSITION);
program.addAttribute(cc.ATTRIBUTE_NAME_TEXCOORD, cc.VERTEX_ATTRIB_TEXCOORDS);
program.addAttribute(cc.ATTRIBUTE_NAME_TEX_COORD, cc.VERTEX_ATTRIB_TEX_COORDS);
break;
case cc.SHADERTYPE_POSITION_TEXTURE_UCOLOR:
program.initWithVertexShaderByteArray(cc.SHADER_POSITION_TEXTURE_UCOLOR_VERT, cc.SHADER_POSITION_TEXTURE_UCOLOR_FRAG);

program.addAttribute(cc.ATTRIBUTE_NAME_POSITION, cc.VERTEX_ATTRIB_POSITION);
program.addAttribute(cc.ATTRIBUTE_NAME_TEXCOORD, cc.VERTEX_ATTRIB_TEXCOORDS);
program.addAttribute(cc.ATTRIBUTE_NAME_TEX_COORD, cc.VERTEX_ATTRIB_TEX_COORDS);
break;
case cc.SHADERTYPE_POSITION_TEXTURE_A8COLOR:
program.initWithVertexShaderByteArray(cc.SHADER_POSITION_TEXTURE_A8COLOR_VERT, cc.SHADER_POSITION_TEXTURE_A8COLOR_FRAG);

program.addAttribute(cc.ATTRIBUTE_NAME_POSITION, cc.VERTEX_ATTRIB_POSITION);
program.addAttribute(cc.ATTRIBUTE_NAME_COLOR, cc.VERTEX_ATTRIB_COLOR);
program.addAttribute(cc.ATTRIBUTE_NAME_TEXCOORD, cc.VERTEX_ATTRIB_TEXCOORDS);
program.addAttribute(cc.ATTRIBUTE_NAME_TEX_COORD, cc.VERTEX_ATTRIB_TEX_COORDS);
break;
case cc.SHADERTYPE_POSITION_UCOLOR:
program.initWithVertexShaderByteArray(cc.SHADER_POSITION_UCOLOR_VERT, cc.SHADER_POSITION_UCOLOR_FRAG);
Expand All @@ -134,7 +134,7 @@ cc.ShaderCache = cc.Class.extend({
program.initWithVertexShaderByteArray(cc.SHADER_POSITION_COLOR_LENGTH_TEXTURE_VERT, cc.SHADER_POSITION_COLOR_LENGTH_TEXTURE_FRAG);

program.addAttribute(cc.ATTRIBUTE_NAME_POSITION, cc.VERTEX_ATTRIB_POSITION);
program.addAttribute(cc.ATTRIBUTE_NAME_TEXCOORD, cc.VERTEX_ATTRIB_TEXCOORDS);
program.addAttribute(cc.ATTRIBUTE_NAME_TEX_COORD, cc.VERTEX_ATTRIB_TEX_COORDS);
program.addAttribute(cc.ATTRIBUTE_NAME_COLOR, cc.VERTEX_ATTRIB_COLOR);
break;
default:
Expand Down
2 changes: 1 addition & 1 deletion cocos2d/sprite_nodes/CCSprite.js
View file
Expand Up @@ -2656,7 +2656,7 @@ cc.SpriteWebGL = cc.Node.extend(/** @lends cc.SpriteWebGL# */{
gl.vertexAttribPointer(cc.VERTEX_ATTRIB_POSITION, 3, gl.FLOAT, false, 0, 0);

gl.bindBuffer(gl.ARRAY_BUFFER, this._textureCoordsFloat32Buffer);
gl.vertexAttribPointer(cc.VERTEX_ATTRIB_TEXCOORDS, 2, gl.FLOAT, false, 0, 0);
gl.vertexAttribPointer(cc.VERTEX_ATTRIB_TEX_COORDS, 2, gl.FLOAT, false, 0, 0);
} else {
var shaderProgram = cc.ShaderCache.getInstance().programForKey(cc.SHADER_POSITION_COLOR);
if (shaderProgram) {
Expand Down
4 changes: 2 additions & 2 deletions cocos2d/textures/CCTexture2D.js
View file
Expand Up @@ -374,7 +374,7 @@ cc.Texture2D = cc.Class.extend(/** @lends cc.Texture2D# */{

var gl = cc.renderContext;
gl.vertexAttribPointer(cc.VERTEX_ATTRIB_POSITION, 2, gl.FLOAT, false, 0, vertices);
gl.vertexAttribPointer(cc.VERTEX_ATTRIB_TEXCOORDS, 2, gl.FLOAT, false, 0, coordinates);
gl.vertexAttribPointer(cc.VERTEX_ATTRIB_TEX_COORDS, 2, gl.FLOAT, false, 0, coordinates);

gl.drawArrays(gl.TRIANGLE_STRIP, 0, 4);
},
Expand Down Expand Up @@ -403,7 +403,7 @@ cc.Texture2D = cc.Class.extend(/** @lends cc.Texture2D# */{

var gl = cc.renderContext;
gl.vertexAttribPointer(cc.VERTEX_ATTRIB_POSITION, 2, gl.FLOAT, false, 0, vertices);
gl.vertexAttribPointer(cc.VERTEX_ATTRIB_TEXCOORDS, 2, gl.FLOAT, false, 0, coordinates);
gl.vertexAttribPointer(cc.VERTEX_ATTRIB_TEX_COORDS, 2, gl.FLOAT, false, 0, coordinates);

gl.drawArrays(gl.TRIANGLE_STRIP, 0, 4);
},
Expand Down
2 changes: 1 addition & 1 deletion cocos2d/textures/CCTextureAtlas.js
View file
Expand Up @@ -571,7 +571,7 @@ cc.TextureAtlas = cc.Class.extend(/** @lends cc.TextureAtlas# */{
gl.bindBuffer(gl.ARRAY_BUFFER, this._texCoordsArrayBuffer);
if (this._dirty)
gl.bufferData(gl.ARRAY_BUFFER, this._texCoordsArray, gl.DYNAMIC_DRAW);
gl.vertexAttribPointer(cc.VERTEX_ATTRIB_TEXCOORDS, 2, gl.FLOAT, false, 0, 0);
gl.vertexAttribPointer(cc.VERTEX_ATTRIB_TEX_COORDS, 2, gl.FLOAT, false, 0, 0);

if (this._dirty)
this._dirty = false;
Expand Down
2 changes: 1 addition & 1 deletion cocos2d/tileMap_parallax_nodes/CCTMXLayer.js
View file
Expand Up @@ -637,7 +637,7 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{

if (cc.renderContextType === cc.WEBGL) {
this.setShaderProgram(cc.ShaderCache.getInstance().programForKey(cc.SHADER_POSITION_TEXTURECOLORALPHATEST));
var alphaValueLocation = cc.renderContext.getUniformLocation(this.getShaderProgram().getProgram(), cc.UNIFORM_ALPHATEST_VALUE);
var alphaValueLocation = cc.renderContext.getUniformLocation(this.getShaderProgram().getProgram(), cc.UNIFORM_ALPHA_TEST_VALUE_S);
// NOTE: alpha test shader is hard-coded to use the equivalent of a glAlphaFunc(GL_GREATER) comparison
this.getShaderProgram().use();
this.getShaderProgram().setUniformLocationWith1f(alphaValueLocation, alphaFuncValue);
Expand Down

0 comments on commit e37dfab

Please sign in to comment.