Skip to content

Commit a4e45a9

Browse files
committed
Merge branch 'master' of https://github.com/photonstorm/phaser
2 parents 352ec91 + 1058cff commit a4e45a9

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

src/gameobjects/rendertexture/RenderTextureWebGL.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@ var RenderTextureWebGL = {
2929
var glTexture = texture.source[frame.sourceIndex].glTexture;
3030
var tint = (this.globalTint >> 16) + (this.globalTint & 0xff00) + ((this.globalTint & 0xff) << 16);
3131
this.renderer.setFramebuffer(this.framebuffer);
32-
this.renderer.pipelines.TextureTintPipeline.drawTexture(glTexture, x, y, tint, this.globalAlpha, frame.cutX, frame.cutY, frame.cutWidth, frame.cutHeight, this.currentMatrix);
32+
this.renderer.pipelines.TextureTintPipeline.projOrtho(0, this.renderer.pipelines.TextureTintPipeline.width, 0, this.renderer.pipelines.TextureTintPipeline.height, -1000.0, 1000.0);
33+
this.renderer.pipelines.TextureTintPipeline.drawTexture(glTexture, x, y, tint, this.globalAlpha, frame.cutX, frame.cutY, frame.cutWidth, frame.cutHeight, this.currentMatrix, null, this);
3334
this.renderer.setFramebuffer(null);
35+
this.renderer.pipelines.TextureTintPipeline.projOrtho(0, this.renderer.pipelines.TextureTintPipeline.width, this.renderer.pipelines.TextureTintPipeline.height, 0, -1000.0, 1000.0);
3436
return this;
3537
}
3638

src/gameobjects/rendertexture/RenderTextureWebGLRenderer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ var RenderTextureWebGLRenderer = function (renderer, renderTexture, interpolatio
3737
renderTexture.width, renderTexture.height,
3838
renderTexture.scaleX, renderTexture.scaleY,
3939
renderTexture.rotation,
40-
renderTexture.flipX, renderTexture.flipY,
40+
renderTexture.flipX, !renderTexture.flipY,
4141
renderTexture.scrollFactorX, renderTexture.scrollFactorY,
4242
renderTexture.displayOriginX, renderTexture.displayOriginY,
4343
0, 0, renderTexture.texture.width, renderTexture.texture.height,

0 commit comments

Comments
 (0)