@jgengine/shell 0.11.0 → 0.12.0

package/dist/render/resolveModel.js

@@ -14,7 +14,11 @@ export function resolveModel(value, assets, context) {
         const where = context === undefined ? `model asset "${value}"` : `${context.seam}["${context.key}"] → "${value}"`;
         throw new Error(`[jgengine] missing ${where} — not in the asset catalog. Fix the id, register it, or omit the mapping to keep the deliberate primitive/sprite fallback.`);
     }
-    return ref.dims === undefined ? { url: ref.url } : { url: ref.url, dims: ref.dims };
+    return {
+        url: ref.url,
+        ...(ref.dims === undefined ? {} : { dims: ref.dims }),
+        ...(ref.collisionMesh === undefined ? {} : { collisionMesh: ref.collisionMesh }),
+    };
 }
 /** Soft lookup used when an object catalog id may double as a model asset id.
  * @internal
@@ -23,7 +27,11 @@ export function tryResolveCatalogModel(id, assets) {
     const ref = assets.resolve(id);
     if (ref === null)
         return undefined;
-    return ref.dims === undefined ? { url: ref.url } : { url: ref.url, dims: ref.dims };
+    return {
+        url: ref.url,
+        ...(ref.dims === undefined ? {} : { dims: ref.dims }),
+        ...(ref.collisionMesh === undefined ? {} : { collisionMesh: ref.collisionMesh }),
+    };
 }
 /**
  * Resolve an entity model plus bone-attachment / kit-of-parts models through the catalog
@@ -82,6 +90,33 @@ export function resolveModelPlan(assets, plan) {
     }
     return out;
 }
+function softModelLookup(map, assets) {
+    if (map === undefined)
+        return undefined;
+    return (key) => {
+        const value = map[key];
+        if (value === undefined || typeof value !== "string")
+            return value;
+        return tryResolveCatalogModel(value, assets);
+    };
+}
+/**
+ * The `createGameContext` `models` lookup derived from a playable's render maps: what each entity kind /
+ * object catalog id actually renders as, so colliders auto-fit the rendered mesh. Soft-resolves string
+ * ids (a missing catalog id keeps the default collider instead of throwing — the render path already
+ * reports it), passes inline configs through. `undefined` when the playable maps no models at all.
+ * @internal
+ */
+export function contextModels(playable) {
+    const entity = softModelLookup(playable.entityModels, playable.game.assets);
+    const object = softModelLookup(playable.objectModels, playable.game.assets);
+    if (entity === undefined && object === undefined)
+        return undefined;
+    return {
+        ...(entity === undefined ? {} : { entity }),
+        ...(object === undefined ? {} : { object }),
+    };
+}
 /**
  * Builds a `(key) => ModelConfig | null` override from a `seam`'s id/config map plus its catalog —
  * `undefined` when either half is missing so the caller can fall back to its own default renderer.

package/dist/scatter/InstancedScatter.js

@@ -5,6 +5,7 @@ import * as THREE from "three";
 import { GLTFLoader } from "three/examples/jsm/loaders/GLTFLoader.js";
 import { MeshoptDecoder } from "three/examples/jsm/libs/meshopt_decoder.module.js";
 import { chunkScatterInstances } from "@jgengine/core/world/scatterRegion";
+import { beginFallbackSeam, reportFallbackSeam } from "@jgengine/core/devtools/fallbackSeams";
 import { buildScatterProxy } from "./scatterProxies.js";
 import { buildScatterModelSources, disposeScatterModelSources } from "./scatterModels.js";
 /** Chunk edge (m): dense fields split into this-sized buckets, each frustum-culled independently. */
@@ -90,6 +91,9 @@ function ScatterModelSpecies({ model, batches }) {
 export function InstancedScatter({ instances, chunkSize = DEFAULT_CHUNK_SIZE, maxInstances = DEFAULT_MAX_INSTANCES, resolveItem, }) {
     const batches = useMemo(() => batchInstances(instances.length > maxInstances ? instances.slice(0, maxInstances) : instances, chunkSize), [instances, chunkSize, maxInstances]);
     const { proxyBatches, modelSpecies } = useMemo(() => {
+        // Dev diagnostic (no-op unless armed): re-zero the scatter seam before re-tallying which species
+        // fall to a stylized proxy (no resolveItem mapping / a null result). Reported once per species.
+        beginFallbackSeam("scatter");
         const proxy = [];
         const bySpecies = new Map();
         const knownProxy = new Set();
@@ -106,6 +110,7 @@ export function InstancedScatter({ instances, chunkSize = DEFAULT_CHUNK_SIZE, ma
             const resolved = resolveItem?.(batch.item) ?? null;
             if (resolved === null) {
                 knownProxy.add(batch.item);
+                reportFallbackSeam("scatter", "omittedMapping");
                 proxy.push(batch);
                 continue;
             }

package/dist/scatter/scatterProxies.js

@@ -6,6 +6,9 @@ const OAK = "#4a7a37";
 const BUSH = "#4d7d3a";
 const ROCK = "#82858c";
 const GRASS = "#5f9a3c";
+const PALM_BARK = "#8a7355";
+const PALM_FROND = "#4c8b3d";
+const CYPRESS = "#31502f";
 /** Concatenates part geometries into one vertex-colored buffer (position + normal + color). */
 function mergeParts(parts) {
     const geos = parts.map((part) => (part.geometry.index === null ? part.geometry : part.geometry.toNonIndexed()));
@@ -80,6 +83,27 @@ const BUILDERS = {
         { geometry: cone(0.08, 0.55, 0).translate(0.12, 0, 0.05), color: GRASS },
         { geometry: cone(0.08, 0.6, 0).translate(-0.1, 0, -0.06), color: GRASS },
     ]),
+    palm: () => {
+        // Tall bare trunk with a radial crown of drooping fronds — each frond a flattened cone laid
+        // near-horizontal, tips sagging below the crown.
+        const parts = [{ geometry: trunk(2.6, 0.09), color: PALM_BARK }];
+        for (let i = 0; i < 6; i += 1) {
+            const yaw = (i / 6) * Math.PI * 2;
+            const frond = new THREE.ConeGeometry(0.16, 1.35, 4);
+            frond.scale(1, 1, 0.35);
+            frond.rotateX(-Math.PI / 2 - 0.5);
+            frond.rotateY(yaw);
+            frond.translate(Math.sin(yaw) * 0.32, 2.62, Math.cos(yaw) * 0.32);
+            parts.push({ geometry: frond, color: PALM_FROND });
+        }
+        parts.push({ geometry: sphere(0.14, 2.56), color: PALM_BARK });
+        return mergeParts(parts);
+    },
+    cypress: () => mergeParts([
+        { geometry: trunk(0.5, 0.07), color: BARK },
+        { geometry: cone(0.34, 2.5, 0.35, 6), color: CYPRESS },
+        { geometry: cone(0.2, 0.7, 2.75, 5), color: CYPRESS },
+    ]),
 };
 function defaultProxy() {
     return mergeParts([{ geometry: cone(0.35, 1.2, 0), color: GRASS }]);

package/dist/scene/AuthoredScene.d.ts

@@ -68,6 +68,8 @@ export interface AuthoredSceneProps {
     placeObjects?: boolean | {
         verticalOffset?: number;
     };
+    /** Terrain surface color sampler forwarded to studio renderers (see `SceneKindRenderContext.groundColorAt`). */
+    groundColorAt?: (x: number, z: number) => string;
 }
 /**
  * Renders an editor document's scene content — draped paths plus GPU-instanced foliage — from one
@@ -79,4 +81,4 @@ export interface AuthoredSceneProps {
  * place markers with your own entity spawns. Pass `scatterModels`+`assets` to resolve palette items to
  * real catalog GLBs; unmapped items keep the stylized proxy.
  */
-export declare function AuthoredScene({ document, field, pathKinds, scatterModels, assets, live, placeObjects, }: AuthoredSceneProps): import("react").JSX.Element;
+export declare function AuthoredScene({ document, field, pathKinds, scatterModels, assets, live, placeObjects, groundColorAt, }: AuthoredSceneProps): import("react").JSX.Element;

package/dist/scene/AuthoredScene.js

@@ -163,11 +163,16 @@ export function AuthoredObjects({ document, field, verticalOffset = 0, onExistin
  * place markers with your own entity spawns. Pass `scatterModels`+`assets` to resolve palette items to
  * real catalog GLBs; unmapped items keep the stylized proxy.
  */
-export function AuthoredScene({ document, field, pathKinds, scatterModels, assets, live = true, placeObjects, }) {
+export function AuthoredScene({ document, field, pathKinds, scatterModels, assets, live = true, placeObjects, groundColorAt, }) {
     const liveDocument = useLiveEditorDocument(document, live);
     const instances = useMemo(() => resolveScatter(liveDocument, field), [liveDocument, field]);
     const resolveItem = useMemo(() => createModelMapResolver(scatterModels, assets, "scatterModels"), [scatterModels, assets]);
     const shouldPlaceObjects = placeObjects === true || (typeof placeObjects === "object" && placeObjects !== null);
     const objectVerticalOffset = typeof placeObjects === "object" && placeObjects !== null ? (placeObjects.verticalOffset ?? 0) : 0;
-    return (_jsxs(_Fragment, { children: [_jsx(AuthoredPaths, { document: liveDocument, field: field, ...(pathKinds === undefined ? {} : { kinds: pathKinds }) }), _jsx(InstancedScatter, { instances: instances, ...(resolveItem === undefined ? {} : { resolveItem }) }), _jsx(AuthoredStudios, { document: liveDocument, context: { document: liveDocument, field, ...(assets === undefined ? {} : { assets }) } }), _jsx(AuthoredGenerators, { document: liveDocument, field: field }), shouldPlaceObjects ? (_jsx(AuthoredObjects, { document: liveDocument, field: field, verticalOffset: objectVerticalOffset })) : null] }));
+    return (_jsxs(_Fragment, { children: [_jsx(AuthoredPaths, { document: liveDocument, field: field, ...(pathKinds === undefined ? {} : { kinds: pathKinds }) }), _jsx(InstancedScatter, { instances: instances, ...(resolveItem === undefined ? {} : { resolveItem }) }), _jsx(AuthoredStudios, { document: liveDocument, context: {
+                    document: liveDocument,
+                    field,
+                    ...(assets === undefined ? {} : { assets }),
+                    ...(groundColorAt === undefined ? {} : { groundColorAt }),
+                } }), _jsx(AuthoredGenerators, { document: liveDocument, field: field }), shouldPlaceObjects ? (_jsx(AuthoredObjects, { document: liveDocument, field: field, verticalOffset: objectVerticalOffset })) : null] }));
 }

package/dist/scene/CityRenderer.d.ts

@@ -0,0 +1,2 @@
+/** Registers the `city` volume runtime renderer. Called by `registerBuiltinSceneKindRenderers`. @internal */
+export declare function registerCityRenderer(): void;