@almadar/ui 5.74.0 → 5.75.0

package/dist/components/game/{molecules/three → 3d}/index.css

@@ -1,4 +1,4 @@
-/* components/game/molecules/three/components/Canvas3DLoadingState.css */
+/* components/game/3d/Canvas3DLoadingState.css */
 .canvas-3d-loading {
   position: absolute;
   inset: 0;
@@ -151,7 +151,7 @@
   }
 }
 
-/* components/game/molecules/three/components/Canvas3DErrorBoundary.css */
+/* components/game/3d/Canvas3DErrorBoundary.css */
 .canvas-3d-error {
   position: absolute;
   inset: 0;
@@ -314,7 +314,7 @@
   }
 }
 
-/* components/game/molecules/GameCanvas3D.css */
+/* components/game/3d/GameCanvas3D.css */
 .game-canvas-3d {
   background: #1a1a2e;
   border-radius: 8px;

package/dist/components/game/3d/index.d.ts

@@ -0,0 +1,41 @@
+/**
+ * Game 3D (three.js)
+ *
+ * Three.js components, hooks, loaders, renderers, and the GameCanvas3D family.
+ * Code-split behind the `@almadar/ui/components/molecules/game/three` subpath.
+ *
+ * @packageDocumentation
+ */
+export { Scene3D, type Scene3DProps } from './Scene3D';
+export { Camera3D, type Camera3DProps, type Camera3DHandle, type CameraMode } from './Camera3D';
+export { Lighting3D, type Lighting3DProps } from './Lighting3D';
+export { Canvas3DLoadingState, type Canvas3DLoadingStateProps, } from './Canvas3DLoadingState';
+export { Canvas3DErrorBoundary, type Canvas3DErrorBoundaryProps, type Canvas3DErrorBoundaryState, } from './Canvas3DErrorBoundary';
+export { ModelLoader, type ModelLoaderProps, } from './ModelLoader';
+export { PhysicsObject3D, usePhysics3DController, type PhysicsObject3DProps, type Physics3DState, } from './PhysicsObject3D';
+export { useThree, type UseThreeOptions, type UseThreeReturn, } from './useThree';
+export { useAssetLoader, type UseAssetLoaderOptions, type UseAssetLoaderReturn, type AssetLoadingState, } from './useAssetLoader';
+export { useSceneGraph, type UseSceneGraphReturn, type SceneGraphNode, type NodeType, } from './useSceneGraph';
+export { useRaycaster, type UseRaycasterOptions, type UseRaycasterReturn, type RaycastHit, type GridHit, } from './useRaycaster';
+export { useGameCanvas3DEvents, type UseGameCanvas3DEventsOptions, type UseGameCanvas3DEventsReturn, type GameCanvas3DEventConfig, } from './useGameCanvas3DEvents';
+export { AssetLoader, assetLoader, type LoadedModel, } from './AssetLoader';
+export { TileRenderer, type TileRendererProps, } from './TileRenderer';
+export { UnitRenderer, type UnitRendererProps, } from './UnitRenderer';
+export { FeatureRenderer, type FeatureRendererProps, } from './FeatureRenderer';
+export { FeatureRenderer3D, preloadFeatures, type FeatureRenderer3DProps, } from './FeatureRenderer3D';
+export type { UnitAnimationState } from '../shared/spriteAnimationTypes';
+export { GameCanvas3D, type GameCanvas3DProps } from './GameCanvas3D';
+export { Canvas3D, type Canvas3DProps } from './Canvas3D';
+export { GameCanvas3DBattleTemplate, type GameCanvas3DBattleTemplateProps } from './GameCanvas3DBattleTemplate';
+export { GameCanvas3DCastleTemplate, type GameCanvas3DCastleTemplateProps } from './GameCanvas3DCastleTemplate';
+export { GameCanvas3DWorldMapTemplate, type GameCanvas3DWorldMapTemplateProps } from './GameCanvas3DWorldMapTemplate';
+export { gridToWorld, worldToGrid, raycastToPlane, raycastToObjects, gridDistance, gridManhattanDistance, getNeighbors, isInBounds, getCellsInRadius, createGridHighlight, normalizeMouseCoordinates, type Grid3DConfig, type GridCoordinate, } from './grid3D';
+export { Avl3DViewer, type Avl3DViewerProps } from '../../avl/organisms/Avl3DViewer';
+export { Avl3DApplicationScene, type Avl3DApplicationSceneProps } from '../../avl/organisms/Avl3DApplicationScene';
+export { Avl3DOrbitalScene, type Avl3DOrbitalSceneProps } from '../../avl/organisms/Avl3DOrbitalScene';
+export { Avl3DTraitScene, type Avl3DTraitSceneProps } from '../../avl/organisms/Avl3DTraitScene';
+export { Avl3DTransitionScene, type Avl3DTransitionSceneProps } from '../../avl/organisms/Avl3DTransitionScene';
+export { Avl3DEffects, type Avl3DEffectsProps } from '../../avl/organisms/Avl3DEffects';
+export { Avl3DContext, useAvl3DConfig, type Avl3DModelOverrides, type Avl3DConfig } from '../../avl/organisms/avl-3d-context';
+export { AVL_3D_COLORS, CAMERA_POSITIONS, goldenSpiralPositions, fibonacciSpherePositions, orbitRingPositions, arcCurve3D, selfLoopCurve3D, treeLayout3D, type Position3D, } from '../../avl/organisms/avl-3d-layout';
+export { isInFrustum, filterByFrustum, getVisibleIndices, calculateLODLevel, updateInstanceLOD, cullInstancedMesh, SpatialHashGrid, type CullingOptions, type LODLevel, type LODConfig, } from './culling';

package/dist/components/game/{molecules/three → 3d}/index.js

@@ -1,4 +1,4 @@
-import React11, { forwardRef, useRef, useEffect, useImperativeHandle, useState, useMemo, useCallback, createContext, Component, useContext, useSyncExternalStore, useReducer } from 'react';
+import React10, { forwardRef, useRef, useEffect, useImperativeHandle, useState, useMemo, useCallback, createContext, Component, useContext, useSyncExternalStore, useReducer } from 'react';
 import { useThree, useFrame, Canvas, useLoader, context } from '@react-three/fiber';
 import * as THREE6 from 'three';
 import { Vector3, QuadraticBezierCurve3, MathUtils, Quaternion } from 'three';
@@ -470,81 +470,11 @@ function PhysicsObject3D({
   entityId,
   modelUrl,
   initialPosition = [0, 0, 0],
-  initialVelocity = [0, 0, 0],
-  mass = 1,
-  gravity = 9.8,
-  groundY = 0,
-  scale = 1,
-  onPhysicsUpdate,
-  onGroundHit,
-  onCollision
+  scale = 1
 }) {
-  const groupRef = useRef(null);
-  const physicsStateRef = useRef({
-    id: entityId,
-    x: initialPosition[0],
-    y: initialPosition[1],
-    z: initialPosition[2],
-    vx: initialVelocity[0],
-    vy: initialVelocity[1],
-    vz: initialVelocity[2],
-    rx: 0,
-    ry: 0,
-    rz: 0,
-    isGrounded: false,
-    gravity,
-    friction: 0.8,
-    mass,
-    state: "Active"
-  });
-  const groundHitRef = useRef(false);
-  useEffect(() => {
-    if (groupRef.current) {
-      groupRef.current.position.set(
-        initialPosition[0],
-        initialPosition[1],
-        initialPosition[2]
-      );
-    }
-  }, []);
-  useFrame((state, delta) => {
-    const physics = physicsStateRef.current;
-    if (physics.state !== "Active") return;
-    const dt = Math.min(delta, 0.1);
-    if (!physics.isGrounded) {
-      physics.vy -= physics.gravity * dt;
-    }
-    physics.x += physics.vx * dt;
-    physics.y += physics.vy * dt;
-    physics.z += physics.vz * dt;
-    const airResistance = Math.pow(0.99, dt * 60);
-    physics.vx *= airResistance;
-    physics.vz *= airResistance;
-    if (physics.y <= groundY) {
-      physics.y = groundY;
-      if (!physics.isGrounded) {
-        physics.isGrounded = true;
-        groundHitRef.current = true;
-        physics.vx *= physics.friction;
-        physics.vz *= physics.friction;
-        onGroundHit?.();
-      }
-      physics.vy = 0;
-    } else {
-      physics.isGrounded = false;
-    }
-    if (groupRef.current) {
-      groupRef.current.position.set(physics.x, physics.y, physics.z);
-      if (!physics.isGrounded) {
-        physics.rx += physics.vz * dt * 0.5;
-        physics.rz -= physics.vx * dt * 0.5;
-        groupRef.current.rotation.set(physics.rx, physics.ry, physics.rz);
-      }
-    }
-    onPhysicsUpdate?.({ ...physics });
-  });
+  log3.debug("PhysicsObject3D render", { entityId, initialPosition });
   const scaleArray = typeof scale === "number" ? [scale, scale, scale] : scale;
-  return /* @__PURE__ */ jsx("group", { ref: groupRef, scale: scaleArray, children: /* @__PURE__ */ jsx(
+  return /* @__PURE__ */ jsx("group", { position: initialPosition, scale: scaleArray, children: /* @__PURE__ */ jsx(
     ModelLoader,
     {
       url: modelUrl,
@@ -767,7 +697,7 @@ var AssetLoader = class {
 };
 var assetLoader = new AssetLoader();
 
-// components/game/molecules/three/hooks/useThree.ts
+// components/game/3d/useThree.ts
 var DEFAULT_OPTIONS = {
   cameraMode: "isometric",
   cameraPosition: [10, 10, 10],
@@ -1487,7 +1417,7 @@ function useEmitEvent() {
   );
 }
 
-// components/game/molecules/three/hooks/useGameCanvas3DEvents.ts
+// components/game/3d/useGameCanvas3DEvents.ts
 function useGameCanvas3DEvents(options) {
   const {
     tileClickEvent,
@@ -1819,8 +1749,6 @@ function TileRenderer({
   return /* @__PURE__ */ jsx("group", { children: renderIndividualTiles() });
 }
 function UnitVisual({ unit, position, isSelected, onClick }) {
-  const groupRef = useRef(null);
-  const [animationState, setAnimationState] = useState("idle");
   const [isHovered, setIsHovered] = useState(false);
   const teamColor = useMemo(() => {
     if (unit.faction === "player" || unit.team === "player") return 4491519;
@@ -1828,12 +1756,6 @@ function UnitVisual({ unit, position, isSelected, onClick }) {
     if (unit.faction === "neutral" || unit.team === "neutral") return 16777028;
     return 8947848;
   }, [unit.faction, unit.team]);
-  useFrame((state) => {
-    if (groupRef.current && animationState === "idle") {
-      const y = position[1] + Math.sin(state.clock.elapsedTime * 2 + position[0]) * 0.05;
-      groupRef.current.position.y = y;
-    }
-  });
   const healthPercent = useMemo(() => {
     if (unit.health === void 0 || unit.maxHealth === void 0) return 1;
     return Math.max(0, Math.min(1, unit.health / unit.maxHealth));
@@ -1846,7 +1768,6 @@ function UnitVisual({ unit, position, isSelected, onClick }) {
   return /* @__PURE__ */ jsxs(
     "group",
     {
-      ref: groupRef,
       position,
       onClick,
       onPointerEnter: () => setIsHovered(true),
@@ -1899,7 +1820,7 @@ function UnitRenderer({
   onAnimationStateChange,
   animationSpeed = 1
 }) {
-  const handleUnitClick = React11.useCallback(
+  const handleUnitClick = React10.useCallback(
     (unit) => {
       onUnitClick?.(unit);
     },
@@ -2156,8 +2077,8 @@ function FeatureModel({
   onClick,
   onHover
 }) {
-  const groupRef = useRef(null);
   const { model: loadedModel, isLoading } = useGLTFModel2(feature.assetUrl?.url);
+  const baseRotationY = feature.rotation !== void 0 ? feature.rotation * Math.PI / 180 - Math.PI / 4 : -Math.PI / 4;
   const model = useMemo(() => {
     if (!loadedModel) return null;
     const cloned = loadedModel.clone();
@@ -2170,14 +2091,6 @@ function FeatureModel({
     });
     return cloned;
   }, [loadedModel]);
-  useFrame((state) => {
-    if (groupRef.current) {
-      const featureRotation = feature.rotation;
-      const baseRotation = featureRotation !== void 0 ? featureRotation * Math.PI / 180 - Math.PI / 4 : -Math.PI / 4;
-      const wobble = isSelected ? Math.sin(state.clock.elapsedTime * 2) * 0.1 : 0;
-      groupRef.current.rotation.y = baseRotation + wobble;
-    }
-  });
   if (isLoading) {
     return /* @__PURE__ */ jsx("group", { position, children: /* @__PURE__ */ jsxs("mesh", { rotation: [Math.PI / 2, 0, 0], children: [
       /* @__PURE__ */ jsx("ringGeometry", { args: [0.3, 0.35, 16] }),
@@ -2209,8 +2122,8 @@ function FeatureModel({
   return /* @__PURE__ */ jsxs(
     "group",
     {
-      ref: groupRef,
       position,
+      rotation: [0, baseRotationY, 0],
       onClick,
       onPointerEnter: () => onHover(true),
       onPointerLeave: () => onHover(false),
@@ -2268,7 +2181,7 @@ function preloadFeatures(urls) {
   });
 }
 
-// components/game/organisms/utils/spriteAnimation.ts
+// components/game/shared/spriteAnimation.ts
 function resolveSheetDirection(facing) {
   switch (facing) {
     case "se":
@@ -2290,7 +2203,7 @@ function frameRect(frame, row, columns, frameWidth, frameHeight) {
   };
 }
 
-// components/game/molecules/useUnitSpriteAtlas.ts
+// components/game/2d/useUnitSpriteAtlas.ts
 function unitAtlasUrl(unit) {
   return unit.spriteSheet?.url ?? null;
 }
@@ -3027,6 +2940,9 @@ var GameCanvas3D = forwardRef(
   }
 );
 GameCanvas3D.displayName = "GameCanvas3D";
+function Canvas3D(props) {
+  return /* @__PURE__ */ jsx(GameCanvas3D, { ...props });
+}
 var DEFAULT_FAMILY = "lucide";
 var VALID_FAMILIES = [
   "lucide",
@@ -3099,7 +3015,7 @@ function loadLib(key, importer) {
   return p;
 }
 function lazyFamilyIcon(libKey, importer, pick, fallbackName, family) {
-  const Lazy = React11.lazy(async () => {
+  const Lazy = React10.lazy(async () => {
     const lib = await loadLib(libKey, importer);
     const Comp = pick(lib);
     if (!Comp) {
@@ -3109,7 +3025,7 @@ function lazyFamilyIcon(libKey, importer, pick, fallbackName, family) {
     return { default: Comp };
   });
   const Wrapped = (props) => /* @__PURE__ */ jsx(
-    React11.Suspense,
+    React10.Suspense,
     {
       fallback: /* @__PURE__ */ jsx(
         "span",
@@ -3775,7 +3691,7 @@ var Icon = ({
   const directIcon = typeof icon === "string" ? void 0 : icon;
   const effectiveName = typeof icon === "string" ? icon : name;
   const family = useIconFamily();
-  const RenderedComponent = React11.useMemo(() => {
+  const RenderedComponent = React10.useMemo(() => {
     if (directIcon) return null;
     return effectiveName ? resolveIconForFamily(effectiveName, family) : null;
   }, [directIcon, effectiveName, family]);
@@ -3895,7 +3811,7 @@ function resolveIconProp(value, sizeClass) {
     const IconComp = value;
     return /* @__PURE__ */ jsx(IconComp, { className: sizeClass });
   }
-  if (React11.isValidElement(value)) {
+  if (React10.isValidElement(value)) {
     return value;
   }
   if (typeof value === "object" && value !== null && isIconLike(value)) {
@@ -3904,7 +3820,7 @@ function resolveIconProp(value, sizeClass) {
   }
   return value;
 }
-var Button = React11.forwardRef(
+var Button = React10.forwardRef(
   ({
     className,
     variant = "primary",
@@ -4050,7 +3966,7 @@ var Typography = ({
 }) => {
   const variant = variantProp ?? (level ? `h${level}` : "body1");
   const Component2 = as || defaultElements[variant];
-  return React11.createElement(
+  return React10.createElement(
     Component2,
     {
       id,
@@ -4123,7 +4039,7 @@ var Stack = ({
   };
   const isHorizontal = direction === "horizontal";
   const directionClass = responsive && isHorizontal ? reverse ? "flex-col-reverse md:flex-row-reverse" : "flex-col md:flex-row" : isHorizontal ? reverse ? "flex-row-reverse" : "flex-row" : reverse ? "flex-col-reverse" : "flex-col";
-  return React11.createElement(
+  return React10.createElement(
     Component2,
     {
       className: cn(
@@ -4148,7 +4064,7 @@ var Stack = ({
 var VStack = (props) => /* @__PURE__ */ jsx(Stack, { direction: "vertical", ...props });
 var HStack = (props) => /* @__PURE__ */ jsx(Stack, { direction: "horizontal", ...props });
 
-// components/game/organisms/boardEntity.ts
+// components/game/shared/boardEntity.ts
 function boardEntity(entity) {
   if (!entity) return void 0;
   return Array.isArray(entity) ? entity[0] : entity;
@@ -4498,7 +4414,7 @@ var positionStyles = {
   fixed: "fixed",
   sticky: "sticky"
 };
-var Box = React11.forwardRef(
+var Box = React10.forwardRef(
   ({
     padding,
     paddingX,
@@ -4563,7 +4479,7 @@ var Box = React11.forwardRef(
       onPointerDown?.(e);
     }, [hoverEvent, tapReveal, triggerProps, onPointerDown]);
     const isClickable = action || onClick;
-    return React11.createElement(
+    return React10.createElement(
       Component2,
       {
         ref,
@@ -4599,7 +4515,7 @@ var Box = React11.forwardRef(
 );
 Box.displayName = "Box";
 
-// components/game/organisms/utils/makeAsset.ts
+// components/game/shared/makeAsset.ts
 var ROLE_DEFAULTS = {
   tile: { dimension: "2d", animations: ["static"], aspect: "1:1" },
   decoration: { dimension: "2d", animations: ["static"], aspect: "1:1" },
@@ -4623,7 +4539,7 @@ function makeAsset(url, role, overrides = {}) {
   };
 }
 
-// components/game/templates/game3dAssetManifest.ts
+// components/game/2d/game3dAssetManifest.ts
 function tileKind(type, passable) {
   if (passable === false) return "wall";
   if (type === "dirt" || type === "road") return "dirt";
@@ -7351,7 +7267,7 @@ var Avl3DViewer = ({
   const handleTraitClick = useCallback((name) => {
     dispatch({ type: "ZOOM_INTO_TRAIT", trait: name, targetPosition: { x: 0, y: 0 } });
   }, []);
-  const [highlightedTrait, setHighlightedTrait] = React11.useState(null);
+  const [highlightedTrait, setHighlightedTrait] = React10.useState(null);
   const handleTransitionClick = useCallback((index) => {
     dispatch({ type: "ZOOM_INTO_TRANSITION", transitionIndex: index, targetPosition: { x: 0, y: 0 } });
   }, []);
@@ -7438,7 +7354,7 @@ var Avl3DViewer = ({
             gap: "xs",
             align: "center",
             className: "absolute top-2 left-2 z-10 bg-surface/80 backdrop-blur rounded-md px-3 py-1.5",
-            children: breadcrumbs.map((crumb, i) => /* @__PURE__ */ jsxs(React11.Fragment, { children: [
+            children: breadcrumbs.map((crumb, i) => /* @__PURE__ */ jsxs(React10.Fragment, { children: [
               i > 0 && /* @__PURE__ */ jsx(Typography, { variant: "small", color: "muted", className: "mx-1", children: "/" }),
               i < breadcrumbs.length - 1 ? /* @__PURE__ */ jsx(
                 Box,
@@ -7714,4 +7630,4 @@ var SpatialHashGrid = class {
   }
 };
 
-export { AVL_3D_COLORS, AssetLoader, Avl3DApplicationScene, Avl3DContext, Avl3DEffects, Avl3DOrbitalScene, Avl3DTraitScene, Avl3DTransitionScene, Avl3DViewer, CAMERA_POSITIONS, Camera3D, Canvas3DErrorBoundary, Canvas3DLoadingState, FeatureRenderer, FeatureRenderer3D, GameCanvas3D, GameCanvas3DBattleTemplate, GameCanvas3DCastleTemplate, GameCanvas3DWorldMapTemplate, Lighting3D, ModelLoader, PhysicsObject3D, Scene3D, SpatialHashGrid, TileRenderer, UnitRenderer, arcCurve3D, assetLoader, calculateLODLevel, createGridHighlight, cullInstancedMesh, fibonacciSpherePositions, filterByFrustum, getCellsInRadius, getNeighbors, getVisibleIndices, goldenSpiralPositions, gridDistance, gridManhattanDistance, gridToWorld, isInBounds, isInFrustum, normalizeMouseCoordinates, orbitRingPositions, preloadFeatures, raycastToObjects, raycastToPlane, selfLoopCurve3D, treeLayout3D, updateInstanceLOD, useAssetLoader, useAvl3DConfig, useGameCanvas3DEvents, usePhysics3DController, useRaycaster, useSceneGraph, useThree3 as useThree, worldToGrid };
+export { AVL_3D_COLORS, AssetLoader, Avl3DApplicationScene, Avl3DContext, Avl3DEffects, Avl3DOrbitalScene, Avl3DTraitScene, Avl3DTransitionScene, Avl3DViewer, CAMERA_POSITIONS, Camera3D, Canvas3D, Canvas3DErrorBoundary, Canvas3DLoadingState, FeatureRenderer, FeatureRenderer3D, GameCanvas3D, GameCanvas3DBattleTemplate, GameCanvas3DCastleTemplate, GameCanvas3DWorldMapTemplate, Lighting3D, ModelLoader, PhysicsObject3D, Scene3D, SpatialHashGrid, TileRenderer, UnitRenderer, arcCurve3D, assetLoader, calculateLODLevel, createGridHighlight, cullInstancedMesh, fibonacciSpherePositions, filterByFrustum, getCellsInRadius, getNeighbors, getVisibleIndices, goldenSpiralPositions, gridDistance, gridManhattanDistance, gridToWorld, isInBounds, isInFrustum, normalizeMouseCoordinates, orbitRingPositions, preloadFeatures, raycastToObjects, raycastToPlane, selfLoopCurve3D, treeLayout3D, updateInstanceLOD, useAssetLoader, useAvl3DConfig, useGameCanvas3DEvents, usePhysics3DController, useRaycaster, useSceneGraph, useThree3 as useThree, worldToGrid };

package/dist/components/game/{molecules/three → 3d}/patterns.d.ts

@@ -13,8 +13,8 @@
  * the lazy loader but are intentionally absent here so they don't become
  * render-ui targets.
  */
-export { GameCanvas3D } from '../GameCanvas3D';
-export { GameCanvas3DBattleTemplate } from '../../templates/GameCanvas3DBattleTemplate';
-export { GameCanvas3DCastleTemplate } from '../../templates/GameCanvas3DCastleTemplate';
-export { GameCanvas3DWorldMapTemplate } from '../../templates/GameCanvas3DWorldMapTemplate';
-export { FeatureRenderer } from './renderers/FeatureRenderer';
+export { GameCanvas3D } from './GameCanvas3D';
+export { GameCanvas3DBattleTemplate } from './GameCanvas3DBattleTemplate';
+export { GameCanvas3DCastleTemplate } from './GameCanvas3DCastleTemplate';
+export { GameCanvas3DWorldMapTemplate } from './GameCanvas3DWorldMapTemplate';
+export { FeatureRenderer } from './FeatureRenderer';

package/dist/components/game/{molecules/three/hooks → 3d}/useAssetLoader.d.ts

@@ -1,5 +1,5 @@
 import * as THREE from 'three';
-import { AssetLoader, LoadedModel } from '../loaders/AssetLoader';
+import { AssetLoader, LoadedModel } from './AssetLoader';
 export interface UseAssetLoaderOptions {
     /** URLs to preload on mount */
     preloadUrls?: string[];

package/dist/components/game/{molecules/three/hooks → 3d}/useGameCanvas3DEvents.d.ts

@@ -1,5 +1,5 @@
 import type { EventEmit } from '@almadar/core';
-import type { IsometricTile, IsometricUnit, IsometricFeature } from '../../../organisms/types/isometric';
+import type { IsometricTile, IsometricUnit, IsometricFeature } from '../shared/isometricTypes';
 export interface GameCanvas3DEventConfig {
     /** Event name for tile clicks */
     tileClickEvent?: EventEmit<{

package/dist/components/game/{molecules/three/hooks → 3d}/useThree.d.ts

@@ -1,6 +1,6 @@
 import * as THREE from 'three';
 import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls.js';
-import { AssetLoader } from '../loaders/AssetLoader';
+import { AssetLoader } from './AssetLoader';
 export type CameraMode = 'isometric' | 'perspective' | 'top-down';
 export interface UseThreeOptions {
     /** Camera mode for viewing the scene */

package/dist/components/game/{organisms/utils → shared}/canvasEffects.d.ts

@@ -6,7 +6,7 @@
  *
  * Ported from trait-wars and generalized for any almadar-ui client.
  */
-import type { CanvasParticle, CanvasSequence, CanvasOverlay, CanvasEffectState, ParticleEmitterConfig, SequenceConfig, OverlayConfig } from '../types/effects';
+import type { CanvasParticle, CanvasSequence, CanvasOverlay, CanvasEffectState, ParticleEmitterConfig, SequenceConfig, OverlayConfig } from './effects';
 /**
  * Draw a sprite tinted with an RGB color onto the main canvas.
  * Uses offscreen canvas with `source-atop` compositing to recolor

package/dist/components/game/{organisms/utils → shared}/combatPresets.d.ts

@@ -6,7 +6,7 @@
  *
  * Generalized from trait-wars: uses EffectAssetManifest instead of TraitWarsAssetManifest.
  */
-import type { CombatActionType, CombatPreset, EffectAssetManifest } from '../types/effects';
+import type { CombatActionType, CombatPreset, EffectAssetManifest } from './effects';
 type PresetFactory = (originX: number, originY: number) => CombatPreset;
 /**
  * Create combat preset factories from an effect asset manifest.

package/dist/components/game/{organisms/types → shared}/game.d.ts

@@ -12,7 +12,7 @@ export interface GameUnit {
     id: string;
     name: string;
     characterType: string;
-    team: 'player' | 'enemy';
+    team: 'player' | 'enemy' | 'neutral';
     position: Position;
     health: number;
     maxHealth: number;
@@ -38,7 +38,7 @@ export interface GameState {
     units: Record<string, GameUnit>;
     currentPhase: GamePhase;
     currentTurn: number;
-    activeTeam: 'player' | 'enemy';
+    activeTeam: 'player' | 'enemy' | 'neutral';
     selectedUnitId?: string;
     validMoves: Position[];
     attackTargets: Position[];

package/dist/components/game/shared/index.d.ts

@@ -0,0 +1,23 @@
+/**
+ * Game Shared (dimension-agnostic)
+ *
+ * Render DTO types, pure projection/animation utils, and the shared image cache hook.
+ *
+ * @packageDocumentation
+ */
+export type { IsometricTile, IsometricUnit, IsometricFeature, CameraState, } from './isometricTypes';
+export type { AnimationName, FacingDirection, SpriteDirection, ResolvedFrame, UnitAnimationState, SpriteFrameDims, SpriteSheetUrls, AnimationDef, } from './spriteAnimationTypes';
+export { createInitialGameState, calculateValidMoves, calculateAttackTargets, } from './game';
+export type { Position, GameUnit, UnitTrait, BoardTile, GamePhase, GameState, GameAction, } from './game';
+export * from './effects';
+export * from './boardEntity';
+export * from './makeAsset';
+export { useImageCache } from './useImageCache';
+export { isoToScreen, screenToIso, TILE_WIDTH, TILE_HEIGHT, FLOOR_HEIGHT, DIAMOND_TOP_Y, FEATURE_COLORS, } from './isometric';
+export type { TileLayout } from './isometric';
+export { inferDirection, resolveSheetDirection, getCurrentFrame, resolveFrame, createUnitAnimationState, transitionAnimation, tickAnimationState, } from './spriteAnimation';
+export { SPRITE_SHEET_LAYOUT, SHEET_COLUMNS } from './spriteSheetConstants';
+export { combatAnimations, combatClasses, combatEffects, applyTemporaryEffect, calculateDamage, generateCombatMessage, } from './combatEffects';
+export type { CombatEffect, DamageResult, CombatEventType, CombatEventData, } from './combatEffects';
+export * from './combatPresets';
+export * from './canvasEffects';

package/dist/components/game/{organisms/types/isometric.d.ts → shared/isometricTypes.d.ts}

@@ -1,5 +1,6 @@
 import type { Asset } from '@almadar/core';
-import type { AnimationName } from './spriteAnimation';
+import type { AnimationName } from './spriteAnimationTypes';
+import type { UnitTrait } from './game';
 /**
  * Isometric Game Types
  *
@@ -84,12 +85,7 @@ export type IsometricUnit = {
     /** Maximum health */
     maxHealth?: number;
     /** Trait attachments for state display */
-    traits?: {
-        name: string;
-        currentState: string;
-        states: string[];
-        cooldown: number;
-    }[];
+    traits?: UnitTrait[];
     /** Previous position for movement trail ghost */
     previousPosition?: {
         x: number;

package/dist/components/game/{organisms/utils → shared}/spriteAnimation.d.ts

@@ -7,7 +7,7 @@
  *
  * @packageDocumentation
  */
-import type { AnimationDef, AnimationName, FacingDirection, SpriteDirection, ResolvedFrame, UnitAnimationState, SpriteFrameDims, SpriteSheetUrls } from '../types/spriteAnimation';
+import type { AnimationDef, AnimationName, FacingDirection, SpriteDirection, ResolvedFrame, UnitAnimationState, SpriteFrameDims, SpriteSheetUrls } from './spriteAnimationTypes';
 /**
  * Infer facing direction from a movement delta on the isometric grid.
  * dx/dy are tile coordinate deltas (not screen pixels).

package/dist/components/game/{organisms/utils → shared}/spriteSheetConstants.d.ts

@@ -6,7 +6,7 @@
  *
  * @packageDocumentation
  */
-import type { AnimationDef, AnimationName } from '../types/spriteAnimation';
+import type { AnimationDef, AnimationName } from './spriteAnimationTypes';
 /** Number of columns in a sprite sheet (frames per row) */
 export declare const SHEET_COLUMNS = 8;
 /**