Implements a cache for train collision checks for better performance #9513
+151
−55
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -150,6 +150,9 @@ public class Train { | |
| int ticksSinceLastMailTransfer; | ||
| double[] stress; | ||
|
|
||
|
|
||
| private CollisionCache collisionCache; | ||
|
|
||
| // advancements | ||
| public Player backwardsDriver; | ||
|
|
||
|
|
@@ -620,6 +623,64 @@ public boolean hasBackwardConductor() { | |
| return false; | ||
| } | ||
|
|
||
|
|
||
| public void updateCollisionCache() { | ||
| // | ||
| if (derailed || graph == null) { | ||
| if (collisionCache != null) | ||
| return; | ||
| } | ||
|
|
||
| int maxExpectedSegments = carriages.size() * 2 - 1; | ||
|
|
||
| if (collisionCache == null || collisionCache.start.length < maxExpectedSegments) { | ||
| collisionCache = new CollisionCache(maxExpectedSegments); | ||
| } | ||
|
|
||
| //For adding segments between carriages | ||
|
Contributor
There was a problem hiding this comment.
|
||
| Vec3 lastPoint = null; | ||
| int segmentIndex = 0; | ||
| ResourceKey<Level> trainDimension = null; | ||
|
|
||
| for (Carriage carriage : carriages) { | ||
| TravellingPoint leading = carriage.getLeadingPoint(); | ||
| TravellingPoint trailing = carriage.getTrailingPoint(); | ||
|
|
||
| if (leading.edge == null || trailing.edge == null || | ||
| leading.node1 == null || trailing.node1 == null) | ||
| continue; | ||
|
|
||
| ResourceKey<Level> leadingDim = leading.node1.getLocation().dimension; | ||
| ResourceKey<Level> trailingDim = trailing.node1.getLocation().dimension; | ||
|
|
||
| if (!leadingDim.equals(trailingDim)) | ||
| continue; | ||
|
|
||
| if (trainDimension == null) | ||
| trainDimension = leadingDim; | ||
| else if (!trainDimension.equals(leadingDim)) | ||
| continue; | ||
|
|
||
| Vec3 start = leading.getPosition(graph); | ||
| Vec3 end = trailing.getPosition(graph); | ||
|
|
||
| if (lastPoint != null) { | ||
| collisionCache.addSegment(lastPoint, start, segmentIndex++); | ||
| } | ||
|
|
||
| collisionCache.addSegment(start, end, segmentIndex++); | ||
|
|
||
|
|
||
| lastPoint = end; | ||
| } | ||
|
|
||
| collisionCache.segmentCount = segmentIndex; | ||
| collisionCache.dimension = trainDimension; | ||
| if (segmentIndex == 0) { | ||
| collisionCache = null; | ||
| } | ||
| } | ||
|
|
||
| private void collideWithOtherTrains(Level level, Carriage carriage) { | ||
| if (derailed) | ||
| return; | ||
|
|
@@ -633,10 +694,13 @@ private void collideWithOtherTrains(Level level, Carriage carriage) { | |
| if (!dimension.equals(trailingPoint.node1.getLocation().dimension)) | ||
| return; | ||
|
|
||
| if (collisionCache == null) { | ||
|
Contributor
There was a problem hiding this comment. Why do this here if all trains are supposed to have it baked ahead of time here? |
||
| updateCollisionCache(); | ||
| } | ||
| Vec3 start = collisionCache.start[0]; | ||
| Vec3 end = collisionCache.end[collisionCache.segmentCount - 1]; | ||
|
|
||
| Pair<Train, Vec3> collision = findCollidingTrain(level,start,end, dimension); | ||
| if (collision == null) | ||
| return; | ||
|
|
||
|
|
@@ -654,77 +718,64 @@ private void collideWithOtherTrains(Level level, Carriage carriage) { | |
|
|
||
| public Pair<Train, Vec3> findCollidingTrain(Level level, Vec3 start, Vec3 end, ResourceKey<Level> dimension) { | ||
| Vec3 diff = end.subtract(start); | ||
| double length = diff.length(); | ||
|
|
||
| Vec3 normedDiff = diff.normalize(); | ||
| double maxDistance = AllConfigs.server().trains.maxAssemblyLength.get(); | ||
| double maxDistanceSqr = maxDistance * maxDistance; | ||
|
|
||
| Trains: for (Train train : Create.RAILWAYS.sided(level).trains.values()) { | ||
| if (train == this) | ||
| continue; | ||
| if (train.graph != null && train.graph != graph) | ||
| continue; | ||
| if (train.collisionCache == null) {continue;} | ||
|
Contributor
There was a problem hiding this comment. Formatting if (train.collisionCache == null)
continue;or if (train.collisionCache == null) {
continue;
}but be consistent |
||
| if (!train.collisionCache.dimension.equals(dimension)) | ||
| continue; | ||
|
|
||
| // Fast path: iterate through precomputed cache | ||
| CollisionCache cache = train.collisionCache; | ||
| for (int i = 0; i < cache.segmentCount; i++) { | ||
| Vec3 start2 = cache.start[i]; | ||
| Vec3 end2 = cache.end[i]; | ||
|
|
||
| // Early distance culling using cached positions | ||
| if (Math.min(start2.distanceToSqr(start), end2.distanceToSqr(start)) > maxDistanceSqr) | ||
| continue Trains; | ||
|
|
||
| // Vertical separation check | ||
| if ((end.y < end2.y - 3 || end2.y < end.y - 3) | ||
| && (start.y < start2.y - 3 || start2.y < start.y - 3)) | ||
| continue; | ||
|
|
||
| // Use precomputed direction vectors from cache | ||
| Vec3 normedDiff2 = cache.direction[i]; | ||
| double[] intersect = VecHelper.intersect(start, start2, normedDiff, normedDiff2, Axis.Y); | ||
|
|
||
| if (intersect == null) { | ||
| // Sphere intersection fallback | ||
| Vec3 intersectSphere = VecHelper.intersectSphere(start2, normedDiff2, start, .125f); | ||
| if (intersectSphere == null) | ||
| continue; | ||
|
|
||
| if (!Mth.equal(normedDiff2.dot(intersectSphere.subtract(start2).normalize()), 1)) | ||
| continue; | ||
|
|
||
| intersect = new double[2]; | ||
| intersect[0] = intersectSphere.distanceTo(start) - .125; | ||
| intersect[1] = intersectSphere.distanceTo(start2) - .125; | ||
|
|
||
|
|
||
| // Bounds checking using cached lengths | ||
| if (intersect[0] > length || intersect[0] < 0) | ||
| continue; | ||
| if (intersect[1] > cache.segmentLength[i] || intersect[1] < 0) | ||
| continue; | ||
|
|
||
| return Pair.of(train, start.add(normedDiff.scale(intersect[0]))); | ||
| } | ||
| } | ||
|
|
||
| } | ||
| return null; | ||
| } | ||
|
|
@@ -1090,6 +1141,51 @@ public Couple<Couple<TrackNode>> getEndpointEdges() { | |
| .map(tp -> Couple.create(tp.node1, tp.node2)); | ||
| } | ||
|
|
||
|
|
||
| /** | ||
| * Collision detection cache structure. | ||
| * Stores precomputed train segment positions to avoid repeated graph lookups. | ||
| */ | ||
| private static class CollisionCache { | ||
| int segmentCount; | ||
|
|
||
| // Position arrays - precomputed to avoid repeated graph lookups | ||
| Vec3[] start; | ||
| Vec3[] end; | ||
|
|
||
| // Direction vectors (normalized) - precomputed for intersection tests | ||
| Vec3[] direction; | ||
| double[] segmentLength; | ||
|
|
||
| // Metadata | ||
| ResourceKey<Level> dimension; | ||
|
|
||
| CollisionCache(int maxSegments) { | ||
| this.segmentCount = 0; | ||
| this.start = new Vec3[maxSegments]; | ||
| this.end = new Vec3[maxSegments]; | ||
| this.direction = new Vec3[maxSegments]; | ||
| this.segmentLength = new double[maxSegments]; | ||
| } | ||
|
|
||
|
|
||
| /** | ||
| * Add a segment to the cache with precomputed direction and length | ||
| */ | ||
| void addSegment(Vec3 startPos, Vec3 endPos, int index) { | ||
| start[index] = startPos; | ||
| end[index] = endPos; | ||
|
|
||
| // Precompute direction vector and length | ||
| Vec3 diff = endPos.subtract(startPos); | ||
| double length = diff.length(); | ||
|
|
||
| segmentLength[index] = length; | ||
| direction[index] = diff.normalize(); | ||
|
|
||
| } | ||
| } | ||
|
|
||
| public static class Penalties { | ||
| static final int STATION = 50, STATION_WITH_TRAIN = 300; | ||
| static final int MANUAL_TRAIN = 200, IDLE_TRAIN = 700, ARRIVING_TRAIN = 50, WAITING_TRAIN = 50, ANY_TRAIN = 25, | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did you mean to write something here?