Skip to content

Commit 114201f

Browse files
committed
Fixed tilemaps with missing function
1 parent 9a61c62 commit 114201f

3 files changed

Lines changed: 80 additions & 15 deletions

File tree

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
/**
2+
* @author Richard Davey <rich@photonstorm.com>
3+
* @copyright 2020 Photon Storm Ltd.
4+
* @license {@link https://opensource.org/licenses/MIT|MIT License}
5+
*/
6+
7+
var CONST = require('../const');
8+
var HexagonalTileToWorldXY = require('./HexagonalTileToWorldXY');
9+
var IsometricTileToWorldXY = require('./IsometricTileToWorldXY');
10+
var NOOP = require('../../utils/NOOP');
11+
var StaggeredTileToWorldXY = require('./StaggeredTileToWorldXY');
12+
var TileToWorldXY = require('./TileToWorldXY');
13+
14+
/**
15+
* Gets the correct function to use to translate tiles, based on the map orientation.
16+
*
17+
* @function Phaser.Tilemaps.Components.GetTileToWorldXYFunction
18+
* @since 3.50.0
19+
*
20+
* @param {number} orientation - The Tilemap orientation constant.
21+
*
22+
* @return {(Phaser.Tilemaps.Components.TileToWorldXY|Phaser.Tilemaps.Components.IsometricTileToWorldXY|Phaser.Tilemaps.Components.HexagonalTileToWorldXY|Phaser.Tilemaps.Components.StaggeredTileToWorldXY)} The function to use to translate tiles for the given map type.
23+
*/
24+
var GetTileToWorldXYFunction = function (orientation)
25+
{
26+
if (orientation === CONST.ORTHOGONAL)
27+
{
28+
return TileToWorldXY;
29+
}
30+
else if (orientation === CONST.ISOMETRIC)
31+
{
32+
return IsometricTileToWorldXY;
33+
}
34+
else if (orientation === CONST.HEXAGONAL)
35+
{
36+
return HexagonalTileToWorldXY;
37+
}
38+
else if (orientation === CONST.STAGGERED)
39+
{
40+
return StaggeredTileToWorldXY;
41+
}
42+
else
43+
{
44+
return NOOP;
45+
}
46+
};
47+
48+
module.exports = GetTileToWorldXYFunction;

src/tilemaps/components/GetWorldToTileXYFunction.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,44 +5,44 @@
55
*/
66

77
var CONST = require('../const');
8-
var HexagonalTileToWorldXY = require('./HexagonalTileToWorldXY');
9-
var IsometricTileToWorldXY = require('./IsometricTileToWorldXY');
8+
var HexagonalWorldToTileXY = require('./HexagonalWorldToTileXY');
9+
var IsometricWorldToTileXY = require('./IsometricWorldToTileXY');
1010
var NOOP = require('../../utils/NOOP');
11-
var StaggeredTileToWorldXY = require('./StaggeredTileToWorldXY');
12-
var TileToWorldXY = require('./TileToWorldXY');
11+
var StaggeredWorldToTileXY = require('./StaggeredWorldToTileXY');
12+
var WorldToTileXY = require('./WorldToTileXY');
1313

1414
/**
1515
* Gets the correct function to use to translate tiles, based on the map orientation.
1616
*
17-
* @function Phaser.Tilemaps.Components.GetTileToWorldXYFunction
17+
* @function Phaser.Tilemaps.Components.GetWorldToTileXYFunction
1818
* @since 3.50.0
1919
*
2020
* @param {number} orientation - The Tilemap orientation constant.
2121
*
22-
* @return {(Phaser.Tilemaps.Components.TileToWorldXY|Phaser.Tilemaps.Components.IsometricTileToWorldXY|Phaser.Tilemaps.Components.HexagonalTileToWorldXY|Phaser.Tilemaps.Components.StaggeredTileToWorldXY)} The function to use to translate tiles for the given map type.
22+
* @return {(Phaser.Tilemaps.Components.WorldToTileXY|Phaser.Tilemaps.Components.IsometricWorldToTileXY|Phaser.Tilemaps.Components.HexagonalWorldToTileXY|Phaser.Tilemaps.Components.StaggeredWorldToTileXY)} The function to use to translate tiles for the given map type.
2323
*/
24-
var GetTileToWorldXYFunction = function (orientation)
24+
var GetWorldToTileXYFunction = function (orientation)
2525
{
2626
if (orientation === CONST.ORTHOGONAL)
2727
{
28-
return TileToWorldXY;
28+
return WorldToTileXY;
2929
}
3030
else if (orientation === CONST.ISOMETRIC)
3131
{
32-
return IsometricTileToWorldXY;
32+
return IsometricWorldToTileXY;
3333
}
3434
else if (orientation === CONST.HEXAGONAL)
3535
{
36-
return HexagonalTileToWorldXY;
36+
return HexagonalWorldToTileXY;
3737
}
3838
else if (orientation === CONST.STAGGERED)
3939
{
40-
return StaggeredTileToWorldXY;
40+
return StaggeredWorldToTileXY;
4141
}
4242
else
4343
{
4444
return NOOP;
4545
}
4646
};
4747

48-
module.exports = GetTileToWorldXYFunction;
48+
module.exports = GetWorldToTileXYFunction;

src/tilemaps/components/index.js

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,39 @@ module.exports = {
1212

1313
CalculateFacesAt: require('./CalculateFacesAt'),
1414
CalculateFacesWithin: require('./CalculateFacesWithin'),
15+
CheckIsoBounds: require('./CheckIsoBounds'),
1516
Copy: require('./Copy'),
1617
CreateFromTiles: require('./CreateFromTiles'),
18+
CullBounds: require('./CullBounds'),
1719
CullTiles: require('./CullTiles'),
1820
Fill: require('./Fill'),
1921
FilterTiles: require('./FilterTiles'),
2022
FindByIndex: require('./FindByIndex'),
2123
FindTile: require('./FindTile'),
2224
ForEachTile: require('./ForEachTile'),
25+
GetCullTilesFunction: require('./GetCullTilesFunction'),
2326
GetTileAt: require('./GetTileAt'),
2427
GetTileAtWorldXY: require('./GetTileAtWorldXY'),
2528
GetTilesWithin: require('./GetTilesWithin'),
2629
GetTilesWithinShape: require('./GetTilesWithinShape'),
2730
GetTilesWithinWorldXY: require('./GetTilesWithinWorldXY'),
31+
GetTileToWorldXFunction: require('./GetTileToWorldXFunction'),
32+
GetTileToWorldXYFunction: require('./GetTileToWorldXYFunction'),
33+
GetTileToWorldYFunction: require('./GetTileToWorldYFunction'),
2834
GetWorldToTileXFunction: require('./GetWorldToTileXFunction'),
29-
GetWorldToTileYFunction: require('./GetWorldToTileYFunction'),
3035
GetWorldToTileXYFunction: require('./GetWorldToTileXYFunction'),
36+
GetWorldToTileYFunction: require('./GetWorldToTileYFunction'),
3137
HasTileAt: require('./HasTileAt'),
3238
HasTileAtWorldXY: require('./HasTileAtWorldXY'),
33-
HexagonalWorldToTileY: require('./HexagonalWorldToTileY'),
39+
HexagonalCullBounds: require('./HexagonalCullBounds'),
40+
HexagonalCullTiles: require('./HexagonalCullTiles'),
41+
HexagonalTileToWorldXY: require('./HexagonalTileToWorldXY'),
42+
HexagonalTileToWorldY: require('./HexagonalTileToWorldY'),
3443
HexagonalWorldToTileXY: require('./HexagonalWorldToTileXY'),
44+
HexagonalWorldToTileY: require('./HexagonalWorldToTileY'),
3545
IsInLayerBounds: require('./IsInLayerBounds'),
46+
IsometricCullTiles: require('./IsometricCullTiles'),
47+
IsometricTileToWorldXY: require('./IsometricTileToWorldXY'),
3648
IsometricWorldToTileXY: require('./IsometricWorldToTileXY'),
3749
PutTileAt: require('./PutTileAt'),
3850
PutTileAtWorldXY: require('./PutTileAtWorldXY'),
@@ -42,6 +54,7 @@ module.exports = {
4254
RemoveTileAtWorldXY: require('./RemoveTileAtWorldXY'),
4355
RenderDebug: require('./RenderDebug'),
4456
ReplaceByIndex: require('./ReplaceByIndex'),
57+
RunCull: require('./RunCull'),
4558
SetCollision: require('./SetCollision'),
4659
SetCollisionBetween: require('./SetCollisionBetween'),
4760
SetCollisionByExclusion: require('./SetCollisionByExclusion'),
@@ -52,8 +65,12 @@ module.exports = {
5265
SetTileIndexCallback: require('./SetTileIndexCallback'),
5366
SetTileLocationCallback: require('./SetTileLocationCallback'),
5467
Shuffle: require('./Shuffle'),
55-
StaggeredWorldToTileY: require('./StaggeredWorldToTileY'),
68+
StaggeredCullBounds: require('./StaggeredCullBounds'),
69+
StaggeredCullTiles: require('./StaggeredCullTiles'),
70+
StaggeredTileToWorldXY: require('./StaggeredTileToWorldXY'),
71+
StaggeredTileToWorldY: require('./StaggeredTileToWorldY'),
5672
StaggeredWorldToTileXY: require('./StaggeredWorldToTileXY'),
73+
StaggeredWorldToTileY: require('./StaggeredWorldToTileY'),
5774
SwapByIndex: require('./SwapByIndex'),
5875
TileToWorldX: require('./TileToWorldX'),
5976
TileToWorldXY: require('./TileToWorldXY'),

0 commit comments

Comments
 (0)