Skip to content

Commit 88c599c

Browse files
committed
Fixed render target issue with BitmapText
1 parent bcbec41 commit 88c599c

2 files changed

Lines changed: 31 additions & 29 deletions

File tree

v3/src/gameobjects/bitmaptext/dynamic/DynamicBitmapTextWebGLRenderer.js

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,29 @@ var TransformMatrix = require('../../../components/TransformMatrix');
22
var tempMatrix = new TransformMatrix();
33
var tempMatrixChar = new TransformMatrix();
44

5-
var DynamicBitmapTextWebGLRenderer = function (renderer, src, interpolationPercentage, camera)
5+
var DynamicBitmapTextWebGLRenderer = function (renderer, gameObject, interpolationPercentage, camera)
66
{
77
if (this.renderMask !== this.renderFlags)
88
{
99
return;
1010
}
1111

12-
var displayCallback = src.displayCallback;
13-
var textureFrame = src.frame;
12+
var displayCallback = gameObject.displayCallback;
13+
var textureFrame = gameObject.frame;
1414
var cameraScrollX = camera.scrollX;
1515
var cameraScrollY = camera.scrollY;
16-
var text = src.text;
16+
var text = gameObject.text;
1717
var textLength = text.length;
18-
var chars = src.fontData.chars;
19-
var lineHeight = src.fontData.lineHeight;
18+
var chars = gameObject.fontData.chars;
19+
var lineHeight = gameObject.fontData.lineHeight;
2020
var blitterBatch = renderer.blitterBatch;
21-
var alpha = src.alpha;
21+
var alpha = gameObject.alpha;
2222
var vertexDataBuffer = blitterBatch.vertexDataBuffer;
2323
var vertexBuffer = vertexDataBuffer.floatView;
2424
var vertexOffset = 0;
25-
var srcX = src.x;
26-
var srcY = src.y;
27-
var textureData = src.texture.source[textureFrame.sourceIndex];
25+
var srcX = gameObject.x;
26+
var srcY = gameObject.y;
27+
var textureData = gameObject.texture.source[textureFrame.sourceIndex];
2828
var textureX = textureFrame.cutX;
2929
var textureY = textureFrame.cutY;
3030
var textureWidth = textureData.width;
@@ -57,14 +57,15 @@ var DynamicBitmapTextWebGLRenderer = function (renderer, src, interpolationPerce
5757
var cameraMatrix = camera.matrix.matrix;
5858
var mva, mvb, mvc, mvd, mve, mvf, tx0, ty0, tx1, ty1, tx2, ty2, tx3, ty3;
5959
var sra, srb, src, srd, sre, srf, cma, cmb, cmc, cmd, cme, cmf;
60-
var scale = (src.fontSize / src.fontData.size);
60+
var scale = (gameObject.fontSize / gameObject.fontData.size);
6161
var uta, utb, utc, utd, ute, utf;
6262
var tempMatrixCharMatrix = tempMatrixChar.matrix;
63+
var renderTarget = gameObject.renderTarget;
6364

6465
tempMatrix.applyITRS(
65-
src.x - cameraScrollX, src.y - cameraScrollY,
66-
-src.rotation,
67-
src.scaleX, src.scaleY
66+
gameObject.x - cameraScrollX, gameObject.y - cameraScrollY,
67+
-gameObject.rotation,
68+
gameObject.scaleX, gameObject.scaleY
6869
);
6970

7071
sra = tempMatrixMatrix[0];
@@ -169,7 +170,7 @@ var DynamicBitmapTextWebGLRenderer = function (renderer, src, interpolationPerce
169170
blitterBatch.flush();
170171
}
171172

172-
renderer.setRenderer(blitterBatch, texture);
173+
renderer.setRenderer(blitterBatch, texture, renderTarget);
173174
vertexOffset = vertexDataBuffer.allocate(20);
174175
blitterBatch.elementCount += 6;
175176

v3/src/gameobjects/bitmaptext/static/BitmapTextWebGLRenderer.js

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
var TransformMatrix = require('../../../components/TransformMatrix');
22
var tempMatrix = new TransformMatrix();
33

4-
var BitmapTextWebGLRenderer = function (renderer, src, interpolationPercentage, camera)
4+
var BitmapTextWebGLRenderer = function (renderer, gameObject, interpolationPercentage, camera)
55
{
66
if (this.renderMask !== this.renderFlags)
77
{
88
return;
99
}
1010

11-
var textureFrame = src.frame;
11+
var textureFrame = gameObject.frame;
1212
var cameraScrollX = camera.scrollX;
1313
var cameraScrollY = camera.scrollY;
14-
var text = src.text;
14+
var text = gameObject.text;
1515
var textLength = text.length;
16-
var chars = src.fontData.chars;
17-
var lineHeight = src.fontData.lineHeight;
16+
var chars = gameObject.fontData.chars;
17+
var lineHeight = gameObject.fontData.lineHeight;
1818
var blitterBatch = renderer.blitterBatch;
19-
var alpha = src.alpha;
19+
var alpha = gameObject.alpha;
2020
var vertexDataBuffer = blitterBatch.vertexDataBuffer;
2121
var vertexBuffer = vertexDataBuffer.floatView;
2222
var vertexOffset = 0;
23-
var srcX = src.x;
24-
var srcY = src.y;
25-
var textureData = src.texture.source[textureFrame.sourceIndex];
23+
var srcX = gameObject.x;
24+
var srcY = gameObject.y;
25+
var textureData = gameObject.texture.source[textureFrame.sourceIndex];
2626
var textureX = textureFrame.cutX;
2727
var textureY = textureFrame.cutY;
2828
var textureWidth = textureData.width;
@@ -55,12 +55,13 @@ var BitmapTextWebGLRenderer = function (renderer, src, interpolationPercentage,
5555
var cameraMatrix = camera.matrix.matrix;
5656
var mva, mvb, mvc, mvd, mve, mvf, tx0, ty0, tx1, ty1, tx2, ty2, tx3, ty3;
5757
var sra, srb, src, srd, sre, srf, cma, cmb, cmc, cmd, cme, cmf;
58-
var scale = (src.fontSize / src.fontData.size);
58+
var scale = (gameObject.fontSize / gameObject.fontData.size);
59+
var renderTarget = gameObject.renderTarget;
5960

6061
tempMatrix.applyITRS(
61-
src.x - cameraScrollX, src.y - cameraScrollY,
62-
-src.rotation,
63-
src.scaleX, src.scaleY
62+
gameObject.x - cameraScrollX, gameObject.y - cameraScrollY,
63+
-gameObject.rotation,
64+
gameObject.scaleX, gameObject.scaleY
6465
);
6566

6667
sra = tempMatrixMatrix[0];
@@ -135,7 +136,7 @@ var BitmapTextWebGLRenderer = function (renderer, src, interpolationPercentage,
135136
blitterBatch.flush();
136137
}
137138

138-
renderer.setRenderer(blitterBatch, texture);
139+
renderer.setRenderer(blitterBatch, texture, renderTarget);
139140
vertexOffset = vertexDataBuffer.allocate(20);
140141
blitterBatch.elementCount += 6;
141142

0 commit comments

Comments
 (0)