Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2024-11-24 21:53:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

The ArcadePhysics.World.collideSpriteVsTilemapLayer method has been modified so that the body bounds are now expanded by the size of the scaled base tile in the Tilemap Layer. This fixes an issue where the check would skip over-sized tiles that were outside the bounds of the body. Mostly noticeable on layers that had a different base tile size to the map itself. Fix #4479

Browse source
This commit is contained in:
Richard Davey 2024-02-21 01:11:43 +00:00
parent 708733e7a3
commit d70e3f453c
1 changed files with 11 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/physics/arcade/World.js
View file

@ -2314,27 +2314,15 @@ var World = new Class({
return false;
}
var x = body.x;
var y = body.y;
var w = body.width;
var h = body.height;
var layerData = tilemapLayer.layer;
if (layerData.tileWidth > layerData.baseTileWidth)
{
// The x origin of a tile is the left side, so x and width need to be adjusted.
var xDiff = (layerData.tileWidth - layerData.baseTileWidth) * tilemapLayer.scaleX;
x -= xDiff;
w += xDiff;
}
// Increase the hit area of the body by the size of the tiles * the scale
// This will allow GetTilesWithinWorldXY to include the tiles around the body
if (layerData.tileHeight > layerData.baseTileHeight)
{
// The y origin of a tile is the bottom side, so just the height needs to be adjusted.
var yDiff = (layerData.tileHeight - layerData.baseTileHeight) * tilemapLayer.scaleY;
h += yDiff;
}
var x = body.x - (layerData.tileWidth * tilemapLayer.scaleX);
var y = body.y - (layerData.tileHeight * tilemapLayer.scaleY);
var w = body.width + (layerData.tileWidth * tilemapLayer.scaleX);
var h = body.height + layerData.tileHeight * tilemapLayer.scaleY;
var options = (overlapOnly) ? null : this.tileFilterOptions;
@ -2390,20 +2378,14 @@ var World = new Class({
tileWorldRect.left = point.x;
tileWorldRect.top = point.y;
// If the maps base tile size differs from the layer tile size, only the top of the rect
// needs to be adjusted since its origin is (0, 1).
if (tile.baseHeight !== tile.height)
{
tileWorldRect.top -= (tile.height - tile.baseHeight) * tilemapLayer.scaleY;
}
tileWorldRect.right = tileWorldRect.left + tile.width * tilemapLayer.scaleX;
tileWorldRect.bottom = tileWorldRect.top + tile.height * tilemapLayer.scaleY;
if (TileIntersectsBody(tileWorldRect, body)
&& (!processCallback || processCallback.call(callbackContext, sprite, tile))
&& ProcessTileCallbacks(tile, sprite)
&& (overlapOnly || SeparateTile(i, body, tile, tileWorldRect, tilemapLayer, this.TILE_BIAS, isLayer)))
if (
TileIntersectsBody(tileWorldRect, body) &&
(!processCallback || processCallback.call(callbackContext, sprite, tile)) &&
ProcessTileCallbacks(tile, sprite) &&
(overlapOnly || SeparateTile(i, body, tile, tileWorldRect, tilemapLayer, this.TILE_BIAS, isLayer)))
{
this._total++;