Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2025-02-16 22:18:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed a bug in the canvas rendering of both the Static and Dynamic Tilemap Layers where the camera matrix was being multiplied twice with the layer, causing the scale and placement to be off

Browse source
This commit is contained in:
Richard Davey 2018-10-02 12:51:02 +01:00
parent e4c38215cd
commit 1b85512de2
3 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -13,6 +13,8 @@
### Bug Fixes
* Fixed a bug in the canvas rendering of both the Static and Dynamic Tilemap Layers where the camera matrix was being multiplied twice with the layer, causing the scale and placement to be off (thanks galerijanamar)
### Examples and TypeScript
Thanks to the following for helping with the Phaser 3 Examples and TypeScript definitions, either by reporting errors, or even better, fixing them:

17
src/tilemaps/dynamiclayer/DynamicTilemapLayerCanvasRenderer.js
View file

@ -39,6 +39,11 @@ var DynamicTilemapLayerCanvasRenderer = function (renderer, src, interpolationPe
camMatrix.copyFrom(camera.matrix);
var ctx = renderer.currentContext;
var gidMap = src.gidMap;
ctx.save();
if (parentMatrix)
{
// Multiply the camera by the parent matrix
@ -50,23 +55,17 @@ var DynamicTilemapLayerCanvasRenderer = function (renderer, src, interpolationPe
// Multiply by the Sprite matrix, store result in calcMatrix
camMatrix.multiply(layerMatrix, calcMatrix);
calcMatrix.copyToContext(ctx);
}
else
{
layerMatrix.e -= camera.scrollX * src.scrollFactorX;
layerMatrix.f -= camera.scrollY * src.scrollFactorY;
// Multiply by the Sprite matrix, store result in calcMatrix
camMatrix.multiply(layerMatrix, calcMatrix);
layerMatrix.copyToContext(ctx);
}
var ctx = renderer.currentContext;
var gidMap = src.gidMap;
ctx.save();
calcMatrix.copyToContext(ctx);
var alpha = camera.alpha * src.alpha;
for (var i = 0; i < tileCount; i++)

19
src/tilemaps/staticlayer/StaticTilemapLayerCanvasRenderer.js
View file

@ -39,6 +39,11 @@ var StaticTilemapLayerCanvasRenderer = function (renderer, src, interpolationPer
camMatrix.copyFrom(camera.matrix);
var ctx = renderer.currentContext;
var gidMap = src.gidMap;
ctx.save();
if (parentMatrix)
{
// Multiply the camera by the parent matrix
@ -48,25 +53,19 @@ var StaticTilemapLayerCanvasRenderer = function (renderer, src, interpolationPer
layerMatrix.e = src.x;
layerMatrix.f = src.y;
// Multiply by the Sprite matrix, store result in calcMatrix
camMatrix.multiply(layerMatrix, calcMatrix);
calcMatrix.copyToContext(ctx);
}
else
{
// Undo the camera scroll
layerMatrix.e -= camera.scrollX * src.scrollFactorX;
layerMatrix.f -= camera.scrollY * src.scrollFactorY;
// Multiply by the Sprite matrix, store result in calcMatrix
camMatrix.multiply(layerMatrix, calcMatrix);
layerMatrix.copyToContext(ctx);
}
var ctx = renderer.currentContext;
var gidMap = src.gidMap;
ctx.save();
calcMatrix.copyToContext(ctx);
var alpha = camera.alpha * src.alpha;
ctx.globalAlpha = camera.alpha * src.alpha;