Archives/tobspr_shapez.io
1
0
Fork 0
mirror of https://github.com/tobspr/shapez.io.git synced 2025-12-15 19:21:49 +00:00
Code Issues Projects Releases Wiki Activity

Fix building placer intersection warning

Browse Source
This commit is contained in:
tobspr 2022-02-01 14:21:46 +01:00
parent 321971dadd
commit 20dca5bcc1
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/js/game/hud/parts/building_placer.js
View File

@ -401,9 +401,10 @@ export class HUDBuildingPlacer extends HUDBuildingPlacerLogic {
* Checks if there are any entities in the way, returns true if there are * Checks if there are any entities in the way, returns true if there are
* @param {Vector} from * @param {Vector} from
* @param {Vector} to * @param {Vector} to
* @param {Vector[]=} ignorePositions
* @returns * @returns
*/ */
checkForObstales(from, to) { checkForObstales(from, to, ignorePositions = []) {
assert(from.x === to.x || from.y === to.y, "Must be a straight line"); assert(from.x === to.x || from.y === to.y, "Must be a straight line");
const prop = from.x === to.x ? "y" : "x"; const prop = from.x === to.x ? "y" : "x";
@ -426,6 +427,9 @@ export class HUDBuildingPlacer extends HUDBuildingPlacerLogic {
for (let i = start; i <= end; i++) { for (let i = start; i <= end; i++) {
current[prop] = i; current[prop] = i;
if (ignorePositions.some(p => p.distanceSquare(current) < 0.1)) {
continue;
}
if (!this.root.logic.checkCanPlaceEntity(this.fakeEntity, { allowReplaceBuildings: false })) { if (!this.root.logic.checkCanPlaceEntity(this.fakeEntity, { allowReplaceBuildings: false })) {
return true; return true;
} }
@ -464,8 +468,11 @@ export class HUDBuildingPlacer extends HUDBuildingPlacerLogic {
const endLine = mouseTile.toWorldSpaceCenterOfTile(); const endLine = mouseTile.toWorldSpaceCenterOfTile();
const midLine = this.currentDirectionLockCorner.toWorldSpaceCenterOfTile(); const midLine = this.currentDirectionLockCorner.toWorldSpaceCenterOfTile();
const anyObstacle = const anyObstacle =
this.checkForObstales(this.lastDragTile, this.currentDirectionLockCorner) || this.checkForObstales(this.lastDragTile, this.currentDirectionLockCorner, [
this.checkForObstales(this.currentDirectionLockCorner, mouseTile); this.lastDragTile,
mouseTile,
]) ||
this.checkForObstales(this.currentDirectionLockCorner, mouseTile, [this.lastDragTile, mouseTile]);
if (anyObstacle) { if (anyObstacle) {
applyStyles("error"); applyStyles("error");