@almadar/ui 5.61.0 → 5.63.1

package/dist/components/game/molecules/three/index.cjs

@@ -401,12 +401,18 @@ function ModelLoader({
     });
     return cloned;
   }, [loadedModel, castShadow, receiveShadow]);
+  const normFactor = React11.useMemo(() => {
+    if (!model) return 1;
+    const box = new THREE6__namespace.Box3().setFromObject(model);
+    const size = new THREE6__namespace.Vector3();
+    box.getSize(size);
+    const maxDim = Math.max(size.x, size.y, size.z);
+    return maxDim > 0 && Number.isFinite(maxDim) ? 1 / maxDim : 1;
+  }, [model]);
   const scaleArray = React11.useMemo(() => {
-    if (typeof scale === "number") {
-      return [scale, scale, scale];
-    }
-    return scale;
-  }, [scale]);
+    const base = typeof scale === "number" ? [scale, scale, scale] : scale;
+    return [base[0] * normFactor, base[1] * normFactor, base[2] * normFactor];
+  }, [scale, normFactor]);
   const rotationRad = React11.useMemo(() => {
     return [
       rotation[0] * Math.PI / 180,
@@ -2590,6 +2596,29 @@ var GameCanvas3D = React11.forwardRef(
     const controlsRef = React11.useRef(null);
     const [hoveredTile, setHoveredTile] = React11.useState(null);
     const [internalError, setInternalError] = React11.useState(null);
+    React11.useEffect(() => {
+      const el = containerRef.current;
+      if (!el) return;
+      let node = el;
+      let depth = 0;
+      while (node && depth < 8) {
+        const cs = window.getComputedStyle(node);
+        const rect = node.getBoundingClientRect();
+        console.log("[almadar:ui:game:3d-height]", {
+          depth,
+          tag: node.tagName,
+          id: node.id || void 0,
+          className: node.className?.slice?.(0, 60) || void 0,
+          rectHeight: rect.height,
+          computedHeight: cs.height,
+          computedMinHeight: cs.minHeight,
+          computedFlex: cs.flex,
+          computedOverflow: cs.overflow
+        });
+        node = node.parentElement;
+        depth++;
+      }
+    }, []);
     const { sheetUrls: atlasSheetUrls, resolveUnitFrame } = useUnitSpriteAtlas(units);
     const preloadUrls = React11.useMemo(() => [...preloadAssets, ...atlasSheetUrls], [preloadAssets, atlasSheetUrls]);
     const { isLoading: assetsLoading, progress, loaded, total } = useAssetLoader({
@@ -2979,7 +3008,7 @@ var GameCanvas3D = React11.forwardRef(
           {
             ref: containerRef,
             className: cn("game-canvas-3d relative w-full overflow-hidden", className),
-            style: { minHeight: "85vh" },
+            style: { height: "85vh" },
             "data-orientation": orientation,
             "data-camera-mode": cameraMode,
             "data-overlay": overlay,
@@ -2994,7 +3023,7 @@ var GameCanvas3D = React11.forwardRef(
                     near: 0.1,
                     far: 1e3
                   },
-                  style: { background: backgroundColor, height: "85vh", width: "100%" },
+                  style: { background: backgroundColor, position: "absolute", inset: 0 },
                   onClick: (e) => {
                     if (e.target === e.currentTarget) {
                       eventHandlers.handleCanvasClick(e);
@@ -3072,6 +3101,9 @@ var GameCanvas3D = React11.forwardRef(
                         target: cameraTarget,
                         enableDamping: true,
                         dampingFactor: 0.05,
+                        enableZoom: true,
+                        enablePan: true,
+                        touches: { ONE: THREE6__namespace.TOUCH.ROTATE, TWO: THREE6__namespace.TOUCH.DOLLY_PAN },
                         minDistance: 2,
                         maxDistance: 100,
                         maxPolarAngle: Math.PI / 2 - 0.1
@@ -4409,6 +4441,51 @@ function GameBoard3D({
   ] });
 }
 GameBoard3D.displayName = "GameBoard3D";
+function useTapReveal(options = {}) {
+  const { onReveal, onDismiss, refs, enabled = true } = options;
+  const [revealed, setRevealed] = React11.useState(false);
+  const onRevealRef = React11.useRef(onReveal);
+  const onDismissRef = React11.useRef(onDismiss);
+  onRevealRef.current = onReveal;
+  onDismissRef.current = onDismiss;
+  const reveal = React11.useCallback(() => {
+    setRevealed((wasRevealed) => {
+      if (!wasRevealed) onRevealRef.current?.();
+      return true;
+    });
+  }, []);
+  const dismiss = React11.useCallback(() => {
+    setRevealed((wasRevealed) => {
+      if (wasRevealed) onDismissRef.current?.();
+      return false;
+    });
+  }, []);
+  const onPointerDown = React11.useCallback(
+    (e) => {
+      if (!enabled || e.pointerType === "mouse") return;
+      if (revealed) dismiss();
+      else reveal();
+    },
+    [enabled, revealed, reveal, dismiss]
+  );
+  React11.useEffect(() => {
+    if (!revealed || typeof document === "undefined") return;
+    const onDocDown = (ev) => {
+      const target = ev.target;
+      if (!(target instanceof Node)) return;
+      const inside = (refs ?? []).some((r) => r.current?.contains(target));
+      if (!inside) dismiss();
+    };
+    const id = setTimeout(() => document.addEventListener("pointerdown", onDocDown), 0);
+    return () => {
+      clearTimeout(id);
+      document.removeEventListener("pointerdown", onDocDown);
+    };
+  }, [revealed, refs, dismiss]);
+  return { revealed, triggerProps: { onPointerDown }, reveal, dismiss };
+}
+
+// components/core/atoms/Box.tsx
 var paddingStyles = {
   none: "p-0",
   xs: "p-1",
@@ -4534,10 +4611,12 @@ var Box = React11__default.default.forwardRef(
     action,
     actionPayload,
     hoverEvent,
+    tapReveal = true,
     maxWidth,
     onClick,
     onMouseEnter,
     onMouseLeave,
+    onPointerDown,
     ...rest
   }, ref) => {
     const eventBus = useEventBus();
@@ -4560,6 +4639,19 @@ var Box = React11__default.default.forwardRef(
       }
       onMouseLeave?.(e);
     }, [hoverEvent, eventBus, onMouseLeave]);
+    const { triggerProps } = useTapReveal({
+      enabled: tapReveal && !!hoverEvent,
+      onReveal: React11.useCallback(() => {
+        if (hoverEvent) eventBus.emit(`UI:${hoverEvent}`, { hovered: true });
+      }, [hoverEvent, eventBus]),
+      onDismiss: React11.useCallback(() => {
+        if (hoverEvent) eventBus.emit(`UI:${hoverEvent}`, { hovered: false });
+      }, [hoverEvent, eventBus])
+    });
+    const handlePointerDown = React11.useCallback((e) => {
+      if (hoverEvent && tapReveal) triggerProps.onPointerDown(e);
+      onPointerDown?.(e);
+    }, [hoverEvent, tapReveal, triggerProps, onPointerDown]);
     const isClickable = action || onClick;
     return React11__default.default.createElement(
       Component2,
@@ -4587,6 +4679,7 @@ var Box = React11__default.default.forwardRef(
         onClick: isClickable ? handleClick : void 0,
         onMouseEnter: hoverEvent || onMouseEnter ? handleMouseEnter : void 0,
         onMouseLeave: hoverEvent || onMouseLeave ? handleMouseLeave : void 0,
+        onPointerDown: hoverEvent && tapReveal || onPointerDown ? handlePointerDown : void 0,
         style: maxWidth ? { maxWidth, ...rest.style } : rest.style,
         ...rest
       },
@@ -4595,36 +4688,113 @@ var Box = React11__default.default.forwardRef(
   }
 );
 Box.displayName = "Box";
-var CDN = "https://almadar-kflow-assets.web.app/shared/3d/dungeon/floor";
-var FLOOR_WALL = `${CDN}/template-floor-detail-a.glb`;
-var FLOOR_DIRT = `${CDN}/template-floor-detail.glb`;
-var FLOOR_OPEN = `${CDN}/template-floor.glb`;
-var DEFAULT_3D_BATTLE_TILES = [
-  { id: "t00", x: 0, y: 0, z: 0, type: "stone", passable: false, modelUrl: FLOOR_WALL },
-  { id: "t10", x: 1, y: 0, z: 0, type: "stone", passable: false, modelUrl: FLOOR_WALL },
-  { id: "t20", x: 2, y: 0, z: 0, type: "stone", passable: false, modelUrl: FLOOR_WALL },
-  { id: "t30", x: 3, y: 0, z: 0, type: "stone", passable: false, modelUrl: FLOOR_WALL },
-  { id: "t40", x: 4, y: 0, z: 0, type: "stone", passable: false, modelUrl: FLOOR_WALL },
-  { id: "t01", x: 0, y: 1, z: 1, type: "stone", passable: false, modelUrl: FLOOR_WALL },
-  { id: "t11", x: 1, y: 1, z: 1, type: "dirt", passable: true, modelUrl: FLOOR_DIRT },
-  { id: "t21", x: 2, y: 1, z: 1, type: "grass", passable: true, modelUrl: FLOOR_OPEN },
-  { id: "t31", x: 3, y: 1, z: 1, type: "grass", passable: true, modelUrl: FLOOR_OPEN },
-  { id: "t41", x: 4, y: 1, z: 1, type: "stone", passable: false, modelUrl: FLOOR_WALL },
-  { id: "t02", x: 0, y: 2, z: 2, type: "stone", passable: false, modelUrl: FLOOR_WALL },
-  { id: "t12", x: 1, y: 2, z: 2, type: "grass", passable: true, modelUrl: FLOOR_OPEN },
-  { id: "t22", x: 2, y: 2, z: 2, type: "dirt", passable: true, modelUrl: FLOOR_DIRT },
-  { id: "t32", x: 3, y: 2, z: 2, type: "grass", passable: true, modelUrl: FLOOR_OPEN },
-  { id: "t42", x: 4, y: 2, z: 2, type: "stone", passable: false, modelUrl: FLOOR_WALL },
-  { id: "t03", x: 0, y: 3, z: 3, type: "stone", passable: false, modelUrl: FLOOR_WALL },
-  { id: "t13", x: 1, y: 3, z: 3, type: "grass", passable: true, modelUrl: FLOOR_OPEN },
-  { id: "t23", x: 2, y: 3, z: 3, type: "grass", passable: true, modelUrl: FLOOR_OPEN },
-  { id: "t33", x: 3, y: 3, z: 3, type: "dirt", passable: true, modelUrl: FLOOR_DIRT },
-  { id: "t43", x: 4, y: 3, z: 3, type: "stone", passable: false, modelUrl: FLOOR_WALL },
-  { id: "t04", x: 0, y: 4, z: 4, type: "stone", passable: false, modelUrl: FLOOR_WALL },
-  { id: "t14", x: 1, y: 4, z: 4, type: "stone", passable: false, modelUrl: FLOOR_WALL },
-  { id: "t24", x: 2, y: 4, z: 4, type: "stone", passable: false, modelUrl: FLOOR_WALL },
-  { id: "t34", x: 3, y: 4, z: 4, type: "stone", passable: false, modelUrl: FLOOR_WALL },
-  { id: "t44", x: 4, y: 4, z: 4, type: "stone", passable: false, modelUrl: FLOOR_WALL }
+
+// components/game/templates/game3dAssetManifest.ts
+function resolveManifestUrl(manifest, relative) {
+  if (relative == null) return void 0;
+  if (/^https?:\/\//.test(relative)) return relative;
+  const base = manifest?.baseUrl;
+  if (base == null) return relative;
+  const cleanBase = base.replace(/\/$/, "");
+  const cleanRel = relative.replace(/^\//, "");
+  return `${cleanBase}/${cleanRel}`;
+}
+function tileKind(type, passable) {
+  if (passable === false) return "wall";
+  if (type === "dirt" || type === "road") return "dirt";
+  return "open";
+}
+function resolveTilesWithModels(layout, manifest) {
+  return layout.map((t) => {
+    const kind = t.kind || tileKind(t.type, t.passable);
+    return {
+      id: t.id,
+      x: t.x,
+      y: t.y,
+      z: t.z,
+      type: t.type,
+      passable: t.passable,
+      modelUrl: resolveManifestUrl(manifest, manifest?.models?.[kind])
+    };
+  });
+}
+function resolvePropTiles(tiles, manifest) {
+  return tiles.map((t) => {
+    const kind = tileKind(t.type ?? "", t.passable);
+    return {
+      ...t,
+      modelUrl: t.modelUrl ?? resolveManifestUrl(manifest, manifest?.models?.[kind])
+    };
+  });
+}
+function resolveEntityTiles(entity, manifest) {
+  const row = boardEntity(entity);
+  if (!row) return [];
+  return rows(row.tiles).map((r) => {
+    const type = str(r.type) || str(r.terrain);
+    const passable = r.passable !== false;
+    const kind = tileKind(type, passable);
+    const explicitModel = r.modelUrl == null ? void 0 : str(r.modelUrl);
+    return {
+      id: r.id == null ? void 0 : str(r.id),
+      x: num(r.x),
+      y: num(r.y),
+      z: r.z == null ? void 0 : num(r.z),
+      type,
+      passable,
+      modelUrl: explicitModel ?? resolveManifestUrl(manifest, manifest?.models?.[kind])
+    };
+  });
+}
+function resolveFeaturesWithModels(features, manifest) {
+  return features.map((f) => ({
+    ...f,
+    assetUrl: f.assetUrl ?? resolveManifestUrl(manifest, manifest?.features?.[f.type])
+  }));
+}
+function resolveEntityFeatures(entity, manifest) {
+  const row = boardEntity(entity);
+  if (!row) return [];
+  return rows(row.features).map((r) => {
+    const type = str(r.type);
+    const explicit = r.assetUrl == null ? void 0 : str(r.assetUrl);
+    return {
+      id: r.id == null ? void 0 : str(r.id),
+      x: num(r.x),
+      y: num(r.y),
+      z: r.z == null ? void 0 : num(r.z),
+      type,
+      color: r.color == null ? void 0 : str(r.color),
+      assetUrl: explicit ?? resolveManifestUrl(manifest, manifest?.features?.[type])
+    };
+  });
+}
+var DEFAULT_3D_BATTLE_LAYOUT = [
+  { id: "t00", x: 0, y: 0, z: 0, type: "stone", passable: false, kind: "wall" },
+  { id: "t10", x: 1, y: 0, z: 0, type: "stone", passable: false, kind: "wall" },
+  { id: "t20", x: 2, y: 0, z: 0, type: "stone", passable: false, kind: "wall" },
+  { id: "t30", x: 3, y: 0, z: 0, type: "stone", passable: false, kind: "wall" },
+  { id: "t40", x: 4, y: 0, z: 0, type: "stone", passable: false, kind: "wall" },
+  { id: "t01", x: 0, y: 1, z: 1, type: "stone", passable: false, kind: "wall" },
+  { id: "t11", x: 1, y: 1, z: 1, type: "dirt", passable: true, kind: "dirt" },
+  { id: "t21", x: 2, y: 1, z: 1, type: "grass", passable: true, kind: "open" },
+  { id: "t31", x: 3, y: 1, z: 1, type: "grass", passable: true, kind: "open" },
+  { id: "t41", x: 4, y: 1, z: 1, type: "stone", passable: false, kind: "wall" },
+  { id: "t02", x: 0, y: 2, z: 2, type: "stone", passable: false, kind: "wall" },
+  { id: "t12", x: 1, y: 2, z: 2, type: "grass", passable: true, kind: "open" },
+  { id: "t22", x: 2, y: 2, z: 2, type: "dirt", passable: true, kind: "dirt" },
+  { id: "t32", x: 3, y: 2, z: 2, type: "grass", passable: true, kind: "open" },
+  { id: "t42", x: 4, y: 2, z: 2, type: "stone", passable: false, kind: "wall" },
+  { id: "t03", x: 0, y: 3, z: 3, type: "stone", passable: false, kind: "wall" },
+  { id: "t13", x: 1, y: 3, z: 3, type: "grass", passable: true, kind: "open" },
+  { id: "t23", x: 2, y: 3, z: 3, type: "grass", passable: true, kind: "open" },
+  { id: "t33", x: 3, y: 3, z: 3, type: "dirt", passable: true, kind: "dirt" },
+  { id: "t43", x: 4, y: 3, z: 3, type: "stone", passable: false, kind: "wall" },
+  { id: "t04", x: 0, y: 4, z: 4, type: "stone", passable: false, kind: "wall" },
+  { id: "t14", x: 1, y: 4, z: 4, type: "stone", passable: false, kind: "wall" },
+  { id: "t24", x: 2, y: 4, z: 4, type: "stone", passable: false, kind: "wall" },
+  { id: "t34", x: 3, y: 4, z: 4, type: "stone", passable: false, kind: "wall" },
+  { id: "t44", x: 4, y: 4, z: 4, type: "stone", passable: false, kind: "wall" }
 ];
 var DEFAULT_3D_BATTLE_FEATURES = [
   { id: "f1", x: 2, y: 2, z: 2, type: "gold_mine", color: "#f4c542" },
@@ -4632,8 +4802,9 @@ var DEFAULT_3D_BATTLE_FEATURES = [
 ];
 function GameCanvas3DBattleTemplate({
   entity,
-  tiles: propTiles = DEFAULT_3D_BATTLE_TILES,
+  tiles: propTiles,
   features: propFeatures = DEFAULT_3D_BATTLE_FEATURES,
+  assetManifest,
   cameraMode = "perspective",
   backgroundColor = "#2a1a1a",
   tileClickEvent,
@@ -4647,11 +4818,12 @@ function GameCanvas3DBattleTemplate({
   scale,
   className
 }) {
-  const resolved = entity && typeof entity === "object" && !Array.isArray(entity) ? entity : void 0;
-  const tiles = resolved ? Array.isArray(resolved.tiles) ? resolved.tiles : [] : propTiles;
-  const features = resolved ? Array.isArray(resolved.features) ? resolved.features : [] : propFeatures;
-  const currentTurn = resolved?.currentTeam;
-  const round = resolved?.turn == null ? void 0 : Number(resolved.turn);
+  const row = boardEntity(entity);
+  const hasEntityTiles = !!row && Array.isArray(row.tiles) && row.tiles.length > 0;
+  const tiles = hasEntityTiles ? resolveEntityTiles(entity, assetManifest) : propTiles ? resolvePropTiles(propTiles, assetManifest) : resolveTilesWithModels(DEFAULT_3D_BATTLE_LAYOUT, assetManifest);
+  const features = row && Array.isArray(row.features) && row.features.length > 0 ? resolveEntityFeatures(entity, assetManifest) : resolveFeaturesWithModels(propFeatures, assetManifest);
+  const currentTurn = row?.currentTeam == null ? void 0 : String(row.currentTeam);
+  const round = row?.turn == null ? void 0 : Number(row.turn);
   return /* @__PURE__ */ jsxRuntime.jsxs(
     Box,
     {
@@ -4697,36 +4869,32 @@ function GameCanvas3DBattleTemplate({
   );
 }
 GameCanvas3DBattleTemplate.displayName = "GameCanvas3DBattleTemplate";
-var CDN2 = "https://almadar-kflow-assets.web.app/shared/3d/dungeon/floor";
-var FLOOR_WALL2 = `${CDN2}/template-floor-detail-a.glb`;
-var FLOOR_DIRT2 = `${CDN2}/template-floor-detail.glb`;
-var FLOOR_OPEN2 = `${CDN2}/template-floor.glb`;
-var DEFAULT_3D_CASTLE_TILES = [
-  { id: "t00", x: 0, y: 0, z: 0, type: "wall", passable: false, modelUrl: FLOOR_WALL2 },
-  { id: "t10", x: 1, y: 0, z: 0, type: "wall", passable: false, modelUrl: FLOOR_WALL2 },
-  { id: "t20", x: 2, y: 0, z: 0, type: "wall", passable: false, modelUrl: FLOOR_WALL2 },
-  { id: "t30", x: 3, y: 0, z: 0, type: "wall", passable: false, modelUrl: FLOOR_WALL2 },
-  { id: "t40", x: 4, y: 0, z: 0, type: "wall", passable: false, modelUrl: FLOOR_WALL2 },
-  { id: "t01", x: 0, y: 1, z: 1, type: "wall", passable: false, modelUrl: FLOOR_WALL2 },
-  { id: "t11", x: 1, y: 1, z: 1, type: "floor", passable: true, modelUrl: FLOOR_DIRT2 },
-  { id: "t21", x: 2, y: 1, z: 1, type: "floor", passable: true, modelUrl: FLOOR_OPEN2 },
-  { id: "t31", x: 3, y: 1, z: 1, type: "floor", passable: true, modelUrl: FLOOR_OPEN2 },
-  { id: "t41", x: 4, y: 1, z: 1, type: "wall", passable: false, modelUrl: FLOOR_WALL2 },
-  { id: "t02", x: 0, y: 2, z: 2, type: "wall", passable: false, modelUrl: FLOOR_WALL2 },
-  { id: "t12", x: 1, y: 2, z: 2, type: "floor", passable: true, modelUrl: FLOOR_OPEN2 },
-  { id: "t22", x: 2, y: 2, z: 2, type: "floor", passable: true, modelUrl: FLOOR_DIRT2 },
-  { id: "t32", x: 3, y: 2, z: 2, type: "floor", passable: true, modelUrl: FLOOR_OPEN2 },
-  { id: "t42", x: 4, y: 2, z: 2, type: "wall", passable: false, modelUrl: FLOOR_WALL2 },
-  { id: "t03", x: 0, y: 3, z: 3, type: "wall", passable: false, modelUrl: FLOOR_WALL2 },
-  { id: "t13", x: 1, y: 3, z: 3, type: "floor", passable: true, modelUrl: FLOOR_OPEN2 },
-  { id: "t23", x: 2, y: 3, z: 3, type: "floor", passable: true, modelUrl: FLOOR_OPEN2 },
-  { id: "t33", x: 3, y: 3, z: 3, type: "floor", passable: true, modelUrl: FLOOR_DIRT2 },
-  { id: "t43", x: 4, y: 3, z: 3, type: "wall", passable: false, modelUrl: FLOOR_WALL2 },
-  { id: "t04", x: 0, y: 4, z: 4, type: "wall", passable: false, modelUrl: FLOOR_WALL2 },
-  { id: "t14", x: 1, y: 4, z: 4, type: "wall", passable: false, modelUrl: FLOOR_WALL2 },
-  { id: "t24", x: 2, y: 4, z: 4, type: "wall", passable: false, modelUrl: FLOOR_WALL2 },
-  { id: "t34", x: 3, y: 4, z: 4, type: "wall", passable: false, modelUrl: FLOOR_WALL2 },
-  { id: "t44", x: 4, y: 4, z: 4, type: "wall", passable: false, modelUrl: FLOOR_WALL2 }
+var DEFAULT_3D_CASTLE_LAYOUT = [
+  { id: "t00", x: 0, y: 0, z: 0, type: "wall", passable: false, kind: "wall" },
+  { id: "t10", x: 1, y: 0, z: 0, type: "wall", passable: false, kind: "wall" },
+  { id: "t20", x: 2, y: 0, z: 0, type: "wall", passable: false, kind: "wall" },
+  { id: "t30", x: 3, y: 0, z: 0, type: "wall", passable: false, kind: "wall" },
+  { id: "t40", x: 4, y: 0, z: 0, type: "wall", passable: false, kind: "wall" },
+  { id: "t01", x: 0, y: 1, z: 1, type: "wall", passable: false, kind: "wall" },
+  { id: "t11", x: 1, y: 1, z: 1, type: "floor", passable: true, kind: "dirt" },
+  { id: "t21", x: 2, y: 1, z: 1, type: "floor", passable: true, kind: "open" },
+  { id: "t31", x: 3, y: 1, z: 1, type: "floor", passable: true, kind: "open" },
+  { id: "t41", x: 4, y: 1, z: 1, type: "wall", passable: false, kind: "wall" },
+  { id: "t02", x: 0, y: 2, z: 2, type: "wall", passable: false, kind: "wall" },
+  { id: "t12", x: 1, y: 2, z: 2, type: "floor", passable: true, kind: "open" },
+  { id: "t22", x: 2, y: 2, z: 2, type: "floor", passable: true, kind: "dirt" },
+  { id: "t32", x: 3, y: 2, z: 2, type: "floor", passable: true, kind: "open" },
+  { id: "t42", x: 4, y: 2, z: 2, type: "wall", passable: false, kind: "wall" },
+  { id: "t03", x: 0, y: 3, z: 3, type: "wall", passable: false, kind: "wall" },
+  { id: "t13", x: 1, y: 3, z: 3, type: "floor", passable: true, kind: "open" },
+  { id: "t23", x: 2, y: 3, z: 3, type: "floor", passable: true, kind: "open" },
+  { id: "t33", x: 3, y: 3, z: 3, type: "floor", passable: true, kind: "dirt" },
+  { id: "t43", x: 4, y: 3, z: 3, type: "wall", passable: false, kind: "wall" },
+  { id: "t04", x: 0, y: 4, z: 4, type: "wall", passable: false, kind: "wall" },
+  { id: "t14", x: 1, y: 4, z: 4, type: "wall", passable: false, kind: "wall" },
+  { id: "t24", x: 2, y: 4, z: 4, type: "wall", passable: false, kind: "wall" },
+  { id: "t34", x: 3, y: 4, z: 4, type: "wall", passable: false, kind: "wall" },
+  { id: "t44", x: 4, y: 4, z: 4, type: "wall", passable: false, kind: "wall" }
 ];
 var DEFAULT_3D_CASTLE_FEATURES = [
   { id: "f1", x: 2, y: 2, z: 2, type: "chest", color: "#f4c542" },
@@ -4734,8 +4902,9 @@ var DEFAULT_3D_CASTLE_FEATURES = [
 ];
 function GameCanvas3DCastleTemplate({
   entity,
-  tiles: propTiles = DEFAULT_3D_CASTLE_TILES,
+  tiles: propTiles,
   features: propFeatures = DEFAULT_3D_CASTLE_FEATURES,
+  assetManifest,
   cameraMode = "isometric",
   backgroundColor = "#1e1e2e",
   buildingClickEvent,
@@ -4750,13 +4919,14 @@ function GameCanvas3DCastleTemplate({
   scale,
   className
 }) {
-  const resolved = entity && typeof entity === "object" && !Array.isArray(entity) ? entity : void 0;
-  const tiles = resolved ? Array.isArray(resolved.tiles) ? resolved.tiles : [] : propTiles;
-  const features = resolved ? Array.isArray(resolved.features) ? resolved.features : [] : propFeatures;
-  const name = resolved?.name == null ? void 0 : String(resolved.name);
-  const level = resolved?.level == null ? void 0 : Number(resolved.level);
-  const owner = resolved?.owner == null ? void 0 : String(resolved.owner);
-  const unitCount = resolved && Array.isArray(resolved.units) ? resolved.units.length : 0;
+  const row = boardEntity(entity);
+  const hasEntityTiles = !!row && Array.isArray(row.tiles) && row.tiles.length > 0;
+  const tiles = hasEntityTiles ? resolveEntityTiles(entity, assetManifest) : propTiles ? resolvePropTiles(propTiles, assetManifest) : resolveTilesWithModels(DEFAULT_3D_CASTLE_LAYOUT, assetManifest);
+  const features = row && Array.isArray(row.features) && row.features.length > 0 ? resolveEntityFeatures(entity, assetManifest) : resolveFeaturesWithModels(propFeatures, assetManifest);
+  const name = row?.name == null ? void 0 : str(row.name);
+  const level = row?.level == null ? void 0 : num(row.level);
+  const owner = row?.owner == null ? void 0 : str(row.owner);
+  const unitCount = row && Array.isArray(row.units) ? row.units.length : 0;
   return /* @__PURE__ */ jsxRuntime.jsxs(
     VStack,
     {
@@ -4802,36 +4972,32 @@ function GameCanvas3DCastleTemplate({
   );
 }
 GameCanvas3DCastleTemplate.displayName = "GameCanvas3DCastleTemplate";
-var CDN3 = "https://almadar-kflow-assets.web.app/shared/3d/dungeon/floor";
-var FLOOR_WALL3 = `${CDN3}/template-floor-detail-a.glb`;
-var FLOOR_DIRT3 = `${CDN3}/template-floor-detail.glb`;
-var FLOOR_OPEN3 = `${CDN3}/template-floor.glb`;
-var DEFAULT_3D_WORLDMAP_TILES = [
-  { id: "t00", x: 0, y: 0, z: 0, type: "mountain", passable: false, modelUrl: FLOOR_WALL3 },
-  { id: "t10", x: 1, y: 0, z: 0, type: "mountain", passable: false, modelUrl: FLOOR_WALL3 },
-  { id: "t20", x: 2, y: 0, z: 0, type: "water", passable: false, modelUrl: FLOOR_WALL3 },
-  { id: "t30", x: 3, y: 0, z: 0, type: "mountain", passable: false, modelUrl: FLOOR_WALL3 },
-  { id: "t40", x: 4, y: 0, z: 0, type: "mountain", passable: false, modelUrl: FLOOR_WALL3 },
-  { id: "t01", x: 0, y: 1, z: 1, type: "mountain", passable: false, modelUrl: FLOOR_WALL3 },
-  { id: "t11", x: 1, y: 1, z: 1, type: "grass", passable: true, modelUrl: FLOOR_OPEN3 },
-  { id: "t21", x: 2, y: 1, z: 1, type: "grass", passable: true, modelUrl: FLOOR_OPEN3 },
-  { id: "t31", x: 3, y: 1, z: 1, type: "grass", passable: true, modelUrl: FLOOR_OPEN3 },
-  { id: "t41", x: 4, y: 1, z: 1, type: "water", passable: false, modelUrl: FLOOR_WALL3 },
-  { id: "t02", x: 0, y: 2, z: 2, type: "water", passable: false, modelUrl: FLOOR_WALL3 },
-  { id: "t12", x: 1, y: 2, z: 2, type: "grass", passable: true, modelUrl: FLOOR_OPEN3 },
-  { id: "t22", x: 2, y: 2, z: 2, type: "road", passable: true, modelUrl: FLOOR_DIRT3 },
-  { id: "t32", x: 3, y: 2, z: 2, type: "grass", passable: true, modelUrl: FLOOR_OPEN3 },
-  { id: "t42", x: 4, y: 2, z: 2, type: "mountain", passable: false, modelUrl: FLOOR_WALL3 },
-  { id: "t03", x: 0, y: 3, z: 3, type: "mountain", passable: false, modelUrl: FLOOR_WALL3 },
-  { id: "t13", x: 1, y: 3, z: 3, type: "grass", passable: true, modelUrl: FLOOR_OPEN3 },
-  { id: "t23", x: 2, y: 3, z: 3, type: "grass", passable: true, modelUrl: FLOOR_OPEN3 },
-  { id: "t33", x: 3, y: 3, z: 3, type: "road", passable: true, modelUrl: FLOOR_DIRT3 },
-  { id: "t43", x: 4, y: 3, z: 3, type: "mountain", passable: false, modelUrl: FLOOR_WALL3 },
-  { id: "t04", x: 0, y: 4, z: 4, type: "mountain", passable: false, modelUrl: FLOOR_WALL3 },
-  { id: "t14", x: 1, y: 4, z: 4, type: "water", passable: false, modelUrl: FLOOR_WALL3 },
-  { id: "t24", x: 2, y: 4, z: 4, type: "grass", passable: true, modelUrl: FLOOR_OPEN3 },
-  { id: "t34", x: 3, y: 4, z: 4, type: "mountain", passable: false, modelUrl: FLOOR_WALL3 },
-  { id: "t44", x: 4, y: 4, z: 4, type: "mountain", passable: false, modelUrl: FLOOR_WALL3 }
+var DEFAULT_3D_WORLDMAP_LAYOUT = [
+  { id: "t00", x: 0, y: 0, z: 0, type: "mountain", passable: false, kind: "wall" },
+  { id: "t10", x: 1, y: 0, z: 0, type: "mountain", passable: false, kind: "wall" },
+  { id: "t20", x: 2, y: 0, z: 0, type: "water", passable: false, kind: "wall" },
+  { id: "t30", x: 3, y: 0, z: 0, type: "mountain", passable: false, kind: "wall" },
+  { id: "t40", x: 4, y: 0, z: 0, type: "mountain", passable: false, kind: "wall" },
+  { id: "t01", x: 0, y: 1, z: 1, type: "mountain", passable: false, kind: "wall" },
+  { id: "t11", x: 1, y: 1, z: 1, type: "grass", passable: true, kind: "open" },
+  { id: "t21", x: 2, y: 1, z: 1, type: "grass", passable: true, kind: "open" },
+  { id: "t31", x: 3, y: 1, z: 1, type: "grass", passable: true, kind: "open" },
+  { id: "t41", x: 4, y: 1, z: 1, type: "water", passable: false, kind: "wall" },
+  { id: "t02", x: 0, y: 2, z: 2, type: "water", passable: false, kind: "wall" },
+  { id: "t12", x: 1, y: 2, z: 2, type: "grass", passable: true, kind: "open" },
+  { id: "t22", x: 2, y: 2, z: 2, type: "road", passable: true, kind: "dirt" },
+  { id: "t32", x: 3, y: 2, z: 2, type: "grass", passable: true, kind: "open" },
+  { id: "t42", x: 4, y: 2, z: 2, type: "mountain", passable: false, kind: "wall" },
+  { id: "t03", x: 0, y: 3, z: 3, type: "mountain", passable: false, kind: "wall" },
+  { id: "t13", x: 1, y: 3, z: 3, type: "grass", passable: true, kind: "open" },
+  { id: "t23", x: 2, y: 3, z: 3, type: "grass", passable: true, kind: "open" },
+  { id: "t33", x: 3, y: 3, z: 3, type: "road", passable: true, kind: "dirt" },
+  { id: "t43", x: 4, y: 3, z: 3, type: "mountain", passable: false, kind: "wall" },
+  { id: "t04", x: 0, y: 4, z: 4, type: "mountain", passable: false, kind: "wall" },
+  { id: "t14", x: 1, y: 4, z: 4, type: "water", passable: false, kind: "wall" },
+  { id: "t24", x: 2, y: 4, z: 4, type: "grass", passable: true, kind: "open" },
+  { id: "t34", x: 3, y: 4, z: 4, type: "mountain", passable: false, kind: "wall" },
+  { id: "t44", x: 4, y: 4, z: 4, type: "mountain", passable: false, kind: "wall" }
 ];
 var DEFAULT_3D_WORLDMAP_FEATURES = [
   { id: "f1", x: 2, y: 2, z: 2, type: "capital", color: "#f4c542" },
@@ -4839,8 +5005,9 @@ var DEFAULT_3D_WORLDMAP_FEATURES = [
 ];
 function GameCanvas3DWorldMapTemplate({
   entity,
-  tiles: propTiles = DEFAULT_3D_WORLDMAP_TILES,
+  tiles: propTiles,
   features: propFeatures = DEFAULT_3D_WORLDMAP_FEATURES,
+  assetManifest,
   cameraMode = "isometric",
   backgroundColor = "#1a1a2e",
   tileClickEvent,
@@ -4854,9 +5021,10 @@ function GameCanvas3DWorldMapTemplate({
   scale,
   className
 }) {
-  const resolved = entity && typeof entity === "object" && !Array.isArray(entity) ? entity : void 0;
-  const tiles = resolved ? Array.isArray(resolved.tiles) ? resolved.tiles : [] : propTiles;
-  const features = resolved ? Array.isArray(resolved.features) ? resolved.features : [] : propFeatures;
+  const row = boardEntity(entity);
+  const hasEntityTiles = !!row && Array.isArray(row.tiles) && row.tiles.length > 0;
+  const tiles = hasEntityTiles ? resolveEntityTiles(entity, assetManifest) : propTiles ? resolvePropTiles(propTiles, assetManifest) : resolveTilesWithModels(DEFAULT_3D_WORLDMAP_LAYOUT, assetManifest);
+  const features = row && Array.isArray(row.features) && row.features.length > 0 ? resolveEntityFeatures(entity, assetManifest) : resolveFeaturesWithModels(propFeatures, assetManifest);
   return (
     /* GameBoard3D reads selectedUnitId/validMoves/attackTargets from entity */
     /* @__PURE__ */ jsxRuntime.jsx(