Skip to content

Commit 232f8e0

Browse files
committed
Updated to use new uniforms and fixed renderWebGL parameters
1 parent bba88b3 commit 232f8e0

1 file changed

Lines changed: 13 additions & 10 deletions

File tree

src/renderer/webgl/pipelines/BitmapMaskPipeline.js

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,16 @@ var BitmapMaskPipeline = new Class({
6464
location: -1
6565
}
6666
]);
67+
config.uniforms = GetFastValue(config, 'uniforms', [
68+
'uResolution',
69+
'uMainSampler',
70+
'uMaskSampler',
71+
'uInvertMaskAlpha'
72+
]);
6773

6874
WebGLPipeline.call(this, config);
75+
76+
// this.forceZero = true;
6977
},
7078

7179
/**
@@ -86,12 +94,9 @@ var BitmapMaskPipeline = new Class({
8694

8795
WebGLPipeline.prototype.bind.call(this, reset);
8896

89-
var renderer = this.renderer;
90-
var program = this.program;
91-
92-
renderer.setFloat2(program, 'uResolution', this.width, this.height);
93-
renderer.setInt1(program, 'uMainSampler', 0);
94-
renderer.setInt1(program, 'uMaskSampler', 1);
97+
this.set2f('uResolution', this.width, this.height);
98+
this.set1i('uMainSampler', 0);
99+
this.set1i('uMaskSampler', 1);
95100

96101
return this;
97102
},
@@ -124,9 +129,7 @@ var BitmapMaskPipeline = new Class({
124129
renderer.setFramebuffer(mask.mainFramebuffer);
125130

126131
gl.disable(gl.STENCIL_TEST);
127-
128132
gl.clearColor(0, 0, 0, 0);
129-
130133
gl.clear(gl.COLOR_BUFFER_BIT);
131134

132135
if (renderer.currentCameraMask.mask !== mask)
@@ -168,7 +171,7 @@ var BitmapMaskPipeline = new Class({
168171

169172
renderer.setBlendMode(0, true);
170173

171-
bitmapMask.renderWebGL(renderer, bitmapMask, 0, camera);
174+
bitmapMask.renderWebGL(renderer, bitmapMask, camera);
172175

173176
renderer.flush();
174177

@@ -197,7 +200,7 @@ var BitmapMaskPipeline = new Class({
197200
gl.activeTexture(gl.TEXTURE0);
198201
gl.bindTexture(gl.TEXTURE_2D, mask.mainTexture);
199202

200-
gl.uniform1i(gl.getUniformLocation(this.program, 'uInvertMaskAlpha'), mask.invertAlpha);
203+
this.set1i('uInvertMaskAlpha', mask.invertAlpha);
201204

202205
// Finally, draw a triangle filling the whole screen
203206
gl.drawArrays(this.topology, 0, 3);

0 commit comments

Comments
 (0)