Archives/tobspr_shapez.io
1
0
Fork 0
mirror of https://github.com/tobspr/shapez.io.git synced 2024-10-27 20:34:29 +00:00
Code Issues Projects Releases Wiki Activity

Fix tunnels, nr. 2

Browse Source
This commit is contained in:
tobspr 2020-08-14 08:53:35 +02:00
parent 9f522d23ff
commit 7fcfae747a
1 changed files with 46 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/js/game/systems/wire.js
View File

@ -309,28 +309,42 @@ export class WireSystem extends GameSystemWithFilter {
/** /**
* Finds surrounding entities which are not yet assigned to a network * Finds surrounding entities which are not yet assigned to a network
* @param {Vector} tile * @param {Vector} initialTile
* @param {Array<enumDirection>} directions * @param {Array<enumDirection>} directions
* @returns {Array<any>} * @returns {Array<any>}
*/ */
findSurroundingWireTargets(tile, directions) { findSurroundingWireTargets(initialTile, directions) {
let result = []; let result = [];
VERBOSE_WIRES && VERBOSE_WIRES &&
logger.log(" Searching for new targets at", tile.toString(), "and d=", directions); logger.log(" Searching for new targets at", initialTile.toString(), "and d=", directions);
// Go over all directions we should search for // Go over all directions we should search for
for (let i = 0; i < directions.length; ++i) { for (let i = 0; i < directions.length; ++i) {
const direction = directions[i]; const direction = directions[i];
const offset = enumDirectionToVector[direction]; const offset = enumDirectionToVector[direction];
const searchTile = tile.add(offset); const initialSearchTile = initialTile.add(offset);
// Store which tunnels we already visited to avoid infinite loops // Store which tunnels we already visited to avoid infinite loops
const visitedTunnels = new Set(); const visitedTunnels = new Set();
const contents = this.root.map.getLayersContentsMultipleXY(searchTile.x, searchTile.y); // First, find the initial connected entities
const initialContents = this.root.map.getLayersContentsMultipleXY(
initialSearchTile.x,
initialSearchTile.y
);
// Link the initial tile to the initial entities, since it may change
const contents = [];
for (let j = 0; j < initialContents.length; ++j) {
contents.push({
entity: initialContents[j],
tile: initialSearchTile,
});
}
for (let k = 0; k < contents.length; ++k) { for (let k = 0; k < contents.length; ++k) {
const entity = contents[k]; const { entity, tile } = contents[k];
const wireComp = entity.components.Wire; const wireComp = entity.components.Wire;
// Check for wire // Check for wire
@ -353,7 +367,7 @@ export class WireSystem extends GameSystemWithFilter {
// Check if the position matches // Check if the position matches
const pinPos = staticComp.localTileToWorld(slot.pos); const pinPos = staticComp.localTileToWorld(slot.pos);
if (!pinPos.equals(searchTile)) { if (!pinPos.equals(tile)) {
continue; continue;
} }
@ -375,18 +389,33 @@ export class WireSystem extends GameSystemWithFilter {
// Check if its a tunnel, if so, go to the forwarded item // Check if its a tunnel, if so, go to the forwarded item
if (entity.components.WireTunnel) { if (entity.components.WireTunnel) {
if (!visitedTunnels.has(entity.uid)) { if (!visitedTunnels.has(entity.uid)) {
// Compute where this tunnel connects to
const forwardedTile = entity.components.StaticMapEntity.origin.add(offset); const forwardedTile = entity.components.StaticMapEntity.origin.add(offset);
logger.log( VERBOSE_WIRES &&
" Found tunnel", logger.log(
entity.uid, " Found tunnel",
"at", entity.uid,
searchTile, "at",
"-> forwarding to", tile,
forwardedTile "-> forwarding to",
); forwardedTile
contents.push( );
...this.root.map.getLayersContentsMultipleXY(forwardedTile.x, forwardedTile.y)
// Figure out which entities are connected
const connectedContents = this.root.map.getLayersContentsMultipleXY(
forwardedTile.x,
forwardedTile.y
); );
// Attach the entities and the tile we search at, because it may change
for (let h = 0; h < connectedContents.length; ++h) {
contents.push({
entity: connectedContents[h],
tile: forwardedTile,
});
}
// Remember this tunnel
visitedTunnels.add(entity.uid); visitedTunnels.add(entity.uid);
} }
} }