Skip to content

Commit feed39a

Browse files
committed
Canvas rendering working with the new game object
1 parent 4deb7ea commit feed39a

5 files changed

Lines changed: 16 additions & 16 deletions

File tree

v3/src/gameobjects/blitter/Blitter.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ Blitter.prototype.getRenderList = function ()
119119
if (this.dirty)
120120
{
121121
this.renderList = this.children.list.filter(this.childCanRender, this);
122+
this.dirty = false;
122123
}
123124

124125
return this.renderList;

v3/src/gameobjects/blitter/BlitterCanvasRenderer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
var BlitterCanvasRenderer = function (renderer, src, interpolationPercentage, camera)
33
{
4-
var worldAlpha = src.color.worldAlpha;
4+
var worldAlpha = 1; //src.color.worldAlpha;
55
var list = src.getRenderList();
66

77
// Skip rendering?

v3/src/gameobjects/image/ImageCanvasRenderer.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ var ImageCanvasRenderer = function (renderer, src, interpolationPercentage, came
44
var frame = src.frame;
55

66
// Calculate this in the Color component
7-
var alpha = src.color.worldAlpha * 255 << 24;
7+
var alpha = 1; //src.color.worldAlpha * 255 << 24;
88

99
// Move all of these to accessors that automatically remove this GO from the display list anyway
1010
if (src.skipRender || !src.visible || alpha === 0 || !frame.cutWidth || !frame.cutHeight)
1111
{
1212
return;
1313
}
1414

15-
var tint = src.color._glTint;
16-
var bg = src.color._glBg;
15+
var tint = null; //src.color._glTint;
16+
var bg = null; //src.color._glBg;
1717

18-
renderer.drawImage(frame, src.blendMode, src.transform, src.anchorX, src.anchorY, alpha, tint, bg, camera);
18+
renderer.drawImage(frame, src, /* blendMode */null, alpha, tint, bg, camera);
1919
};
2020

2121
module.exports = ImageCanvasRenderer;

v3/src/gameobjects/sprite/SpriteCanvasRenderer.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
var SpriteCanvasRenderer = function (renderer, src, interpolationPercentage, camera)
33
{
44
var frame = src.frame;
5-
var alpha = src.color.worldAlpha * 255 << 24;
5+
var alpha = 1; //src.color.worldAlpha * 255 << 24;
66

77
// Skip rendering?
88

@@ -11,11 +11,10 @@ var SpriteCanvasRenderer = function (renderer, src, interpolationPercentage, cam
1111
return;
1212
}
1313

14-
var data = src.transform.getCanvasTransformData(interpolationPercentage, renderer);
15-
var tint = src.color._glTint;
16-
var bg = src.color._glBg;
14+
var tint = null; //src.color._glTint;
15+
var bg = null; //src.color._glBg;
1716

18-
renderer.drawImage(frame, src.blendMode, data, alpha, tint, bg, camera);
17+
renderer.drawImage(frame, src, /*blendMode*/ null, alpha, tint, bg, camera);
1918

2019
// Render children
2120
for (var i = 0; i < src.children.list.length; i++)

v3/src/renderer/canvas/utils/DrawImage.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
var DrawImage = function (frame, blendMode, transform, anchorX, anchorY, alpha, tint, bg, camera)
2+
var DrawImage = function (frame, src, blendMode, alpha, tint, bg, camera)
33
{
44
var ctx = this.currentContext;
55
var cd = frame.canvasData;
@@ -28,13 +28,13 @@ var DrawImage = function (frame, blendMode, transform, anchorX, anchorY, alpha,
2828
// ctx[this.smoothProperty] = (source.scaleMode === ScaleModes.LINEAR);
2929
}
3030

31-
var dx = frame.x - (anchorX * frame.width) - camera.scrollX;
32-
var dy = frame.y - (anchorY * frame.height) - camera.scrollY;
31+
var dx = frame.x - (src.anchorX * frame.width) - camera.scrollX;
32+
var dy = frame.y - (src.anchorY * frame.height) - camera.scrollY;
3333

3434
ctx.save();
35-
ctx.translate(transform.x, transform.y);
36-
ctx.rotate(transform.angle);
37-
ctx.scale(transform.scaleX, transform.scaleY);
35+
ctx.translate(src.x, src.y);
36+
ctx.rotate(src.angle);
37+
ctx.scale(src.scaleX, src.scaleY);
3838
ctx.drawImage(frame.source.image, cd.sx, cd.sy, cd.sWidth, cd.sHeight, dx, dy, cd.dWidth, cd.dHeight);
3939
ctx.restore();
4040
};

0 commit comments

Comments
 (0)