beezm
3b6d166458
The task-10 draft's PASS B shipped and produced the canonical grid
artifact: thousands of straight, disconnected, pooling scratches. Per-
cell steepest descent on a regular grid can only route along its eight
neighbour headings, so at map scale the "channels" read as hatching,
not drainage. Reverted entirely rather than tuned -- no K, p or mask
setting fixes a directional basis. Rivers and erosion move to Phase C
as a hydraulic-erosion pass over FINAL terrain.
Removed: FlowAccumulation / IncisionWeight / EdgeBlend and the INC_*,
SEA_CLAMP, SHELF_INC_WEIGHT and CRATER_* constants; RunIncisionPass and
the pass-2b call; the six incision fields from TDTL (writer, parser,
harness). KEPT, untouched and developer-approved: pass A, the shelf
micro-relief skin, and its ShelfReliefAmp dial.
The crater carve folds back into the single pass-2 loop it came from,
carving two LOCALS written once each. That is what the code did before
the draft split it out, and it makes the aliased double-carve that the
split introduced (fix 1b98fb5) structurally impossible rather than
merely fixed -- there is no longer a read-modify-write to get wrong.
TDTL bodies are now versioned (BlueprintFormat.TDTL_VERSION = 2) and the
parser skips a body version it does not know instead of misreading the
longer v1 layout into plausible nonsense. The only v1 payloads that
exist are in the reverted batch's own tree.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
49 lines
2.2 KiB
C#
49 lines
2.2 KiB
C#
using Godot;
|
|
|
|
/// <summary>
|
|
/// The terrain DETAIL passes (terrain-water task 10) — pure numeric functions
|
|
/// (D-035; a named future C++ candidate, kept standalone):
|
|
///
|
|
/// PASS A — shelf micro-relief: a medium-frequency noise skin (±ShelfReliefAmp,
|
|
/// default 3 m) weighted by shelf-ness, so the compressed shelves get their
|
|
/// rolling texture back while risers and peaks stay untouched.
|
|
///
|
|
/// Output-height only; the classify map never sees it.
|
|
///
|
|
/// NOTE — what this file deliberately no longer contains: the task-10 draft's D8
|
|
/// steepest-descent flow routing, accumulation and drainage incision. It shipped,
|
|
/// and it produced the canonical grid artifact — thousands of straight,
|
|
/// disconnected, pooling scratches running along the eight D8 neighbour
|
|
/// directions, because per-cell steepest descent on a regular grid can only ever
|
|
/// route along those eight headings. It is reverted whole. Rivers and erosion are
|
|
/// Phase C work: a hydraulic-erosion pass over FINAL terrain, not a routing carve
|
|
/// on a grid mid-pipeline.
|
|
/// </summary>
|
|
public static class TerrainDetailPass
|
|
{
|
|
// The TDTL body version is owned by the format (Core); the pass just stamps it.
|
|
public const ushort VERSION = IslaApocalypse.Core.BlueprintFormat.TDTL_VERSION;
|
|
|
|
// Pass A — micro-relief.
|
|
public const float RELIEF_AMP_DEFAULT_M = 3f; // config dial: ShelfReliefAmp (metres)
|
|
public const float RELIEF_FREQ_ISLANDS = 40f; // ~40 undulations per island width (~200 m features)
|
|
public const int RELIEF_SEED_OFFSET = 7409;
|
|
|
|
/// <summary>
|
|
/// Shelf-ness weight from the RAW input height: 1 mid-shelf, feathering to 0
|
|
/// through the risers (feather extends 30 % of the band half-width past each
|
|
/// shelf edge). Covers both shelves.
|
|
/// </summary>
|
|
public static float ShelfWeight(float raw, CurveKnots k)
|
|
{
|
|
return Mathf.Max(BandBump(raw, k.K3, k.K4), BandBump(raw, k.K5, k.K6));
|
|
}
|
|
|
|
private static float BandBump(float h, float lo, float hi)
|
|
{
|
|
float half = (hi - lo) * 0.5f;
|
|
float t = Mathf.Abs(h - (lo + half)) / half; // 0 centre, 1 at band edge
|
|
// full inside 60 % of the band, linear feather to zero at 130 %
|
|
return Mathf.Clamp(1f - (t - 0.6f) / 0.7f, 0f, 1f);
|
|
}
|
|
}
|