mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-01-29 14:25:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use octile distance instead of euclidean

Browse source
This commit is contained in:
Timo van Veen 2023-10-28 16:40:03 +02:00
parent 1b2f3b1a8d
commit 740ec9092f
1 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/main/java/com/simibubi/create/content/trains/entity/Navigation.java
View file

@ -1,6 +1,7 @@
package com.simibubi.create.content.trains.entity; package com.simibubi.create.content.trains.entity;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.IdentityHashMap; import java.util.IdentityHashMap;
@ -685,10 +686,36 @@ public class Navigation {
TrackNode newNode = target.getKey(); TrackNode newNode = target.getKey();
TrackEdge newEdge = target.getValue(); TrackEdge newEdge = target.getValue();
double newDistance = newEdge.getLength() + distance; double newDistance = newEdge.getLength() + distance;
double remainingDist = destination == null ? 0 : newNode.getLocation().getLocation().distanceTo(destinationNodePosition); double remainingDist = 0;
if (destination != null) {
Vec3 newNodePosition = newNode.getLocation().getLocation();
double dMin = Math.abs(newNodePosition.x - destinationNodePosition.x);
double dMid = Math.abs(newNodePosition.y - destinationNodePosition.y);
double dMax = Math.abs(newNodePosition.z - destinationNodePosition.z);
double temp;
if (dMin > dMid) {
temp = dMid;
dMid = dMin;
dMin = temp;
}
if (dMin > dMax) {
temp = dMax;
dMax = dMin;
dMin = temp;
}
if (dMid > dMax) {
temp = dMax;
dMax = dMid;
dMid = temp;
}
// Octile distance from newNode to station node
remainingDist = 0.317837245 * dMin + 0.414213562 * dMid + dMax;
}
reachedVia.putIfAbsent(newEdge, Pair.of(validTargets.size() > 1, Couple.create(node1, node2))); reachedVia.putIfAbsent(newEdge, Pair.of(validTargets.size() > 1, Couple.create(node1, node2)));
if (destination != null && remainingDist == 0.0 && stationTest.test(newDistance, newDistance + penalty, reachedVia, if (destination != null && Math.round(remainingDist) == 0 && stationTest.test(newDistance, newDistance + penalty, reachedVia,
Pair.of(Couple.create(node2, newNode), newEdge), destination)) Pair.of(Couple.create(node2, newNode), newEdge), destination))
return; return;
frontier.add(new FrontierEntry(newDistance, penalty, remainingDist, node2, newNode, newEdge)); frontier.add(new FrontierEntry(newDistance, penalty, remainingDist, node2, newNode, newEdge));