Skip to content

Commit 0715656

Browse files
committed
Fixed Particle Renderer errors
1 parent 9b18a81 commit 0715656

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

v3/src/checksum.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
var CHECKSUM = {
2-
build: 'bb3f6b90-dd1b-11e6-9f7f-6937ccaffca9'
2+
build: '45162530-dd20-11e6-9516-fbf368a07f31'
33
};
44
module.exports = CHECKSUM;

v3/src/renderer/webgl/renderers/ParticleRenderer.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@ ParticleRenderer.prototype.init = function ()
8686
var vertexDataBuffer = new VertexBuffer(ParticleRenderer.VERTEX_SIZE * ParticleRenderer.PARTICLE_VERTEX_COUNT * ParticleRenderer.MAX_PARTICLES);
8787
var indexDataBuffer = new IndexBuffer(ParticleRenderer.INDEX_SIZE * ParticleRenderer.PARTICLE_INDEX_COUNT * ParticleRenderer.MAX_PARTICLES);
8888
var vertShader = CreateShader(gl, ParticleRenderer.VERTEX_SHADER_SOURCE, gl.VERTEX_SHADER);
89-
var fragShader = CreateShader(gl, ParticleRenderer.FRAGMENT_SHADER_SOURCE, gl.FRAGMENT_SHADER_SOURCE);
89+
var fragShader = CreateShader(gl, ParticleRenderer.FRAGMENT_SHADER_SOURCE, gl.FRAGMENT_SHADER);
9090
var program = CreateProgram(gl, vertShader, fragShader);
9191
var indexBufferObject = CreateBuffer(gl, gl.ELEMENT_ARRAY_BUFFER, gl.STATIC_DRAW, null, indexDataBuffer.getByteCapacity());
92-
var vertexArray = new VertexArray(gl,
92+
var vertexArray = new VertexArray(
9393
CreateBuffer(gl, gl.ARRAY_BUFFER, gl.STREAM_DRAW, null, vertexDataBuffer.getByteCapacity()),
9494
[
9595
CreateAttribDesc(gl, program, 'a_position', 2, gl.FLOAT, false, ParticleRenderer.VERTEX_SIZE, 0),
@@ -124,7 +124,9 @@ ParticleRenderer.prototype.init = function ()
124124
indexBuffer[indexA + 4] = indexB + 2;
125125
indexBuffer[indexA + 5] = indexB + 3;
126126
}
127+
this.bind();
127128
this.resize(this.width, this.height);
129+
this.unbind();
128130
}
129131
else
130132
{
@@ -208,7 +210,7 @@ ParticleRenderer.prototype.bind = function ()
208210
gl.enable(gl.BLEND);
209211
gl.blendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA);
210212
gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this.indexBufferObject);
211-
BindVertexArray(this.vertexArray);
213+
BindVertexArray(gl, this.vertexArray);
212214
};
213215

214216
ParticleRenderer.prototype.unbind = function ()

0 commit comments

Comments
 (0)