@almadar/ui 5.71.0 → 5.73.0

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

@@ -1779,7 +1779,7 @@ function TileRenderer({
             children: /* @__PURE__ */ jsxRuntime.jsx(
               ModelLoader,
               {
-                url: tile.modelUrl,
+                url: tile.modelUrl?.url,
                 position,
                 scale: cellSize * 0.9,
                 fallbackGeometry: "box",
@@ -2181,7 +2181,7 @@ function FeatureModel({
   onHover
 }) {
   const groupRef = React11.useRef(null);
-  const { model: loadedModel, isLoading } = useGLTFModel2(feature.assetUrl);
+  const { model: loadedModel, isLoading } = useGLTFModel2(feature.assetUrl?.url);
   const model = React11.useMemo(() => {
     if (!loadedModel) return null;
     const cloned = loadedModel.clone();
@@ -2293,13 +2293,6 @@ function preloadFeatures(urls) {
 }
 
 // components/game/organisms/utils/spriteAnimation.ts
-function inferDirection(dx, dy) {
-  if (dx === 0 && dy === 0) return "se";
-  if (dx >= 0 && dy >= 0) return "se";
-  if (dx <= 0 && dy >= 0) return "sw";
-  if (dx >= 0 && dy <= 0) return "ne";
-  return "nw";
-}
 function resolveSheetDirection(facing) {
   switch (facing) {
     case "se":
@@ -2320,29 +2313,10 @@ function frameRect(frame, row, columns, frameWidth, frameHeight) {
     sh: frameHeight
   };
 }
-function getCurrentFrameFromDef(def, elapsed) {
-  const frameDuration = 1e3 / def.frameRate;
-  const totalDuration = def.frames * frameDuration;
-  if (def.loop) {
-    const frame2 = Math.floor(elapsed % totalDuration / frameDuration);
-    return { frame: frame2, finished: false };
-  }
-  if (elapsed >= totalDuration) {
-    return { frame: def.frames - 1, finished: true };
-  }
-  const frame = Math.floor(elapsed / frameDuration);
-  return { frame, finished: false };
-}
 
 // components/game/molecules/useUnitSpriteAtlas.ts
-var WALK_HOLD_MS = 600;
 function unitAtlasUrl(unit) {
-  if (unit.spriteSheet) return unit.spriteSheet;
-  const sprite = unit.sprite;
-  if (!sprite) return null;
-  const match = /^(.*-sprite-sheet)(?:-(?:se|sw))?(?:-v\d+)?\.png$/.exec(sprite);
-  if (!match) return null;
-  return `${match[1]}.json`;
+  return unit.spriteSheet?.url ?? null;
 }
 function resolveSheetUrl(atlasUrl, relativeSheetPath) {
   try {
@@ -2357,9 +2331,6 @@ function useUnitSpriteAtlas(units) {
   const loadingRef = React11.useRef(/* @__PURE__ */ new Set());
   const [pendingCount, setPendingCount] = React11.useState(0);
   const [, forceTick] = React11.useState(0);
-  const animStatesRef = React11.useRef(/* @__PURE__ */ new Map());
-  const lastTickRef = React11.useRef(0);
-  const rafRef = React11.useRef(0);
   const atlasUrls = React11.useMemo(() => {
     const set = /* @__PURE__ */ new Set();
     for (const unit of units) {
@@ -2405,54 +2376,6 @@ function useUnitSpriteAtlas(units) {
     }
     return [...urls];
   }, [units, pendingCount]);
-  React11.useEffect(() => {
-    const hasAtlasUnits = units.some((u) => unitAtlasUrl(u) !== null);
-    if (!hasAtlasUnits) return;
-    let running = true;
-    const tick = (ts) => {
-      if (!running) return;
-      const last = lastTickRef.current || ts;
-      const delta = ts - last;
-      lastTickRef.current = ts;
-      const states = animStatesRef.current;
-      const currentIds = /* @__PURE__ */ new Set();
-      for (const unit of units) {
-        if (unitAtlasUrl(unit) === null) continue;
-        currentIds.add(unit.id);
-        let state = states.get(unit.id);
-        if (!state) {
-          state = { animation: "idle", direction: "se", elapsed: 0, walkHold: 0, prev: null };
-          states.set(unit.id, state);
-        }
-        const posX = unit.position?.x ?? unit.x ?? 0;
-        const posY = unit.position?.y ?? unit.y ?? 0;
-        if (state.prev) {
-          const dx = posX - state.prev.x;
-          const dy = posY - state.prev.y;
-          if (dx !== 0 || dy !== 0) {
-            state.animation = "walk";
-            state.direction = inferDirection(dx, dy);
-            state.walkHold = WALK_HOLD_MS;
-          } else if (state.animation === "walk") {
-            state.walkHold -= delta;
-            if (state.walkHold <= 0) state.animation = "idle";
-          }
-        }
-        state.prev = { x: posX, y: posY };
-        state.elapsed += delta;
-      }
-      for (const id of states.keys()) {
-        if (!currentIds.has(id)) states.delete(id);
-      }
-      rafRef.current = requestAnimationFrame(tick);
-    };
-    rafRef.current = requestAnimationFrame(tick);
-    return () => {
-      running = false;
-      cancelAnimationFrame(rafRef.current);
-      lastTickRef.current = 0;
-    };
-  }, [units]);
   const resolveUnitFrame = React11.useCallback((unitId) => {
     const unit = units.find((u) => u.id === unitId);
     if (!unit) return null;
@@ -2460,18 +2383,14 @@ function useUnitSpriteAtlas(units) {
     if (!atlasUrl) return null;
     const atlas = atlasCacheRef.current.get(atlasUrl);
     if (!atlas) return null;
-    const state = animStatesRef.current.get(unitId);
-    const animation = state?.animation ?? "idle";
-    const direction = state?.direction ?? "se";
-    const elapsed = state?.elapsed ?? 0;
+    const animation = unit.animation ?? "idle";
+    const frame = unit.frame ?? 0;
     const def = atlas.animations[animation] ?? atlas.animations.idle;
     if (!def) return null;
-    const { sheetDir, flipX } = resolveSheetDirection(direction);
+    const { sheetDir, flipX } = resolveSheetDirection("se");
     const rel = atlas.sheets[sheetDir] ?? atlas.sheets.se ?? atlas.sheets.sw;
     if (!rel) return null;
     const sheetUrl = resolveSheetUrl(atlasUrl, rel);
-    const isIdle = animation === "idle";
-    const frame = isIdle ? 0 : getCurrentFrameFromDef(def, elapsed).frame;
     const rect = frameRect(frame, def.row, atlas.columns, atlas.frameWidth, atlas.frameHeight);
     return {
       sheetUrl,
@@ -2480,7 +2399,7 @@ function useUnitSpriteAtlas(units) {
       sw: rect.sw,
       sh: rect.sh,
       flipX,
-      applyBreathing: isIdle
+      applyBreathing: animation === "idle"
     };
   }, [units]);
   return { sheetUrls, resolveUnitFrame, pendingCount };
@@ -2576,7 +2495,6 @@ var GameCanvas3D = React11.forwardRef(
     className,
     isLoading: externalLoading,
     error: externalError,
-    entity,
     preloadAssets = [],
     tileClickEvent,
     unitClickEvent,
@@ -2809,7 +2727,7 @@ var GameCanvas3D = React11.forwardRef(
               children: /* @__PURE__ */ jsxRuntime.jsx(
                 ModelLoader,
                 {
-                  url: tile.modelUrl,
+                  url: tile.modelUrl.url,
                   scale: 0.95,
                   fallbackGeometry: "box",
                   castShadow: true,
@@ -2874,7 +2792,7 @@ var GameCanvas3D = React11.forwardRef(
                 /* @__PURE__ */ jsxRuntime.jsx(
                   ModelLoader,
                   {
-                    url: unit.modelUrl,
+                    url: unit.modelUrl.url,
                     scale: modelScale,
                     fallbackGeometry: "box",
                     castShadow: true
@@ -2934,7 +2852,7 @@ var GameCanvas3D = React11.forwardRef(
           return /* @__PURE__ */ jsxRuntime.jsx(
             ModelLoader,
             {
-              url: feature.assetUrl,
+              url: feature.assetUrl.url,
               position,
               scale: 0.5,
               rotation: [0, feature.rotation ?? 0, 0],
@@ -4302,7 +4220,18 @@ function GameBoard3D({
   const row = boardEntity(entity);
   const eventBus = useEventBus();
   const entityUnits = row ? rows(row.units) : [];
-  const units = entityUnits;
+  const units = entityUnits.map((r) => ({
+    id: str(r.id),
+    x: num(r.x),
+    y: num(r.y),
+    z: num(r.z),
+    faction: str(r.faction) || "neutral",
+    team: str(r.team) || str(r.faction) || "neutral",
+    unitType: r.unitType == null ? void 0 : str(r.unitType),
+    name: r.name == null ? void 0 : str(r.name),
+    health: r.health == null ? void 0 : num(r.health),
+    maxHealth: r.maxHealth == null ? void 0 : num(r.maxHealth)
+  }));
   const selectedUnitId = row ? str(row.selectedUnitId) || null : null;
   const phase = row ? str(row.phase) : "observation";
   const result = row ? str(row.result) : "none";
@@ -4694,16 +4623,31 @@ var Box = React11__default.default.forwardRef(
 );
 Box.displayName = "Box";
 
-// 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}`;
+// components/game/organisms/utils/makeAsset.ts
+var ROLE_DEFAULTS = {
+  tile: { dimension: "2d", animations: ["static"], aspect: "1:1" },
+  decoration: { dimension: "2d", animations: ["static"], aspect: "1:1" },
+  effect: { dimension: "2d", animations: ["static"], aspect: "1:1" },
+  item: { dimension: "2d", animations: ["static"], aspect: "5:7" },
+  player: { dimension: "2d", animations: ["idle", "walk", "attack", "hit", "death"], aspect: "1:1" },
+  enemy: { dimension: "2d", animations: ["idle", "walk", "attack", "hit", "death"], aspect: "1:1" },
+  npc: { dimension: "2d", animations: ["idle", "walk", "attack", "hit", "death"], aspect: "1:1" },
+  projectile: { dimension: "2d", animations: ["static"], aspect: "1:1" },
+  vehicle: { dimension: "2d", animations: ["idle", "walk"], aspect: "1:1" },
+  ui: { dimension: "2d", animations: ["static"], aspect: "1:1" }
+};
+function makeAsset(url, role, overrides = {}) {
+  const defaults = ROLE_DEFAULTS[role] ?? { dimension: "2d", animations: ["static"], aspect: "1:1" };
+  return {
+    url,
+    role,
+    category: url.split("/").pop()?.replace(/\.[^.]+$/, "") ?? role,
+    ...defaults,
+    ...overrides
+  };
 }
+
+// components/game/templates/game3dAssetManifest.ts
 function tileKind(type, passable) {
   if (passable === false) return "wall";
   if (type === "dirt" || type === "road") return "dirt";
@@ -4719,7 +4663,7 @@ function resolveTilesWithModels(layout, manifest) {
       z: t.z,
       type: t.type,
       passable: t.passable,
-      modelUrl: resolveManifestUrl(manifest, manifest?.models?.[kind])
+      modelUrl: manifest?.models?.[kind]
     };
   });
 }
@@ -4728,7 +4672,7 @@ function resolvePropTiles(tiles, manifest) {
     const kind = tileKind(t.type ?? "", t.passable);
     return {
       ...t,
-      modelUrl: t.modelUrl ?? resolveManifestUrl(manifest, manifest?.models?.[kind])
+      modelUrl: t.modelUrl ?? manifest?.models?.[kind]
     };
   });
 }
@@ -4739,7 +4683,8 @@ function resolveEntityTiles(entity, manifest) {
     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);
+    const explicitModelUrl = r.modelUrl == null ? void 0 : str(r.modelUrl);
+    const explicitModel = explicitModelUrl ? makeAsset(explicitModelUrl, "decoration", { dimension: "3d" }) : void 0;
     return {
       id: r.id == null ? void 0 : str(r.id),
       x: num(r.x),
@@ -4747,14 +4692,14 @@ function resolveEntityTiles(entity, manifest) {
       z: r.z == null ? void 0 : num(r.z),
       type,
       passable,
-      modelUrl: explicitModel ?? resolveManifestUrl(manifest, manifest?.models?.[kind])
+      modelUrl: explicitModel ?? manifest?.models?.[kind]
     };
   });
 }
 function resolveFeaturesWithModels(features, manifest) {
   return features.map((f) => ({
     ...f,
-    assetUrl: f.assetUrl ?? resolveManifestUrl(manifest, manifest?.features?.[f.type])
+    assetUrl: f.assetUrl ?? manifest?.features?.[f.type]
   }));
 }
 function resolveEntityFeatures(entity, manifest) {
@@ -4762,7 +4707,8 @@ function resolveEntityFeatures(entity, manifest) {
   if (!row) return [];
   return rows(row.features).map((r) => {
     const type = str(r.type);
-    const explicit = r.assetUrl == null ? void 0 : str(r.assetUrl);
+    const explicitUrl = r.assetUrl == null ? void 0 : str(r.assetUrl);
+    const explicit = explicitUrl ? makeAsset(explicitUrl, "decoration", { dimension: "3d" }) : void 0;
     return {
       id: r.id == null ? void 0 : str(r.id),
       x: num(r.x),
@@ -4770,7 +4716,7 @@ function resolveEntityFeatures(entity, manifest) {
       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])
+      assetUrl: explicit ?? manifest?.features?.[type]
     };
   });
 }

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

@@ -1755,7 +1755,7 @@ function TileRenderer({
             children: /* @__PURE__ */ jsx(
               ModelLoader,
               {
-                url: tile.modelUrl,
+                url: tile.modelUrl?.url,
                 position,
                 scale: cellSize * 0.9,
                 fallbackGeometry: "box",
@@ -2157,7 +2157,7 @@ function FeatureModel({
   onHover
 }) {
   const groupRef = useRef(null);
-  const { model: loadedModel, isLoading } = useGLTFModel2(feature.assetUrl);
+  const { model: loadedModel, isLoading } = useGLTFModel2(feature.assetUrl?.url);
   const model = useMemo(() => {
     if (!loadedModel) return null;
     const cloned = loadedModel.clone();
@@ -2269,13 +2269,6 @@ function preloadFeatures(urls) {
 }
 
 // components/game/organisms/utils/spriteAnimation.ts
-function inferDirection(dx, dy) {
-  if (dx === 0 && dy === 0) return "se";
-  if (dx >= 0 && dy >= 0) return "se";
-  if (dx <= 0 && dy >= 0) return "sw";
-  if (dx >= 0 && dy <= 0) return "ne";
-  return "nw";
-}
 function resolveSheetDirection(facing) {
   switch (facing) {
     case "se":
@@ -2296,29 +2289,10 @@ function frameRect(frame, row, columns, frameWidth, frameHeight) {
     sh: frameHeight
   };
 }
-function getCurrentFrameFromDef(def, elapsed) {
-  const frameDuration = 1e3 / def.frameRate;
-  const totalDuration = def.frames * frameDuration;
-  if (def.loop) {
-    const frame2 = Math.floor(elapsed % totalDuration / frameDuration);
-    return { frame: frame2, finished: false };
-  }
-  if (elapsed >= totalDuration) {
-    return { frame: def.frames - 1, finished: true };
-  }
-  const frame = Math.floor(elapsed / frameDuration);
-  return { frame, finished: false };
-}
 
 // components/game/molecules/useUnitSpriteAtlas.ts
-var WALK_HOLD_MS = 600;
 function unitAtlasUrl(unit) {
-  if (unit.spriteSheet) return unit.spriteSheet;
-  const sprite = unit.sprite;
-  if (!sprite) return null;
-  const match = /^(.*-sprite-sheet)(?:-(?:se|sw))?(?:-v\d+)?\.png$/.exec(sprite);
-  if (!match) return null;
-  return `${match[1]}.json`;
+  return unit.spriteSheet?.url ?? null;
 }
 function resolveSheetUrl(atlasUrl, relativeSheetPath) {
   try {
@@ -2333,9 +2307,6 @@ function useUnitSpriteAtlas(units) {
   const loadingRef = useRef(/* @__PURE__ */ new Set());
   const [pendingCount, setPendingCount] = useState(0);
   const [, forceTick] = useState(0);
-  const animStatesRef = useRef(/* @__PURE__ */ new Map());
-  const lastTickRef = useRef(0);
-  const rafRef = useRef(0);
   const atlasUrls = useMemo(() => {
     const set = /* @__PURE__ */ new Set();
     for (const unit of units) {
@@ -2381,54 +2352,6 @@ function useUnitSpriteAtlas(units) {
     }
     return [...urls];
   }, [units, pendingCount]);
-  useEffect(() => {
-    const hasAtlasUnits = units.some((u) => unitAtlasUrl(u) !== null);
-    if (!hasAtlasUnits) return;
-    let running = true;
-    const tick = (ts) => {
-      if (!running) return;
-      const last = lastTickRef.current || ts;
-      const delta = ts - last;
-      lastTickRef.current = ts;
-      const states = animStatesRef.current;
-      const currentIds = /* @__PURE__ */ new Set();
-      for (const unit of units) {
-        if (unitAtlasUrl(unit) === null) continue;
-        currentIds.add(unit.id);
-        let state = states.get(unit.id);
-        if (!state) {
-          state = { animation: "idle", direction: "se", elapsed: 0, walkHold: 0, prev: null };
-          states.set(unit.id, state);
-        }
-        const posX = unit.position?.x ?? unit.x ?? 0;
-        const posY = unit.position?.y ?? unit.y ?? 0;
-        if (state.prev) {
-          const dx = posX - state.prev.x;
-          const dy = posY - state.prev.y;
-          if (dx !== 0 || dy !== 0) {
-            state.animation = "walk";
-            state.direction = inferDirection(dx, dy);
-            state.walkHold = WALK_HOLD_MS;
-          } else if (state.animation === "walk") {
-            state.walkHold -= delta;
-            if (state.walkHold <= 0) state.animation = "idle";
-          }
-        }
-        state.prev = { x: posX, y: posY };
-        state.elapsed += delta;
-      }
-      for (const id of states.keys()) {
-        if (!currentIds.has(id)) states.delete(id);
-      }
-      rafRef.current = requestAnimationFrame(tick);
-    };
-    rafRef.current = requestAnimationFrame(tick);
-    return () => {
-      running = false;
-      cancelAnimationFrame(rafRef.current);
-      lastTickRef.current = 0;
-    };
-  }, [units]);
   const resolveUnitFrame = useCallback((unitId) => {
     const unit = units.find((u) => u.id === unitId);
     if (!unit) return null;
@@ -2436,18 +2359,14 @@ function useUnitSpriteAtlas(units) {
     if (!atlasUrl) return null;
     const atlas = atlasCacheRef.current.get(atlasUrl);
     if (!atlas) return null;
-    const state = animStatesRef.current.get(unitId);
-    const animation = state?.animation ?? "idle";
-    const direction = state?.direction ?? "se";
-    const elapsed = state?.elapsed ?? 0;
+    const animation = unit.animation ?? "idle";
+    const frame = unit.frame ?? 0;
     const def = atlas.animations[animation] ?? atlas.animations.idle;
     if (!def) return null;
-    const { sheetDir, flipX } = resolveSheetDirection(direction);
+    const { sheetDir, flipX } = resolveSheetDirection("se");
     const rel = atlas.sheets[sheetDir] ?? atlas.sheets.se ?? atlas.sheets.sw;
     if (!rel) return null;
     const sheetUrl = resolveSheetUrl(atlasUrl, rel);
-    const isIdle = animation === "idle";
-    const frame = isIdle ? 0 : getCurrentFrameFromDef(def, elapsed).frame;
     const rect = frameRect(frame, def.row, atlas.columns, atlas.frameWidth, atlas.frameHeight);
     return {
       sheetUrl,
@@ -2456,7 +2375,7 @@ function useUnitSpriteAtlas(units) {
       sw: rect.sw,
       sh: rect.sh,
       flipX,
-      applyBreathing: isIdle
+      applyBreathing: animation === "idle"
     };
   }, [units]);
   return { sheetUrls, resolveUnitFrame, pendingCount };
@@ -2552,7 +2471,6 @@ var GameCanvas3D = forwardRef(
     className,
     isLoading: externalLoading,
     error: externalError,
-    entity,
     preloadAssets = [],
     tileClickEvent,
     unitClickEvent,
@@ -2785,7 +2703,7 @@ var GameCanvas3D = forwardRef(
               children: /* @__PURE__ */ jsx(
                 ModelLoader,
                 {
-                  url: tile.modelUrl,
+                  url: tile.modelUrl.url,
                   scale: 0.95,
                   fallbackGeometry: "box",
                   castShadow: true,
@@ -2850,7 +2768,7 @@ var GameCanvas3D = forwardRef(
                 /* @__PURE__ */ jsx(
                   ModelLoader,
                   {
-                    url: unit.modelUrl,
+                    url: unit.modelUrl.url,
                     scale: modelScale,
                     fallbackGeometry: "box",
                     castShadow: true
@@ -2910,7 +2828,7 @@ var GameCanvas3D = forwardRef(
           return /* @__PURE__ */ jsx(
             ModelLoader,
             {
-              url: feature.assetUrl,
+              url: feature.assetUrl.url,
               position,
               scale: 0.5,
               rotation: [0, feature.rotation ?? 0, 0],
@@ -4278,7 +4196,18 @@ function GameBoard3D({
   const row = boardEntity(entity);
   const eventBus = useEventBus();
   const entityUnits = row ? rows(row.units) : [];
-  const units = entityUnits;
+  const units = entityUnits.map((r) => ({
+    id: str(r.id),
+    x: num(r.x),
+    y: num(r.y),
+    z: num(r.z),
+    faction: str(r.faction) || "neutral",
+    team: str(r.team) || str(r.faction) || "neutral",
+    unitType: r.unitType == null ? void 0 : str(r.unitType),
+    name: r.name == null ? void 0 : str(r.name),
+    health: r.health == null ? void 0 : num(r.health),
+    maxHealth: r.maxHealth == null ? void 0 : num(r.maxHealth)
+  }));
   const selectedUnitId = row ? str(row.selectedUnitId) || null : null;
   const phase = row ? str(row.phase) : "observation";
   const result = row ? str(row.result) : "none";
@@ -4670,16 +4599,31 @@ var Box = React11.forwardRef(
 );
 Box.displayName = "Box";
 
-// 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}`;
+// components/game/organisms/utils/makeAsset.ts
+var ROLE_DEFAULTS = {
+  tile: { dimension: "2d", animations: ["static"], aspect: "1:1" },
+  decoration: { dimension: "2d", animations: ["static"], aspect: "1:1" },
+  effect: { dimension: "2d", animations: ["static"], aspect: "1:1" },
+  item: { dimension: "2d", animations: ["static"], aspect: "5:7" },
+  player: { dimension: "2d", animations: ["idle", "walk", "attack", "hit", "death"], aspect: "1:1" },
+  enemy: { dimension: "2d", animations: ["idle", "walk", "attack", "hit", "death"], aspect: "1:1" },
+  npc: { dimension: "2d", animations: ["idle", "walk", "attack", "hit", "death"], aspect: "1:1" },
+  projectile: { dimension: "2d", animations: ["static"], aspect: "1:1" },
+  vehicle: { dimension: "2d", animations: ["idle", "walk"], aspect: "1:1" },
+  ui: { dimension: "2d", animations: ["static"], aspect: "1:1" }
+};
+function makeAsset(url, role, overrides = {}) {
+  const defaults = ROLE_DEFAULTS[role] ?? { dimension: "2d", animations: ["static"], aspect: "1:1" };
+  return {
+    url,
+    role,
+    category: url.split("/").pop()?.replace(/\.[^.]+$/, "") ?? role,
+    ...defaults,
+    ...overrides
+  };
 }
+
+// components/game/templates/game3dAssetManifest.ts
 function tileKind(type, passable) {
   if (passable === false) return "wall";
   if (type === "dirt" || type === "road") return "dirt";
@@ -4695,7 +4639,7 @@ function resolveTilesWithModels(layout, manifest) {
       z: t.z,
       type: t.type,
       passable: t.passable,
-      modelUrl: resolveManifestUrl(manifest, manifest?.models?.[kind])
+      modelUrl: manifest?.models?.[kind]
     };
   });
 }
@@ -4704,7 +4648,7 @@ function resolvePropTiles(tiles, manifest) {
     const kind = tileKind(t.type ?? "", t.passable);
     return {
       ...t,
-      modelUrl: t.modelUrl ?? resolveManifestUrl(manifest, manifest?.models?.[kind])
+      modelUrl: t.modelUrl ?? manifest?.models?.[kind]
     };
   });
 }
@@ -4715,7 +4659,8 @@ function resolveEntityTiles(entity, manifest) {
     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);
+    const explicitModelUrl = r.modelUrl == null ? void 0 : str(r.modelUrl);
+    const explicitModel = explicitModelUrl ? makeAsset(explicitModelUrl, "decoration", { dimension: "3d" }) : void 0;
     return {
       id: r.id == null ? void 0 : str(r.id),
       x: num(r.x),
@@ -4723,14 +4668,14 @@ function resolveEntityTiles(entity, manifest) {
       z: r.z == null ? void 0 : num(r.z),
       type,
       passable,
-      modelUrl: explicitModel ?? resolveManifestUrl(manifest, manifest?.models?.[kind])
+      modelUrl: explicitModel ?? manifest?.models?.[kind]
     };
   });
 }
 function resolveFeaturesWithModels(features, manifest) {
   return features.map((f) => ({
     ...f,
-    assetUrl: f.assetUrl ?? resolveManifestUrl(manifest, manifest?.features?.[f.type])
+    assetUrl: f.assetUrl ?? manifest?.features?.[f.type]
   }));
 }
 function resolveEntityFeatures(entity, manifest) {
@@ -4738,7 +4683,8 @@ function resolveEntityFeatures(entity, manifest) {
   if (!row) return [];
   return rows(row.features).map((r) => {
     const type = str(r.type);
-    const explicit = r.assetUrl == null ? void 0 : str(r.assetUrl);
+    const explicitUrl = r.assetUrl == null ? void 0 : str(r.assetUrl);
+    const explicit = explicitUrl ? makeAsset(explicitUrl, "decoration", { dimension: "3d" }) : void 0;
     return {
       id: r.id == null ? void 0 : str(r.id),
       x: num(r.x),
@@ -4746,7 +4692,7 @@ function resolveEntityFeatures(entity, manifest) {
       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])
+      assetUrl: explicit ?? manifest?.features?.[type]
     };
   });
 }

package/dist/components/game/molecules/useUnitSpriteAtlas.d.ts

@@ -1,19 +1,12 @@
-import type { AssetUrl } from '@almadar/core';
 import type { IsometricUnit } from '../organisms/types/isometric';
 import type { ResolvedFrame } from '../organisms/types/spriteAnimation';
 /**
  * Resolve the sprite-sheet atlas-JSON URL for a unit.
  *
- * An explicit `unit.spriteSheet` wins. Otherwise, when the unit's static
- * `sprite` points at a directional sheet PNG, derive its sibling atlas JSON by
- * the deterministic naming convention used in `shared/sprite-sheets/`:
- * the shared atlas drops the `-se` / `-sw` direction suffix and any `-vN`
- * variant suffix, then swaps `.png` → `.json`
- * (`amir-sprite-sheet-se.png` → `amir-sprite-sheet.json`).
- *
- * Returns null when no atlas can be resolved (the unit keeps its static draw).
+ * A unit has an atlas iff `unit.spriteSheet.url` is set (explicit metadata wins).
+ * No filename-pattern matching — a unit without a `spriteSheet` Asset keeps its static draw.
  */
-export declare function unitAtlasUrl(unit: Pick<IsometricUnit, 'spriteSheet' | 'sprite'>): AssetUrl | null;
+export declare function unitAtlasUrl(unit: Pick<IsometricUnit, 'spriteSheet'>): string | null;
 export interface UseUnitSpriteAtlasResult {
     /** Atlas-JSON URLs successfully loaded — feed these to no one; sheet PNGs are returned below. */
     sheetUrls: string[];
@@ -23,8 +16,9 @@ export interface UseUnitSpriteAtlasResult {
     pendingCount: number;
 }
 /**
- * Load per-unit sprite atlases and drive single-frame animation.
+ * Load per-unit sprite atlases and expose a pure frame resolver.
+ * Frame is computed from each unit's own `animation` + `frame` props — no internal clock.
  *
- * @param units - Units to animate. Only units with a `spriteSheet` URL participate.
+ * @param units - Units whose atlases should be loaded.
  */
 export declare function useUnitSpriteAtlas(units: IsometricUnit[]): UseUnitSpriteAtlasResult;