beezm/islaApocalypse-v2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix the ISLA_SOURCE default the batch rename broke

Browse source 
chat1/05 renamed 01_pass1_port to 02_pass1_port, bringing it into line with the
authoring-task naming convention. ReviewBatchTool and ReliefRenderTool both
defaulted ISLA_SOURCE to the old name, so running either without an explicit
override found no .f32 dumps.

That failed quietly, which is the reason to fix it rather than document it:
HeightField.Load returns null on a missing file, so ReliefRenderTool silently
regenerated instead of loading, and ReviewBatchTool skipped 1_noise_grayscale
entirely with only a printed warning. Nothing corrupted; it just cost generation
time and dropped a view, both easy to miss.

Both defaults now name 02_pass1_port — where TerrainGenTool writes by default,
BatchRoot(task 2, "pass1_port"). Generator output and renderer source agree again.

ISLA_SOURCE stays overridable and unchanged in shape. Note in passing that it is a
FULL folder name, prefix included, not a bare descriptor: it names an existing
folder to read rather than composing a new one, so it does not go through BatchRoot.
Commented at both sites so the asymmetry with ISLA_BATCH reads as deliberate.

Verified end to end, not just by build: with no ISLA_SOURCE set, ReliefRenderTool
reports "loaded in 173 ms" against 02_pass1_port, and ReviewBatchTool produces
1_noise_grayscale again.
This commit is contained in:
Stewart Howe 2026-08-19 23:38:10 -04:00
parent fdf52f61ee
commit 527fab41e5
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Tools/Scripts/ReliefRenderTool.cs
View file

@ -26,7 +26,7 @@ namespace IslaApocalypse.Tools
/// ISLA_LOOKS comma-separated look names (default: atlas,relief,dusk)
/// ISLA_TASK authoring task number (default 3)
/// ISLA_BATCH descriptor, NO prefix (default "relief_taste")
/// ISLA_SOURCE batch to read .f32 from (default 01_pass1_port)
/// ISLA_SOURCE batch to read .f32 from (default 02_pass1_port)
/// ISLA_DUMP_RAW "1" to also dump .f32 when a field had to be generated
/// </summary>
public partial class ReliefRenderTool : Node
@ -41,7 +41,10 @@ namespace IslaApocalypse.Tools
int[] seeds = EnvSeeds("ISLA_SEEDS", DefaultSeeds);
int task = EnvInt("ISLA_TASK", 3); // the task that authored this batch
string batch = EnvStr("ISLA_BATCH", "relief_taste");
string source = EnvStr("ISLA_SOURCE", "01_pass1_port");
// ⚠ A FULL batch folder name, prefix included — it names an EXISTING folder rather than
// composing a new one, so it is not run through BatchRoot. Tracks TerrainGenTool's
// default output: BatchRoot(task 2, "pass1_port") = 02_pass1_port.
string source = EnvStr("ISLA_SOURCE", "02_pass1_port");
bool dumpRaw = EnvStr("ISLA_DUMP_RAW", "0") == "1";
LookConfig[] looks = SelectLooks(EnvStr("ISLA_LOOKS", null));

10
Tools/Scripts/ReviewBatchTool.cs
View file

@ -25,7 +25,7 @@ namespace IslaApocalypse.Tools
///
/// ISLA_TASK authoring task number (default 4)
/// ISLA_BATCH descriptor, NO prefix (default "review")
/// ISLA_SOURCE batch holding the .f32 (default 01_pass1_port)
/// ISLA_SOURCE batch holding the .f32 (default 02_pass1_port)
/// ISLA_MAPSIZE side in columns (default 2048)
/// ISLA_SEEDS comma-separated positive (default: the 4 pinned seeds)
/// </summary>
@ -62,7 +62,13 @@ namespace IslaApocalypse.Tools
int task = EnvInt("ISLA_TASK", 4);
string descr = EnvStr("ISLA_BATCH", "review");
string source = EnvStr("ISLA_SOURCE", "01_pass1_port");
// ⚠ A FULL batch folder name, prefix included — this NAMES AN EXISTING FOLDER rather than
// composing a new one, so it is not run through BatchRoot. The default tracks where
// TerrainGenTool writes by default: BatchRoot(task 2, "pass1_port") = 02_pass1_port.
// It was "01_pass1_port" until chat1/05 renamed the folder to its authoring-task number;
// a stale default here does not fail loudly, it just silently regenerates instead of
// loading — which is exactly the kind of quiet cost worth pinning to the real name.
string source = EnvStr("ISLA_SOURCE", "02_pass1_port");
int mapSize = EnvInt("ISLA_MAPSIZE", 2048);
int[] seeds = EnvSeeds("ISLA_SEEDS", DefaultSeeds);