Skip to content

Commit 7562683

Browse files
committed
Lots of tiny fixes and updates
1 parent 775134e commit 7562683

1 file changed

Lines changed: 14 additions & 28 deletions

File tree

src/gameobjects/rendertexture/RenderTexture.js

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ var RenderTexture = new Class({
267267
{
268268
this.drawGameObject = this.batchGameObjectWebGL;
269269

270-
this.renderTarget = new RenderTarget(renderer, renderer.width, renderer.height, 1, 0, false, true);
270+
this.renderTarget = new RenderTarget(renderer, width, height, 1, 0, false);
271271
}
272272
else if (renderer.type === CONST.CANVAS)
273273
{
@@ -345,18 +345,18 @@ var RenderTexture = new Class({
345345
this.texture.width = width;
346346
this.texture.height = height;
347347

348-
/*
349348
var renderTarget = this.renderTarget;
350349

351350
if (renderTarget)
352351
{
353-
// renderTarget.resize(width, height);
352+
renderTarget.resize(width, height);
353+
354+
frame.glTexture = renderTarget.texture;
354355

355356
frame.source.isRenderTexture = true;
357+
frame.source.isGLTexture = true;
356358
frame.source.glTexture = renderTarget.texture;
357-
frame.glTexture = renderTarget.texture;
358359
}
359-
*/
360360

361361
frame.source.width = width;
362362
frame.source.height = height;
@@ -517,9 +517,7 @@ var RenderTexture = new Class({
517517
var cw = camera.width;
518518
var ch = camera.height;
519519

520-
renderer.flush();
521-
522-
renderTarget.bind();
520+
renderTarget.bind(true);
523521

524522
var pipeline = this.pipeline;
525523

@@ -726,15 +724,11 @@ var RenderTexture = new Class({
726724

727725
if (renderTarget)
728726
{
729-
renderer.flush();
730-
731-
renderTarget.bind();
727+
renderTarget.bind(true);
732728

733729
this.batchList(entries, x, y, alpha, tint);
734730

735-
renderer.flush();
736-
737-
renderTarget.unbind();
731+
renderTarget.unbind(true);
738732
}
739733
else
740734
{
@@ -796,7 +790,6 @@ var RenderTexture = new Class({
796790
}
797791

798792
var camera = this.camera;
799-
var renderer = this.renderer;
800793
var renderTarget = this.renderTarget;
801794
var textureFrame = this.textureManager.getFrame(key, frame);
802795

@@ -806,15 +799,13 @@ var RenderTexture = new Class({
806799

807800
if (renderTarget)
808801
{
809-
renderer.flush();
810-
811-
renderTarget.bind();
802+
renderTarget.bind(true);
812803

813-
this.pipeline.batchTextureFrame(textureFrame, x + this.frame.cutX, y + this.frame.cutY, tint, alpha, camera.matrix, null);
804+
this.pipeline.batchTextureFrame(textureFrame, x, y, tint, alpha, camera.matrix, null);
814805

815-
renderer.flush();
806+
// this.pipeline.batchTextureFrame(textureFrame, x + this.frame.cutX, y + this.frame.cutY, tint, alpha, camera.matrix, null);
816807

817-
renderTarget.unbind();
808+
renderTarget.unbind(true);
818809
}
819810
else
820811
{
@@ -1025,20 +1016,15 @@ var RenderTexture = new Class({
10251016
x += this.frame.cutX;
10261017
y += this.frame.cutY;
10271018

1028-
var renderer = this.renderer;
10291019
var renderTarget = this.renderTarget;
10301020

10311021
if (renderTarget)
10321022
{
1033-
renderer.flush();
1034-
1035-
renderTarget.bind();
1023+
renderTarget.bind(true);
10361024

10371025
this.pipeline.batchTextureFrame(textureFrame, x, y, tint, alpha, this.camera.matrix, null);
10381026

1039-
renderer.flush();
1040-
1041-
renderTarget.unbind();
1027+
renderTarget.unbind(true);
10421028
}
10431029
else
10441030
{

0 commit comments

Comments
 (0)