don't try to turn null into a Point

This commit is contained in:
Gavin McDonald
2019-01-30 22:10:18 -05:00
parent ede8e70b56
commit cdd64ab1cc
4 changed files with 12 additions and 4 deletions

View File

@@ -8,7 +8,9 @@ import Square from './square.js';
const tilePointToSquare = ({tilePoint, mapPoint, pixelPoint}) => ({ const tilePointToSquare = ({tilePoint, mapPoint, pixelPoint}) => ({
tile: tilePoint instanceof Square ? tilePoint : new Square(tilePoint), tile: tilePoint instanceof Square ? tilePoint : new Square(tilePoint),
mapTile: mapPoint instanceof Square ? mapPoint : new Square(mapPoint), mapTile: mapPoint instanceof Square ? mapPoint :
mapPoint ? new Square(mapPoint) :
mapPoint,
pixelPoint, pixelPoint,
}); });

View File

@@ -8,7 +8,9 @@ import Point from './point.js';
const tilePointToHex = ({tilePoint, mapPoint, pixelPoint}) => ({ const tilePointToHex = ({tilePoint, mapPoint, pixelPoint}) => ({
tile: tilePoint instanceof Hex ? tilePoint : new Hex(tilePoint), tile: tilePoint instanceof Hex ? tilePoint : new Hex(tilePoint),
mapTile: mapPoint instanceof Hex ? mapPoint : new Hex(mapPoint), mapTile: mapPoint instanceof Hex ? mapPoint :
mapPoint ? new Hex(mapPoint) :
mapPoint,
pixelPoint, pixelPoint,
}); });

View File

@@ -8,7 +8,9 @@ import Point from './point.js';
const tilePointToSquare = ({tilePoint, mapPoint, pixelPoint}) => ({ const tilePointToSquare = ({tilePoint, mapPoint, pixelPoint}) => ({
tile: tilePoint instanceof Square ? tilePoint : new Square(tilePoint), tile: tilePoint instanceof Square ? tilePoint : new Square(tilePoint),
mapTile: mapPoint instanceof Square ? mapPoint : new Square(mapPoint), mapTile: mapPoint instanceof Square ? mapPoint :
mapPoint ? new Square(mapPoint) :
mapPoint,
pixelPoint, pixelPoint,
}); });

View File

@@ -8,7 +8,9 @@ import Point from './point.js';
const tilePointToHex = ({tilePoint, mapPoint, pixelPoint}) => ({ const tilePointToHex = ({tilePoint, mapPoint, pixelPoint}) => ({
tile: tilePoint instanceof Hex ? tilePoint : new Hex(tilePoint), tile: tilePoint instanceof Hex ? tilePoint : new Hex(tilePoint),
mapTile: mapPoint instanceof Hex ? mapPoint : new Hex(mapPoint), mapTile: mapPoint instanceof Hex ? mapPoint :
mapPoint ? new Hex(mapPoint) :
mapPoint,
pixelPoint, pixelPoint,
}); });