mirrors/Iris
1
0 Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-10-25 21:40:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Surface drainage never climbs beyond the permitted cut

Browse Source 
- Lattice edges that rise more than the cut the valley solver accepts are not surface drainage
- Ocean reachability uses the same rule, so ground behind a ridge gets inland grotto outlets instead of an impossible mouth
- Transect probe renders a tile diagnostics map with the drainage graph and rejected candidates
This commit is contained in:
Brian Neumann-Fopiano committed 2026-09-01 23:46:11 -04:00
1 parent f4a76dfa85
commit 8848167c22
2 files changed
+128 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/main/java/art/arcane/iris/engine/hydrology/HydrologyPlanner.java
+22 -7
View File
@@ -428,7 +428,7 @@ public final class HydrologyPlanner {
boolean fallbackSelected = false;
while (fallbackOutletIndex < fallbackOutlets.size()) {
OutletCandidate fallbackOutlet = fallbackOutlets.get(fallbackOutletIndex++);
RoutingPlan fallbackRouting = requireOrganicSurface(buildRouting(grid, List.of(fallbackOutlet)));
RoutingPlan fallbackRouting = requireOrganicSurface(buildRouting(grid, List.of(fallbackOutlet), true));
HashMap<HydrologyTileKey, SourceRoutingContext> fallbackContexts = new HashMap<>();
fallbackContexts.put(key, new SourceRoutingContext(
grid,
@@ -1471,7 +1471,7 @@ public final class HydrologyPlanner {
addRejectedOutlets(oceanCandidates, selected, diagnostics);
return selected;
}
boolean[] oceanReachable = outletReachable(grid, oceanCandidates);
boolean[] oceanReachable = outletReachable(grid, oceanCandidates, surface);
ArrayList<OutletCandidate> inlandCandidates = inlandOutletCandidates(grid, oceanReachable);
sortInlandOutletCandidates(grid, inlandCandidates);
int inlandMaximum = oceanCandidates.isEmpty()
@@ -1645,7 +1645,8 @@ public final class HydrologyPlanner {
return true;
}
private boolean[] outletReachable(SampledGrid grid, List<OutletCandidate> outlets) {
private boolean[] outletReachable(SampledGrid grid, List<OutletCandidate> outlets, boolean surface) {
int maximumRise = surface ? maximumSurfaceEdgeRise() : Integer.MAX_VALUE;
boolean[] reachable = new boolean[grid.nodes().size()];
int[] queue = new int[reachable.length];
int readIndex = 0;
@@ -1662,7 +1663,8 @@ public final class HydrologyPlanner {
for (GridOffset offset : ROUTING_OFFSETS) {
GridNode neighbor = grid.nodeAt(node.gridX() + offset.x(), node.gridZ() + offset.z());
if (neighbor == null || reachable[neighbor.index()] || neighbor.terrain().ocean()
|| !neighbor.terrain().transitAllowed()) {
|| !neighbor.terrain().transitAllowed()
|| node.terrain().naturalHeight() - neighbor.terrain().naturalHeight() > maximumRise) {
continue;
}
reachable[neighbor.index()] = true;
@@ -1931,8 +1933,12 @@ public final class HydrologyPlanner {
private RoutingPlan buildRouting(
SampledGrid grid,
List<OutletCandidate> outlets
List<OutletCandidate> outlets,
boolean surface
) {
// A surface river never climbs: any rise along its route becomes a cut of at least that rise,
// so lattice edges that rise more than a small saddle are not drainage at all.
int maximumRise = surface ? maximumSurfaceEdgeRise() : Integer.MAX_VALUE;
int nodeCount = grid.nodes().size();
double[] potential = new double[nodeCount];
int[] parent = new int[nodeCount];
@@ -1963,6 +1969,9 @@ public final class HydrologyPlanner {
if (upstream == null || upstream.terrain().ocean() || !upstream.terrain().transitAllowed()) {
continue;
}
if (downstream.terrain().naturalHeight() - upstream.terrain().naturalHeight() > maximumRise) {
continue;
}
double edgeCost = routeCost(
upstream,
downstream,
@@ -1998,6 +2007,12 @@ public final class HydrologyPlanner {
);
}
/** Largest rise a surface drainage edge may take: the cut the valley solver will still accept. */
private int maximumSurfaceEdgeRise() {
int permitted = settings.surface().maximumIncision() - settings.surface().banks().inset() - settings.surface().minimumDepth();
return Math.max(1, permitted);
}
private RoutingPlan requireOrganicSurface(RoutingPlan routing) {
return new RoutingPlan(
routing.potential(),
@@ -2393,12 +2408,12 @@ public final class HydrologyPlanner {
SampledGrid grid = sample(key);
ArrayList<HydrologyDiagnosticCandidate> diagnostics = new ArrayList<>();
List<OutletCandidate> surfaceOutlets = resolveOutlets(key, grid, true, diagnostics);
RoutingPlan surfaceRouting = buildRouting(grid, surfaceOutlets);
RoutingPlan surfaceRouting = buildRouting(grid, surfaceOutlets, true);
List<OutletCandidate> undergroundOutlets = settings.underground().enabled()
? resolveOutlets(key, grid, false, diagnostics)
: surfaceOutlets;
RoutingPlan undergroundRouting = settings.underground().enabled()
? buildRouting(grid, undergroundOutlets)
? buildRouting(grid, undergroundOutlets, false)
: surfaceRouting;
return new SourceRoutingContext(
grid,