Skip to content

Commit 3b6f3ef

Browse files
committed
RenderPass fix
1 parent 2c9c220 commit 3b6f3ef

4 files changed

Lines changed: 18 additions & 1 deletion

File tree

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
var Shader = {
2+
3+
shader: null,
4+
5+
setShader: function (shader)
6+
{
7+
this.shader = shader;
8+
}
9+
10+
};
11+
12+
module.exports = Shader;

v3/src/gameobjects/components/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ module.exports = {
1414
RenderTarget: require('./RenderTarget'),
1515
ScaleMode: require('./ScaleMode'),
1616
ScrollFactor: require('./ScrollFactor'),
17+
Shader: require('./Shader'),
1718
Size: require('./Size'),
1819
Texture: require('./Texture'),
1920
Tint: require('./Tint'),

v3/src/gameobjects/renderpass/RenderPass.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,8 @@ var RenderPass = new Class({
134134

135135
if (gl && !renderer.contextLost)
136136
{
137+
//gameObject.setShader(this.passShader);
138+
gameObject.setRenderTarget(this.passRenderTarget);
137139
gameObject.renderWebGL(renderer, gameObject, 0.0, camera);
138140

139141
for (var key in this.textures)
@@ -145,6 +147,8 @@ var RenderPass = new Class({
145147
gl.activeTexture(gl.TEXTURE0);
146148
}
147149
renderer.currentRenderer.flush(this.passShader, this.passRenderTarget);
150+
gameObject.setRenderTarget(null);
151+
//gameObject.setShader(null);
148152
}
149153
},
150154

v3/src/renderer/webgl/renderers/shapebatch/ShapeBatch.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ var ShapeBatch = new Class({
101101
},
102102

103103
flush: function (shader, renderTarget)
104-
{
104+
{
105105
var gl = this.glContext;
106106
var vertexDataBuffer = this.vertexDataBuffer;
107107

0 commit comments

Comments
 (0)