Skip to content

Commit 8075974

Browse files
author
pandamicro
committed
Revert "Remove overwrite in webgl context object"
This reverts commit 6d965db.
1 parent 6d965db commit 8075974

14 files changed

+163
-169
lines changed

Diff for: ‎cocos2d/core/CCDrawingPrimitivesWebGL.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ cc.DrawingPrimitiveWebGL = cc.Class.extend(/** @lends cc.DrawingPrimitiveWebGL#
8888
this._shader.setUniformLocationWith1f(this._pointSizeLocation, this._pointSize);
8989

9090
var pointBuffer = glContext.createBuffer();
91-
cc.glBindBuffer(glContext.ARRAY_BUFFER, pointBuffer);
91+
glContext.bindBuffer(glContext.ARRAY_BUFFER, pointBuffer);
9292
glContext.bufferData(glContext.ARRAY_BUFFER, new Float32Array([point.x, point.y]), glContext.STATIC_DRAW);
9393
glContext.vertexAttribPointer(cc.VERTEX_ATTRIB_POSITION, 2, glContext.FLOAT, false, 0, 0);
9494

@@ -117,7 +117,7 @@ cc.DrawingPrimitiveWebGL = cc.Class.extend(/** @lends cc.DrawingPrimitiveWebGL#
117117
this._shader.setUniformLocationWith1f(this._pointSizeLocation, this._pointSize);
118118

119119
var pointBuffer = glContext.createBuffer();
120-
cc.glBindBuffer(glContext.ARRAY_BUFFER, pointBuffer);
120+
glContext.bindBuffer(glContext.ARRAY_BUFFER, pointBuffer);
121121
glContext.bufferData(glContext.ARRAY_BUFFER, this._pointsToTypeArray(points), glContext.STATIC_DRAW);
122122
glContext.vertexAttribPointer(cc.VERTEX_ATTRIB_POSITION, 2, glContext.FLOAT, false, 0, 0);
123123

@@ -151,7 +151,7 @@ cc.DrawingPrimitiveWebGL = cc.Class.extend(/** @lends cc.DrawingPrimitiveWebGL#
151151
this._shader.setUniformLocationWith4fv(this._colorLocation, this._colorArray);
152152

153153
var pointBuffer = glContext.createBuffer();
154-
cc.glBindBuffer(glContext.ARRAY_BUFFER, pointBuffer);
154+
glContext.bindBuffer(glContext.ARRAY_BUFFER, pointBuffer);
155155
glContext.bufferData(glContext.ARRAY_BUFFER, this._pointsToTypeArray([origin, destination]), glContext.STATIC_DRAW);
156156
glContext.vertexAttribPointer(cc.VERTEX_ATTRIB_POSITION, 2, glContext.FLOAT, false, 0, 0);
157157

@@ -206,7 +206,7 @@ cc.DrawingPrimitiveWebGL = cc.Class.extend(/** @lends cc.DrawingPrimitiveWebGL#
206206
this._shader.setUniformLocationWith4fv(this._colorLocation, this._colorArray);
207207

208208
var pointBuffer = glContext.createBuffer();
209-
cc.glBindBuffer(glContext.ARRAY_BUFFER, pointBuffer);
209+
glContext.bindBuffer(glContext.ARRAY_BUFFER, pointBuffer);
210210
glContext.bufferData(glContext.ARRAY_BUFFER, this._pointsToTypeArray(vertices), glContext.STATIC_DRAW);
211211
glContext.vertexAttribPointer(cc.VERTEX_ATTRIB_POSITION, 2, glContext.FLOAT, false, 0, 0);
212212

@@ -237,7 +237,7 @@ cc.DrawingPrimitiveWebGL = cc.Class.extend(/** @lends cc.DrawingPrimitiveWebGL#
237237
this._shader.setUniformLocationWith4fv(this._colorLocation, this._colorArray);
238238

239239
var pointBuffer = glContext.createBuffer();
240-
cc.glBindBuffer(glContext.ARRAY_BUFFER, pointBuffer);
240+
glContext.bindBuffer(glContext.ARRAY_BUFFER, pointBuffer);
241241
glContext.bufferData(glContext.ARRAY_BUFFER, this._pointsToTypeArray(poli), glContext.STATIC_DRAW);
242242
glContext.vertexAttribPointer(cc.VERTEX_ATTRIB_POSITION, 2, glContext.FLOAT, false, 0, 0);
243243
glContext.drawArrays(glContext.TRIANGLE_FAN, 0, poli.length);
@@ -285,7 +285,7 @@ cc.DrawingPrimitiveWebGL = cc.Class.extend(/** @lends cc.DrawingPrimitiveWebGL#
285285
this._shader.setUniformLocationWith4fv(this._colorLocation, this._colorArray);
286286

287287
var pointBuffer = glContext.createBuffer();
288-
cc.glBindBuffer(glContext.ARRAY_BUFFER, pointBuffer);
288+
glContext.bindBuffer(glContext.ARRAY_BUFFER, pointBuffer);
289289
glContext.bufferData(glContext.ARRAY_BUFFER, vertices, glContext.STATIC_DRAW);
290290
glContext.vertexAttribPointer(cc.VERTEX_ATTRIB_POSITION, 2, glContext.FLOAT, false, 0, 0);
291291

@@ -323,7 +323,7 @@ cc.DrawingPrimitiveWebGL = cc.Class.extend(/** @lends cc.DrawingPrimitiveWebGL#
323323
this._shader.setUniformLocationWith4fv(this._colorLocation, this._colorArray);
324324

325325
var pointBuffer = glContext.createBuffer();
326-
cc.glBindBuffer(glContext.ARRAY_BUFFER, pointBuffer);
326+
glContext.bindBuffer(glContext.ARRAY_BUFFER, pointBuffer);
327327
glContext.bufferData(glContext.ARRAY_BUFFER, vertices, glContext.STATIC_DRAW);
328328
glContext.vertexAttribPointer(cc.VERTEX_ATTRIB_POSITION, 2, glContext.FLOAT, false, 0, 0);
329329

@@ -362,7 +362,7 @@ cc.DrawingPrimitiveWebGL = cc.Class.extend(/** @lends cc.DrawingPrimitiveWebGL#
362362
this._shader.setUniformLocationWith4fv(this._colorLocation, this._colorArray);
363363

364364
var pointBuffer = glContext.createBuffer();
365-
cc.glBindBuffer(glContext.ARRAY_BUFFER, pointBuffer);
365+
glContext.bindBuffer(glContext.ARRAY_BUFFER, pointBuffer);
366366
glContext.bufferData(glContext.ARRAY_BUFFER, vertices, glContext.STATIC_DRAW);
367367
glContext.vertexAttribPointer(cc.VERTEX_ATTRIB_POSITION, 2, glContext.FLOAT, false, 0, 0);
368368
glContext.drawArrays(glContext.LINE_STRIP, 0, segments + 1);
@@ -422,7 +422,7 @@ cc.DrawingPrimitiveWebGL = cc.Class.extend(/** @lends cc.DrawingPrimitiveWebGL#
422422
this._shader.setUniformLocationWith4fv(this._colorLocation, this._colorArray);
423423

424424
var pointBuffer = glContext.createBuffer();
425-
cc.glBindBuffer(glContext.ARRAY_BUFFER, pointBuffer);
425+
glContext.bindBuffer(glContext.ARRAY_BUFFER, pointBuffer);
426426
glContext.bufferData(glContext.ARRAY_BUFFER, vertices, glContext.STATIC_DRAW);
427427
glContext.vertexAttribPointer(cc.VERTEX_ATTRIB_POSITION, 2, glContext.FLOAT, false, 0, 0);
428428
glContext.drawArrays(glContext.LINE_STRIP, 0, segments + 1);

Diff for: ‎cocos2d/core/layers/CCLayerWebGLRenderCmd.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,10 @@
101101
//
102102
// Attributes
103103
//
104-
cc.glBindBuffer(context.ARRAY_BUFFER, this._verticesFloat32Buffer);
104+
context.bindBuffer(context.ARRAY_BUFFER, this._verticesFloat32Buffer);
105105
context.vertexAttribPointer(cc.VERTEX_ATTRIB_POSITION, 3, context.FLOAT, false, 0, 0);
106106

107-
cc.glBindBuffer(context.ARRAY_BUFFER, this._colorsUint8Buffer);
107+
context.bindBuffer(context.ARRAY_BUFFER, this._colorsUint8Buffer);
108108
context.vertexAttribPointer(cc.VERTEX_ATTRIB_COLOR, 4, context.UNSIGNED_BYTE, true, 0, 0);
109109

110110
context.drawArrays(context.TRIANGLE_STRIP, 0, this._squareVertices.length);
@@ -144,13 +144,13 @@
144144

145145
proto._bindLayerVerticesBufferData = function(){
146146
var glContext = cc._renderContext;
147-
cc.glBindBuffer(glContext.ARRAY_BUFFER, this._verticesFloat32Buffer);
147+
glContext.bindBuffer(glContext.ARRAY_BUFFER, this._verticesFloat32Buffer);
148148
glContext.bufferData(glContext.ARRAY_BUFFER, this._squareVerticesAB, glContext.DYNAMIC_DRAW);
149149
};
150150

151151
proto._bindLayerColorsBufferData = function(){
152152
var glContext = cc._renderContext;
153-
cc.glBindBuffer(glContext.ARRAY_BUFFER, this._colorsUint8Buffer);
153+
glContext.bindBuffer(glContext.ARRAY_BUFFER, this._colorsUint8Buffer);
154154
glContext.bufferData(glContext.ARRAY_BUFFER, this._squareColorsAB, glContext.STATIC_DRAW);
155155
};
156156

@@ -313,9 +313,9 @@
313313
//
314314
// Attributes
315315
//
316-
cc.glBindBuffer(context.ARRAY_BUFFER, this._verticesFloat32Buffer);
316+
context.bindBuffer(context.ARRAY_BUFFER, this._verticesFloat32Buffer);
317317
context.vertexAttribPointer(cc.VERTEX_ATTRIB_POSITION, 3, context.FLOAT, false, 0, 0);
318-
cc.glBindBuffer(context.ARRAY_BUFFER, this._colorsUint8Buffer);
318+
context.bindBuffer(context.ARRAY_BUFFER, this._colorsUint8Buffer);
319319
context.vertexAttribPointer(cc.VERTEX_ATTRIB_COLOR, 4, context.UNSIGNED_BYTE, true, 0, 0);
320320
context.drawArrays(context.TRIANGLE_STRIP, 0, this._squareVertices.length);
321321

Diff for: ‎cocos2d/core/renderer/GlobalVertexBuffer.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ var GlobalVertexBuffer = function (gl) {
3939
this.dataArray = new Float32Array(this.data);
4040

4141
// Init buffer data
42-
cc.glBindBuffer(gl.ARRAY_BUFFER, this.vertexBuffer);
42+
gl.bindBuffer(gl.ARRAY_BUFFER, this.vertexBuffer);
4343
gl.bufferData(gl.ARRAY_BUFFER, this.dataArray, gl.DYNAMIC_DRAW);
4444

4545
this._dirty = false;
@@ -114,7 +114,7 @@ GlobalVertexBuffer.prototype = {
114114

115115
update: function () {
116116
if (this._dirty) {
117-
cc.glBindBuffer(gl.ARRAY_BUFFER, this.vertexBuffer);
117+
this.gl.bindBuffer(gl.ARRAY_BUFFER, this.vertexBuffer);
118118
// Note: Can memorize different dirty zones and update them separately, maybe faster
119119
this.gl.bufferSubData(gl.ARRAY_BUFFER, 0, this.dataArray);
120120
this._dirty = false;

Diff for: ‎cocos2d/core/renderer/RendererWebGL.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ return {
315315
cc.glBlendFunc(_batchedInfo.blendSrc, _batchedInfo.blendDst);
316316
cc.glBindTexture2DN(0, texture); // = cc.glBindTexture2D(texture);
317317

318-
var _bufferchanged = !cc.glBindBuffer(gl.ARRAY_BUFFER, _quadVertexBuffer);
318+
var _bufferchanged = !gl.bindBuffer(gl.ARRAY_BUFFER, _quadVertexBuffer);
319319
// upload the vertex data to the gl buffer
320320
if (_batchingSize > _vertexSize * 0.5) {
321321
gl.bufferData(gl.ARRAY_BUFFER, _vertexDataF32, gl.DYNAMIC_DRAW);
@@ -334,7 +334,7 @@ return {
334334
gl.vertexAttribPointer(cc.VERTEX_ATTRIB_TEX_COORDS, 2, gl.FLOAT, false, 24, 16);
335335
}
336336

337-
cc.glBindBuffer(gl.ELEMENT_ARRAY_BUFFER, _quadIndexBuffer);
337+
gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, _quadIndexBuffer);
338338
gl.drawElements(gl.TRIANGLES, count * 6, gl.UNSIGNED_SHORT, 0);
339339

340340
cc.g_NumberOfDraws++;
@@ -352,7 +352,7 @@ return {
352352
context = ctx || cc._renderContext;
353353

354354
// Reset buffer for rendering
355-
cc.glBindBuffer(gl.ARRAY_BUFFER, null);
355+
context.bindBuffer(gl.ARRAY_BUFFER, null);
356356

357357
for (i = 0, len = locCmds.length; i < len; ++i) {
358358
cmd = locCmds[i];

Diff for: ‎cocos2d/core/textures/CCTextureAtlas.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -211,10 +211,10 @@ cc.TextureAtlas = cc.Class.extend(/** @lends cc.TextureAtlas# */{ //WebGL only
211211
_mapBuffers: function () {
212212
var gl = cc._renderContext;
213213

214-
cc.glBindBuffer(gl.ARRAY_BUFFER, this._quadsWebBuffer);
214+
gl.bindBuffer(gl.ARRAY_BUFFER, this._quadsWebBuffer);
215215
gl.bufferData(gl.ARRAY_BUFFER, this._quadsArrayBuffer, gl.DYNAMIC_DRAW);
216216

217-
cc.glBindBuffer(gl.ELEMENT_ARRAY_BUFFER, this._buffersVBO[1]);
217+
gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this._buffersVBO[1]);
218218
gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, this._indices, gl.STATIC_DRAW);
219219
},
220220

Diff for: ‎cocos2d/core/textures/TexturesWebGL.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -795,10 +795,10 @@ cc._tmp.WebGLTextureAtlas = function () {
795795
var _t = this;
796796
var gl = cc._renderContext;
797797

798-
cc.glBindBuffer(gl.ARRAY_BUFFER, _t._quadsWebBuffer);
798+
gl.bindBuffer(gl.ARRAY_BUFFER, _t._quadsWebBuffer);
799799
gl.bufferData(gl.ARRAY_BUFFER, _t._quadsArrayBuffer, gl.DYNAMIC_DRAW);
800800

801-
cc.glBindBuffer(gl.ELEMENT_ARRAY_BUFFER, _t._buffersVBO[1]);
801+
gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, _t._buffersVBO[1]);
802802
gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, _t._indices, gl.STATIC_DRAW);
803803

804804
//cc.checkGLErrorDebug();
@@ -823,10 +823,10 @@ cc._tmp.WebGLTextureAtlas = function () {
823823
// Using VBO without VAO
824824
//
825825
//vertices
826-
cc.glBindBuffer(gl.ARRAY_BUFFER, _t._buffersVBO[0]);
826+
//gl.bindBuffer(gl.ARRAY_BUFFER, _t._buffersVBO[0]);
827827
// XXX: update is done in draw... perhaps it should be done in a timer
828828

829-
cc.glBindBuffer(gl.ARRAY_BUFFER, _t._quadsWebBuffer);
829+
gl.bindBuffer(gl.ARRAY_BUFFER, _t._quadsWebBuffer);
830830
if (_t.dirty){
831831
gl.bufferData(gl.ARRAY_BUFFER, _t._quadsArrayBuffer, gl.DYNAMIC_DRAW);
832832
_t.dirty = false;
@@ -840,7 +840,7 @@ cc._tmp.WebGLTextureAtlas = function () {
840840
gl.vertexAttribPointer(cc.VERTEX_ATTRIB_COLOR, 4, gl.UNSIGNED_BYTE, true, 24, 12); // colors
841841
gl.vertexAttribPointer(cc.VERTEX_ATTRIB_TEX_COORDS, 2, gl.FLOAT, false, 24, 16); // tex coords
842842

843-
cc.glBindBuffer(gl.ELEMENT_ARRAY_BUFFER, _t._buffersVBO[1]);
843+
gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, _t._buffersVBO[1]);
844844

845845
if (cc.TEXTURE_ATLAS_USE_TRIANGLE_STRIP)
846846
gl.drawElements(gl.TRIANGLE_STRIP, n * 6, gl.UNSIGNED_SHORT, start * 6 * _t._indices.BYTES_PER_ELEMENT);

Diff for: ‎cocos2d/effects/CCGrid.js

+12-12
Original file line numberDiff line numberDiff line change
@@ -456,18 +456,18 @@ cc.Grid3D = cc.GridBase.extend(/** @lends cc.Grid3D# */{
456456
// Attributes
457457
//
458458
// position
459-
cc.glBindBuffer(gl.ARRAY_BUFFER, this._verticesBuffer);
459+
gl.bindBuffer(gl.ARRAY_BUFFER, this._verticesBuffer);
460460
if (locDirty)
461461
gl.bufferData(gl.ARRAY_BUFFER, this._vertices, gl.DYNAMIC_DRAW);
462462
gl.vertexAttribPointer(cc.VERTEX_ATTRIB_POSITION, 3, gl.FLOAT, false, 0, 0);
463463

464464
// texCoords
465-
cc.glBindBuffer(gl.ARRAY_BUFFER, this._texCoordinateBuffer);
465+
gl.bindBuffer(gl.ARRAY_BUFFER, this._texCoordinateBuffer);
466466
if (locDirty)
467467
gl.bufferData(gl.ARRAY_BUFFER, this._texCoordinates, gl.DYNAMIC_DRAW);
468468
gl.vertexAttribPointer(cc.VERTEX_ATTRIB_TEX_COORDS, 2, gl.FLOAT, false, 0, 0);
469469

470-
cc.glBindBuffer(gl.ELEMENT_ARRAY_BUFFER, this._indicesBuffer);
470+
gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this._indicesBuffer);
471471
if (locDirty)
472472
gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, this._indices, gl.STATIC_DRAW);
473473
gl.drawElements(gl.TRIANGLES, n * 6, gl.UNSIGNED_SHORT, 0);
@@ -553,11 +553,11 @@ cc.Grid3D = cc.GridBase.extend(/** @lends cc.Grid3D# */{
553553
}
554554
this._originalVertices = new Float32Array(this._vertices);
555555

556-
cc.glBindBuffer(gl.ARRAY_BUFFER, this._verticesBuffer);
556+
gl.bindBuffer(gl.ARRAY_BUFFER, this._verticesBuffer);
557557
gl.bufferData(gl.ARRAY_BUFFER, this._vertices, gl.DYNAMIC_DRAW);
558-
cc.glBindBuffer(gl.ARRAY_BUFFER, this._texCoordinateBuffer);
558+
gl.bindBuffer(gl.ARRAY_BUFFER, this._texCoordinateBuffer);
559559
gl.bufferData(gl.ARRAY_BUFFER, this._texCoordinates, gl.DYNAMIC_DRAW);
560-
cc.glBindBuffer(gl.ELEMENT_ARRAY_BUFFER, this._indicesBuffer);
560+
gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this._indicesBuffer);
561561
gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, this._indices, gl.STATIC_DRAW);
562562
this._dirty = true;
563563
},
@@ -727,18 +727,18 @@ cc.TiledGrid3D = cc.GridBase.extend(/** @lends cc.TiledGrid3D# */{
727727
gl.enableVertexAttribArray(cc.VERTEX_ATTRIB_TEX_COORDS);
728728

729729
// position
730-
cc.glBindBuffer(gl.ARRAY_BUFFER, this._verticesBuffer);
730+
gl.bindBuffer(gl.ARRAY_BUFFER, this._verticesBuffer);
731731
if (locDirty)
732732
gl.bufferData(gl.ARRAY_BUFFER, this._vertices, gl.DYNAMIC_DRAW);
733733
gl.vertexAttribPointer(cc.VERTEX_ATTRIB_POSITION, 3, gl.FLOAT, false, 0, this._vertices);
734734

735735
// texCoords
736-
cc.glBindBuffer(gl.ARRAY_BUFFER, this._texCoordinateBuffer);
736+
gl.bindBuffer(gl.ARRAY_BUFFER, this._texCoordinateBuffer);
737737
if (locDirty)
738738
gl.bufferData(gl.ARRAY_BUFFER, this._texCoordinates, gl.DYNAMIC_DRAW);
739739
gl.vertexAttribPointer(cc.VERTEX_ATTRIB_TEX_COORDS, 2, gl.FLOAT, false, 0, this._texCoordinates);
740740

741-
cc.glBindBuffer(gl.ELEMENT_ARRAY_BUFFER, this._indicesBuffer);
741+
gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this._indicesBuffer);
742742
if (locDirty)
743743
gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, this._indices, gl.STATIC_DRAW);
744744
gl.drawElements(gl.TRIANGLES, n * 6, gl.UNSIGNED_SHORT, 0);
@@ -832,11 +832,11 @@ cc.TiledGrid3D = cc.GridBase.extend(/** @lends cc.TiledGrid3D# */{
832832
}
833833
this._originalVertices = new Float32Array(this._vertices);
834834

835-
cc.glBindBuffer(gl.ARRAY_BUFFER, this._verticesBuffer);
835+
gl.bindBuffer(gl.ARRAY_BUFFER, this._verticesBuffer);
836836
gl.bufferData(gl.ARRAY_BUFFER, this._vertices, gl.DYNAMIC_DRAW);
837-
cc.glBindBuffer(gl.ARRAY_BUFFER, this._texCoordinateBuffer);
837+
gl.bindBuffer(gl.ARRAY_BUFFER, this._texCoordinateBuffer);
838838
gl.bufferData(gl.ARRAY_BUFFER, this._texCoordinates, gl.DYNAMIC_DRAW);
839-
cc.glBindBuffer(gl.ELEMENT_ARRAY_BUFFER, this._indicesBuffer);
839+
gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this._indicesBuffer);
840840
gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, this._indices, gl.DYNAMIC_DRAW);
841841
this._dirty = true;
842842
}

Diff for: ‎cocos2d/motion-streak/CCMotionStreak.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -290,11 +290,11 @@ cc.MotionStreak = cc.Node.extend(/** @lends cc.MotionStreak# */{
290290
this.scheduleUpdate();
291291

292292
//bind buffer
293-
cc.glBindBuffer(gl.ARRAY_BUFFER, this._verticesBuffer);
293+
gl.bindBuffer(gl.ARRAY_BUFFER, this._verticesBuffer);
294294
gl.bufferData(gl.ARRAY_BUFFER, this._vertices, gl.DYNAMIC_DRAW);
295-
cc.glBindBuffer(gl.ARRAY_BUFFER, this._texCoordsBuffer);
295+
gl.bindBuffer(gl.ARRAY_BUFFER, this._texCoordsBuffer);
296296
gl.bufferData(gl.ARRAY_BUFFER, this._texCoords, gl.DYNAMIC_DRAW);
297-
cc.glBindBuffer(gl.ARRAY_BUFFER, this._colorPointerBuffer);
297+
gl.bindBuffer(gl.ARRAY_BUFFER, this._colorPointerBuffer);
298298
gl.bufferData(gl.ARRAY_BUFFER, this._colorPointer, gl.DYNAMIC_DRAW);
299299

300300
return true;

Diff for: ‎cocos2d/motion-streak/CCMotionStreakWebGLRenderCmd.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,17 @@ cc.MotionStreak.WebGLRenderCmd.prototype.rendering = function(ctx){
6060
ctx.enableVertexAttribArray(cc.VERTEX_ATTRIB_TEX_COORDS);
6161

6262
//position
63-
cc.glBindBuffer(ctx.ARRAY_BUFFER, node._verticesBuffer);
63+
ctx.bindBuffer(ctx.ARRAY_BUFFER, node._verticesBuffer);
6464
ctx.bufferData(ctx.ARRAY_BUFFER, node._vertices, ctx.DYNAMIC_DRAW);
6565
ctx.vertexAttribPointer(cc.VERTEX_ATTRIB_POSITION, 2, ctx.FLOAT, false, 0, 0);
6666

6767
//texcoords
68-
cc.glBindBuffer(ctx.ARRAY_BUFFER, node._texCoordsBuffer);
68+
ctx.bindBuffer(ctx.ARRAY_BUFFER, node._texCoordsBuffer);
6969
ctx.bufferData(ctx.ARRAY_BUFFER, node._texCoords, ctx.DYNAMIC_DRAW);
7070
ctx.vertexAttribPointer(cc.VERTEX_ATTRIB_TEX_COORDS, 2, ctx.FLOAT, false, 0, 0);
7171

7272
//colors
73-
cc.glBindBuffer(ctx.ARRAY_BUFFER, node._colorPointerBuffer);
73+
ctx.bindBuffer(ctx.ARRAY_BUFFER, node._colorPointerBuffer);
7474
ctx.bufferData(ctx.ARRAY_BUFFER, node._colorPointer, ctx.DYNAMIC_DRAW);
7575
ctx.vertexAttribPointer(cc.VERTEX_ATTRIB_COLOR, 4, ctx.UNSIGNED_BYTE, true, 0, 0);
7676

Diff for: ‎cocos2d/particle/CCParticleSystemWebGLRenderCmd.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -210,12 +210,12 @@
210210
gl.enableVertexAttribArray(cc.VERTEX_ATTRIB_COLOR);
211211
gl.enableVertexAttribArray(cc.VERTEX_ATTRIB_TEX_COORDS);
212212

213-
cc.glBindBuffer(gl.ARRAY_BUFFER, this._buffersVBO[0]);
213+
gl.bindBuffer(gl.ARRAY_BUFFER, this._buffersVBO[0]);
214214
gl.vertexAttribPointer(cc.VERTEX_ATTRIB_POSITION, 3, gl.FLOAT, false, 24, 0); // vertices
215215
gl.vertexAttribPointer(cc.VERTEX_ATTRIB_COLOR, 4, gl.UNSIGNED_BYTE, true, 24, 12); // colors
216216
gl.vertexAttribPointer(cc.VERTEX_ATTRIB_TEX_COORDS, 2, gl.FLOAT, false, 24, 16); // tex coords
217217

218-
cc.glBindBuffer(gl.ELEMENT_ARRAY_BUFFER, this._buffersVBO[1]);
218+
gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this._buffersVBO[1]);
219219
gl.drawElements(gl.TRIANGLES, node._particleIdx * 6, gl.UNSIGNED_SHORT, 0);
220220
};
221221

@@ -341,11 +341,11 @@
341341

342342
//gl.deleteBuffer(this._buffersVBO[0]);
343343
this._buffersVBO[0] = gl.createBuffer();
344-
cc.glBindBuffer(gl.ARRAY_BUFFER, this._buffersVBO[0]);
344+
gl.bindBuffer(gl.ARRAY_BUFFER, this._buffersVBO[0]);
345345
gl.bufferData(gl.ARRAY_BUFFER, this._quadsArrayBuffer, gl.DYNAMIC_DRAW);
346346

347347
this._buffersVBO[1] = gl.createBuffer();
348-
cc.glBindBuffer(gl.ELEMENT_ARRAY_BUFFER, this._buffersVBO[1]);
348+
gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this._buffersVBO[1]);
349349
gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, this._indices, gl.STATIC_DRAW);
350350

351351
//cc.checkGLErrorDebug();
@@ -378,7 +378,7 @@
378378

379379
proto.postStep = function(){
380380
var gl = cc._renderContext;
381-
cc.glBindBuffer(gl.ARRAY_BUFFER, this._buffersVBO[0]);
381+
gl.bindBuffer(gl.ARRAY_BUFFER, this._buffersVBO[0]);
382382
gl.bufferSubData(gl.ARRAY_BUFFER, 0, this._quadsArrayBuffer);
383383
};
384384

Diff for: ‎cocos2d/progress-timer/CCProgressTimerWebGLRenderCmd.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
var blendFunc = node._sprite._blendFunc;
7171
cc.glBlendFunc(blendFunc.src, blendFunc.dst);
7272
cc.glBindTexture2D(node._sprite.texture);
73-
cc.glBindBuffer(context.ARRAY_BUFFER, this._vertexWebGLBuffer);
73+
context.bindBuffer(context.ARRAY_BUFFER, this._vertexWebGLBuffer);
7474

7575
context.enableVertexAttribArray(cc.VERTEX_ATTRIB_POSITION);
7676
context.enableVertexAttribArray(cc.VERTEX_ATTRIB_COLOR);
@@ -220,7 +220,7 @@
220220
}
221221

222222
// Init buffer data
223-
cc.glBindBuffer(gl.ARRAY_BUFFER, this._vertexWebGLBuffer);
223+
gl.bindBuffer(gl.ARRAY_BUFFER, this._vertexWebGLBuffer);
224224
gl.bufferData(gl.ARRAY_BUFFER, this._float32View, gl.DYNAMIC_DRAW);
225225

226226
this._vertexDataCount = 0;

0 commit comments

Comments
 (0)