Skip to content

armgit / kiln

Public Imported from GitHub
0

Build and revise procedural 3D assets with your coding agent. Local MCP server, CLI and TypeScript engine with rendered review, editable source and GLB export.

fix(site): Crescent Cove places the final Cove modules (#264)

Matthew Kissingerc5c33bb89512
diff --git a/packs/holodeck/README.md b/packs/holodeck/README.md
index e7cbf9f5..d1bdca37 100644
--- a/packs/holodeck/README.md
+++ b/packs/holodeck/README.md
@@ -9,14 +9,13 @@ addresses are configured in one place, [`site/src/data/holodeck-worlds.json`](..
| `holodeck-tidemark` | Holodeck's bundled `examples/tidemark` (commit recorded in `selection.json`), the walkable Tidemark Island | 23 |
| `holodeck-courtyard` | Courtyard world, revision 8 | 32 |
| `holodeck-cove` | Holodeck's Cove modules at the same commit, the Cove quality pass | 8 |
-| `holodeck-crescent-cove` | Holodeck's bundled `examples/crescent-cove` (commit recorded in `selection.json`), the tropical-island world at revision 15 | 49 |
-
-Packs deliver final versions only: one gallery page and one download per asset. Every scene
-lists the eight Cove modules at their quality-pass revisions, so each Cove module has one page
-shared by the four packs. Tidemark, the Courtyard and the Cove place those revisions. Crescent
-Cove still places the earlier ones: `selection.json` records each under
-`sceneStillPlacesEarlier`, its pack and module pages say so, and the selection checks that every
-final revision descends from the revision the scene places. Holodeck's static site exports leave
+| `holodeck-crescent-cove` | Holodeck's bundled `examples/crescent-cove` (commit recorded in `selection.json`), the tropical-island world at revision 16 | 49 |
+
+Packs deliver final versions only: one gallery page and one download per asset. All four scenes
+place the eight Cove modules at their quality-pass revisions, so each Cove module has one page
+shared by the four packs. If a scene ever places an earlier revision, the pack lists the final
+one instead: `selection.json` records it under `sceneStillPlacesEarlier`, the pack and module
+pages say so, and the selection checks that the final revision descends from the placed one. Holodeck's static site exports leave
the Cove mood board out of the walkable scenes, but the worlds place it, so the packs keep it.
Each download's `delivery.json` lists the parent of every revision under `omittedParents`:
earlier revisions are left out by choice, not missing.
diff --git a/packs/holodeck/selection.json b/packs/holodeck/selection.json
index 6f733553..119d5188 100644
--- a/packs/holodeck/selection.json
+++ b/packs/holodeck/selection.json
@@ -9,7 +9,7 @@
"source": {
"kind": "holodeck-example",
"ref": "main",
- "commit": "e8e54551a09d8324f78b26593a7b3a5ac4711465",
+ "commit": "06a37b45c122c72f045c1b55ff031adcffcb678b",
"path": "examples/tidemark",
"sourceRevision": 8,
"worldSha256": "bda05abacf0c445e822a4070506284fef90bf77f81c45c096932c497b2c46c80"
@@ -87,7 +87,7 @@
"source": {
"kind": "holodeck-modules",
"ref": "main",
- "commit": "e8e54551a09d8324f78b26593a7b3a5ac4711465",
+ "commit": "06a37b45c122c72f045c1b55ff031adcffcb678b",
"files": "assets/cove/modules/*/provenance.json, public/assets/cove-modules/*.glb"
},
"assets": [
@@ -105,11 +105,11 @@
"scene": "crescent-cove",
"source": {
"kind": "holodeck-example",
- "ref": "fbb5827",
- "commit": "fbb58272779f0d417fbb899d58d19414e691b71d",
+ "ref": "0675bf89683cc5a9458a39dfdd47eccfc63b3e28",
+ "commit": "0675bf89683cc5a9458a39dfdd47eccfc63b3e28",
"path": "examples/crescent-cove",
- "sourceRevision": 15,
- "worldSha256": "9b04ef1cc2a85def679b056a8515860f81c42c9ad5552673b4a2e684bdd73639"
+ "sourceRevision": 16,
+ "worldSha256": "7cd28fe514d22b4c35db48d57be697ee746c3dc728ec1b9bea6981d3f360cee8"
},
"assets": [
"cove-structure",
@@ -161,56 +161,6 @@
"crescent-jetty-platform",
"crescent-jetty-stair",
"crescent-seagrass"
- ],
- "sceneStillPlacesEarlier": [
- {
- "id": "structure",
- "slug": "cove-structure",
- "placedRevisionId": "r_e96d8b9675f845d0b6cb20087815c302",
- "finalRevisionId": "r_2387ce274123402dbdafd818e6fb0043"
- },
- {
- "id": "canopy",
- "slug": "cove-canopy",
- "placedRevisionId": "r_cf893c2415774c149c65fdd180a69082",
- "finalRevisionId": "r_df0485467228414780cfa44c0f2e32ad"
- },
- {
- "id": "seating",
- "slug": "cove-seating",
- "placedRevisionId": "r_2ab5c612ea064b98b7ac60c75514b4f2",
- "finalRevisionId": "r_6602fd828a5341eeaa0877fc58289960"
- },
- {
- "id": "hearth",
- "slug": "cove-hearth",
- "placedRevisionId": "r_1094b1f7bfeb427a96460628a00e57a8",
- "finalRevisionId": "r_5ef43760979043d48f358fe2932147dc"
- },
- {
- "id": "planting",
- "slug": "cove-planting",
- "placedRevisionId": "r_0c51c3f449eb4f9397ba7bd9641b5a4b",
- "finalRevisionId": "r_cdb8552ccdde43f28d3995b2a5a30d25"
- },
- {
- "id": "rug",
- "slug": "cove-rug",
- "placedRevisionId": "r_fd535a72cbfa4b2cb4b03ff1385b5dba",
- "finalRevisionId": "r_651bc2867976426996191865ea931163"
- },
- {
- "id": "lamp",
- "slug": "cove-lamp",
- "placedRevisionId": "r_cb8878bebeab484c8901829e94b175d1",
- "finalRevisionId": "r_3b14d66959f942c887c5550f60d6d8ce"
- },
- {
- "id": "moodboard",
- "slug": "cove-moodboard",
- "placedRevisionId": "r_ae0d19de532347758f5c555ec8965da4",
- "finalRevisionId": "r_aedc5a07c6d34c1fb19f5cf959ce679c"
- }
]
}
},
diff --git a/site/scripts/holodeck.test.ts b/site/scripts/holodeck.test.ts
index 7e9bb87f..a91ce6bd 100644
--- a/site/scripts/holodeck.test.ts
+++ b/site/scripts/holodeck.test.ts
@@ -39,14 +39,14 @@ test('each scene pack holds every placed Kiln asset once, at its final version',
test('scenes list the Cove modules at their final revision, and say when the walkable scene places an earlier one', () => {
const tidemark = selection.packs['holodeck-tidemark'].source, cove = selection.packs['holodeck-cove'].source;
expect(tidemark).toMatchObject({ kind: 'holodeck-example', path: 'examples/tidemark', commit: cove.commit });
- expect(selection.packs['holodeck-crescent-cove'].source).toMatchObject({ kind: 'holodeck-example', path: 'examples/crescent-cove', sourceRevision: 15 });
+ expect(selection.packs['holodeck-crescent-cove'].source).toMatchObject({ kind: 'holodeck-example', path: 'examples/crescent-cove', sourceRevision: 16 });
for (const slug of selection.packs['holodeck-cove'].assets) {
const record = selection.assets[slug as keyof typeof selection.assets];
expect(record.placements.map((placement) => placement.pack)).toEqual(['holodeck-cove', 'holodeck-tidemark', 'holodeck-courtyard', 'holodeck-crescent-cove']);
}
for (const pack of catalog.packs) {
const earlier = (pack as { sceneStillPlacesEarlier?: { slug: string; placedRevisionId: string; finalRevisionId: string }[] }).sceneStillPlacesEarlier ?? [];
- expect(earlier.map((entry) => entry.slug).sort()).toEqual(pack.id === 'holodeck-crescent-cove' ? selection.packs['holodeck-cove'].assets.slice().sort() : []);
+ expect(earlier.map((entry) => entry.slug).sort()).toEqual([]);
for (const entry of earlier) {
expect(catalog.assets.find((candidate) => candidate.slug === entry.slug)?.revisionId).toBe(entry.finalRevisionId);
expect(entry.placedRevisionId).not.toBe(entry.finalRevisionId);
diff --git a/site/src/data/holodeck.json b/site/src/data/holodeck.json
index 7ce43611..b0e1bdfd 100644
--- a/site/src/data/holodeck.json
+++ b/site/src/data/holodeck.json
@@ -20,7 +20,7 @@
"source": {
"kind": "holodeck-example",
"ref": "main",
- "commit": "e8e54551a09d8324f78b26593a7b3a5ac4711465",
+ "commit": "06a37b45c122c72f045c1b55ff031adcffcb678b",
"path": "examples/tidemark",
"sourceRevision": 8,
"worldSha256": "bda05abacf0c445e822a4070506284fef90bf77f81c45c096932c497b2c46c80"
@@ -146,7 +146,7 @@
"source": {
"kind": "holodeck-modules",
"ref": "main",
- "commit": "e8e54551a09d8324f78b26593a7b3a5ac4711465",
+ "commit": "06a37b45c122c72f045c1b55ff031adcffcb678b",
"files": "assets/cove/modules/*/provenance.json, public/assets/cove-modules/*.glb"
},
"assets": [
@@ -188,11 +188,11 @@
"assetCount": 49,
"source": {
"kind": "holodeck-example",
- "ref": "fbb5827",
- "commit": "fbb58272779f0d417fbb899d58d19414e691b71d",
+ "ref": "0675bf89683cc5a9458a39dfdd47eccfc63b3e28",
+ "commit": "0675bf89683cc5a9458a39dfdd47eccfc63b3e28",
"path": "examples/crescent-cove",
- "sourceRevision": 15,
- "worldSha256": "9b04ef1cc2a85def679b056a8515860f81c42c9ad5552673b4a2e684bdd73639"
+ "sourceRevision": 16,
+ "worldSha256": "7cd28fe514d22b4c35db48d57be697ee746c3dc728ec1b9bea6981d3f360cee8"
},
"assets": [
"cove-structure",
@@ -245,56 +245,6 @@
"crescent-jetty-stair",
"crescent-seagrass"
],
- "sceneStillPlacesEarlier": [
- {
- "id": "structure",
- "slug": "cove-structure",
- "placedRevisionId": "r_e96d8b9675f845d0b6cb20087815c302",
- "finalRevisionId": "r_2387ce274123402dbdafd818e6fb0043"
- },
- {
- "id": "canopy",
- "slug": "cove-canopy",
- "placedRevisionId": "r_cf893c2415774c149c65fdd180a69082",
- "finalRevisionId": "r_df0485467228414780cfa44c0f2e32ad"
- },
- {
- "id": "seating",
- "slug": "cove-seating",
- "placedRevisionId": "r_2ab5c612ea064b98b7ac60c75514b4f2",
- "finalRevisionId": "r_6602fd828a5341eeaa0877fc58289960"
- },
- {
- "id": "hearth",
- "slug": "cove-hearth",
- "placedRevisionId": "r_1094b1f7bfeb427a96460628a00e57a8",
- "finalRevisionId": "r_5ef43760979043d48f358fe2932147dc"
- },
- {
- "id": "planting",
- "slug": "cove-planting",
- "placedRevisionId": "r_0c51c3f449eb4f9397ba7bd9641b5a4b",
- "finalRevisionId": "r_cdb8552ccdde43f28d3995b2a5a30d25"
- },
- {
- "id": "rug",
- "slug": "cove-rug",
- "placedRevisionId": "r_fd535a72cbfa4b2cb4b03ff1385b5dba",
- "finalRevisionId": "r_651bc2867976426996191865ea931163"
- },
- {
- "id": "lamp",
- "slug": "cove-lamp",
- "placedRevisionId": "r_cb8878bebeab484c8901829e94b175d1",
- "finalRevisionId": "r_3b14d66959f942c887c5550f60d6d8ce"
- },
- {
- "id": "moodboard",
- "slug": "cove-moodboard",
- "placedRevisionId": "r_ae0d19de532347758f5c555ec8965da4",
- "finalRevisionId": "r_aedc5a07c6d34c1fb19f5cf959ce679c"
- }
- ],
"downloads": [
{
"profile": "runtime",