feat: add facing orientation to parts
Replace the face/back boolean with a three-state facing (face, back, standing) seeded from setup placements. Parts now orient about the anchor at the resting face/edge, so back-down parts sit on the table instead of below it and standing parts rest on their bottom edge.
This commit is contained in:
@@ -8,6 +8,7 @@ export {
|
||||
fallbackShape,
|
||||
traceToShape,
|
||||
traceToUvBounds,
|
||||
facingTransform,
|
||||
MM_TO_WORLD,
|
||||
} from './part.js';
|
||||
export { resolveAssetUrl, assetUrl, traceImage } from './http.js';
|
||||
|
||||
@@ -6,6 +6,7 @@ import {
|
||||
fallbackShape,
|
||||
traceToShape,
|
||||
traceToUvBounds,
|
||||
facingTransform,
|
||||
} from './part.js';
|
||||
|
||||
describe('partDimensions', () => {
|
||||
@@ -20,6 +21,25 @@ describe('partDimensions', () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe('facingTransform', () => {
|
||||
const dims = { height: 2, depth: 0.1 };
|
||||
|
||||
it('lays face-up flat on the minZ face', () => {
|
||||
expect(facingTransform('face', dims)).toEqual({ pivot: [0, 0, 0], xRotation: -Math.PI / 2 });
|
||||
});
|
||||
|
||||
it('lays back-down flat on the maxZ face', () => {
|
||||
expect(facingTransform('back', dims)).toEqual({ pivot: [0, 0, 0.1], xRotation: Math.PI / 2 });
|
||||
});
|
||||
|
||||
it('stands on the bottom (minY) edge', () => {
|
||||
expect(facingTransform('standing', dims)).toEqual({
|
||||
pivot: [0, -1, 0.05],
|
||||
xRotation: 0,
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe('spriteUvFromCrop', () => {
|
||||
it('returns full-image UVs without a crop', () => {
|
||||
expect(spriteUvFromCrop(undefined)).toEqual({ repeatX: 1, repeatY: 1, offsetX: 0, offsetY: 0 });
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* so they can be unit-tested in a plain node environment (mirroring the web
|
||||
* app's `cardResolution.ts`).
|
||||
*/
|
||||
import type { Part, Crop } from '@tts/bgm';
|
||||
import type { Part, Crop, Facing } from '@tts/bgm';
|
||||
import {
|
||||
rectShape,
|
||||
roundedRectShape,
|
||||
@@ -31,6 +31,31 @@ export function partDimensions(part: Part): { width: number; height: number; dep
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* The transform that orients a part for a `facing`, in the part's mesh-local
|
||||
* frame (shape in XY centered at origin, extruded along +Z from `0` to
|
||||
* `depth`). `pivot` is the center of the face/edge that rests on the table and
|
||||
* should land at the anchor; `xRotation` (radians, about the local X axis)
|
||||
* orients the part. Tilt is applied separately about the local Y (long) axis,
|
||||
* so both the facing rotation and tilt spin about the anchor.
|
||||
*/
|
||||
export function facingTransform(
|
||||
facing: Facing,
|
||||
dims: { height: number; depth: number },
|
||||
): { pivot: [number, number, number]; xRotation: number } {
|
||||
switch (facing) {
|
||||
case 'face':
|
||||
// Lay flat, front up, resting on the minZ face.
|
||||
return { pivot: [0, 0, 0], xRotation: -Math.PI / 2 };
|
||||
case 'back':
|
||||
// Lay flat, front down, resting on the maxZ face.
|
||||
return { pivot: [0, 0, dims.depth], xRotation: Math.PI / 2 };
|
||||
case 'standing':
|
||||
// Stand upright on the bottom (minY) edge.
|
||||
return { pivot: [0, -dims.height / 2, dims.depth / 2], xRotation: 0 };
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* UV repeat/offset that selects a single sprite from a sheet, given a crop
|
||||
* `[col, row, cols, rows]` that divides the image into a `cols` x `rows` grid
|
||||
|
||||
@@ -9,10 +9,10 @@ import type { Package } from '@tts/bgm';
|
||||
import { useStacking } from './stacking.js';
|
||||
import type { Placement } from './state.js';
|
||||
import { PartView } from './partView.js';
|
||||
import { MM_TO_WORLD, DEG_TO_RAD } from './part.js';
|
||||
import { MM_TO_WORLD, DEG_TO_RAD, facingTransform, partDimensions } from './part.js';
|
||||
|
||||
export function PartPlacement({ pkg, placement }: { pkg: Package; placement: Placement }) {
|
||||
const { route, candidate, piece, index, stackSize, face } = placement;
|
||||
const { route, candidate, piece, index, stackSize, facing } = placement;
|
||||
// `piece` is `package:type#id`; the parts map is keyed by `type#id`.
|
||||
const part = pkg.parts.get(piece.split(':').slice(1).join(':'));
|
||||
if (!part) return null;
|
||||
@@ -34,12 +34,16 @@ export function PartPlacement({ pkg, placement }: { pkg: Package; placement: Pla
|
||||
const anchorRotation =
|
||||
((candidate?.rotation ?? route.rotation ?? 0) - rotation) * DEG_TO_RAD;
|
||||
|
||||
// The facing pivot is the center of the face/edge that rests on the table
|
||||
// and should land at the anchor. Translate the mesh by the pivot, then apply
|
||||
// the facing rotation and tilt about it, so the part sits on the table.
|
||||
const { width, height, depth } = partDimensions(part);
|
||||
const { pivot, xRotation } = facingTransform(facing, { height, depth });
|
||||
|
||||
return (
|
||||
<group position={[anchorX, anchorZ, anchorY]} rotation={[0, anchorRotation, 0]}>
|
||||
{/* The part mesh extrudes along +Z; lay it flat so its face points up.
|
||||
A face-down part is flipped over about its local X axis. */}
|
||||
<group rotation={[-Math.PI / 2, tilt * DEG_TO_RAD, 0]}>
|
||||
<group rotation={!face ? [Math.PI, 0, 0] : [0, 0, 0]}>
|
||||
<group position={[-pivot[0], -pivot[1], -pivot[2]]}>
|
||||
<group rotation={[xRotation, tilt * DEG_TO_RAD, 0]}>
|
||||
<PartView part={part} baseUrl={part.baseUrl} />
|
||||
</group>
|
||||
</group>
|
||||
|
||||
@@ -44,7 +44,7 @@ describe('seedFromSetup', () => {
|
||||
};
|
||||
const state = seedFromSetup(pkg, setup);
|
||||
expect(state.surfaces).toEqual({ 'board#harbor': true });
|
||||
expect(state.parts).toEqual({ 'harbor:card#fleet': { path: '/deck', index: 0, face: true } });
|
||||
expect(state.parts).toEqual({ 'harbor:card#fleet': { path: '/deck', index: 0, facing: 'face' } });
|
||||
});
|
||||
|
||||
it('enables all surfaces when omitted', () => {
|
||||
@@ -65,7 +65,24 @@ describe('seedFromSetup', () => {
|
||||
],
|
||||
};
|
||||
const state = seedFromSetup(pkg, setup);
|
||||
expect(state.parts['harbor:card#fleet']).toEqual({ path: '/hand', index: 0, face: true });
|
||||
expect(state.parts['harbor:token#wood']).toEqual({ path: '/deck', index: 0, face: true });
|
||||
expect(state.parts['harbor:card#fleet']).toEqual({ path: '/hand', index: 0, facing: 'face' });
|
||||
expect(state.parts['harbor:token#wood']).toEqual({ path: '/deck', index: 0, facing: 'face' });
|
||||
});
|
||||
|
||||
it('seeds the facing from the placement, defaulting to face', () => {
|
||||
const setup = {
|
||||
type: 'game',
|
||||
id: 'main',
|
||||
setup: [
|
||||
{ path: '/deck', parts: 'harbor:card#fleet', facing: 'back' },
|
||||
{ path: '/table', parts: 'harbor:token#wood', facing: 'standing' },
|
||||
{ path: '/hand', parts: 'harbor:token#grain' },
|
||||
],
|
||||
};
|
||||
const state = seedFromSetup(pkg, setup);
|
||||
expect(state.parts['harbor:card#fleet']).toEqual({ path: '/deck', index: 0, facing: 'back' });
|
||||
expect(state.parts['harbor:token#wood']).toEqual({ path: '/table', index: 0, facing: 'standing' });
|
||||
// No `facing` on the placement defaults to `face`.
|
||||
expect(state.parts['harbor:token#grain']).toEqual({ path: '/hand', index: 0, facing: 'face' });
|
||||
});
|
||||
});
|
||||
@@ -55,7 +55,7 @@ export function seedFromSetup(pkg: Package, setup: Setup): {
|
||||
const parts: Record<string, PartState> = {};
|
||||
for (const placement of setup.setup) {
|
||||
for (const id of expandSetupValue(pkg, placement.parts)) {
|
||||
parts[id] = { path: placement.path, index: 0, face: true };
|
||||
parts[id] = { path: placement.path, index: 0, facing: placement.facing ?? 'face' };
|
||||
}
|
||||
}
|
||||
const byPath: Record<string, string[]> = {};
|
||||
|
||||
@@ -68,9 +68,9 @@ describe('matchRoute', () => {
|
||||
describe('childrenByPath', () => {
|
||||
it('groups parts by path, ordered by index', () => {
|
||||
const parts = {
|
||||
'harbor:card#a': { path: '/deck', index: 1, face: true },
|
||||
'harbor:card#b': { path: '/deck', index: 0, face: false },
|
||||
'harbor:card#c': { path: '/community/0', index: 0, face: true },
|
||||
'harbor:card#a': { path: '/deck', index: 1, facing: 'face' },
|
||||
'harbor:card#b': { path: '/deck', index: 0, facing: 'back' },
|
||||
'harbor:card#c': { path: '/community/0', index: 0, facing: 'standing' },
|
||||
};
|
||||
expect(childrenByPath(parts)).toEqual({
|
||||
'/deck': ['harbor:card#b', 'harbor:card#a'],
|
||||
@@ -80,24 +80,24 @@ describe('childrenByPath', () => {
|
||||
});
|
||||
|
||||
describe('computeSurfacePlacements', () => {
|
||||
it('places parts on a matching route with index, stackSize, and face', () => {
|
||||
it('places parts on a matching route with index, stackSize, and facing', () => {
|
||||
const surface = makeSurface({
|
||||
layout: [{ route: '/deck', x: -100, y: 0, rotation: 0 }],
|
||||
});
|
||||
const placements = computeSurfacePlacements(surface, {
|
||||
'harbor:card#a': { path: '/deck', index: 0, face: true },
|
||||
'harbor:card#b': { path: '/deck', index: 1, face: false },
|
||||
'harbor:card#a': { path: '/deck', index: 0, facing: 'face' },
|
||||
'harbor:card#b': { path: '/deck', index: 1, facing: 'back' },
|
||||
});
|
||||
expect(placements).toHaveLength(2);
|
||||
expect(placements[0]).toMatchObject({ piece: 'harbor:card#a', index: 0, stackSize: 2, face: true });
|
||||
expect(placements[1]).toMatchObject({ piece: 'harbor:card#b', index: 1, stackSize: 2, face: false });
|
||||
expect(placements[0]).toMatchObject({ piece: 'harbor:card#a', index: 0, stackSize: 2, facing: 'face' });
|
||||
expect(placements[1]).toMatchObject({ piece: 'harbor:card#b', index: 1, stackSize: 2, facing: 'back' });
|
||||
});
|
||||
|
||||
it('drops parts with no matching route', () => {
|
||||
const surface = makeSurface({ layout: [{ route: '/deck', x: 0, y: 0, rotation: 0 }] });
|
||||
const placements = computeSurfacePlacements(surface, {
|
||||
'harbor:card#a': { path: '/deck', index: 0, face: true },
|
||||
'harbor:card#b': { path: '/elsewhere', index: 0, face: true },
|
||||
'harbor:card#a': { path: '/deck', index: 0, facing: 'face' },
|
||||
'harbor:card#b': { path: '/elsewhere', index: 0, facing: 'face' },
|
||||
});
|
||||
expect(placements).toHaveLength(1);
|
||||
expect(placements[0]!.piece).toBe('harbor:card#a');
|
||||
@@ -116,7 +116,7 @@ describe('computeSurfacePlacements', () => {
|
||||
],
|
||||
});
|
||||
const placements = computeSurfacePlacements(surface, {
|
||||
'harbor:boat#fleet': { path: '/dock/0', index: 0, face: true },
|
||||
'harbor:boat#fleet': { path: '/dock/0', index: 0, facing: 'face' },
|
||||
});
|
||||
expect(placements[0]!.candidate).toEqual({ seat: '0', x: 40, y: 5, rotation: 1 });
|
||||
});
|
||||
@@ -134,7 +134,7 @@ describe('computeSurfacePlacements', () => {
|
||||
],
|
||||
});
|
||||
const placements = computeSurfacePlacements(surface, {
|
||||
'harbor:boat#fleet': { path: '/dock/0', index: 0, face: true },
|
||||
'harbor:boat#fleet': { path: '/dock/0', index: 0, facing: 'face' },
|
||||
});
|
||||
expect(placements[0]!.candidate).toEqual({ seat: '0', x: 40, y: 5, stacking: { tilt: 2 } });
|
||||
});
|
||||
@@ -144,8 +144,8 @@ describe('computeSurfacePlacements', () => {
|
||||
layout: [{ route: '/deck', x: 0, y: 0, rotation: 0 }],
|
||||
});
|
||||
const placements = computeSurfacePlacements(surface, {
|
||||
'harbor:card#b': { path: '/deck', index: 1, face: true },
|
||||
'harbor:card#a': { path: '/deck', index: 0, face: true },
|
||||
'harbor:card#b': { path: '/deck', index: 1, facing: 'face' },
|
||||
'harbor:card#a': { path: '/deck', index: 0, facing: 'face' },
|
||||
});
|
||||
expect(placements.map((p) => p.piece)).toEqual(['harbor:card#a', 'harbor:card#b']);
|
||||
});
|
||||
@@ -155,7 +155,7 @@ describe('computeRenderState', () => {
|
||||
it('only includes enabled surfaces', () => {
|
||||
const state = {
|
||||
surfaces: { 'board#harbor': true, 'hud#hand': false },
|
||||
parts: { 'harbor:card#a': { path: '/deck', index: 0, face: true } },
|
||||
parts: { 'harbor:card#a': { path: '/deck', index: 0, facing: 'face' } },
|
||||
};
|
||||
pkg.surfaces.set(
|
||||
'board#harbor',
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
*/
|
||||
import { useMemo } from 'react';
|
||||
import { create } from 'zustand';
|
||||
import type { Candidate, Package, Route, Surface } from '@tts/bgm';
|
||||
import type { Candidate, Facing, Package, Route, Surface } from '@tts/bgm';
|
||||
|
||||
/** The placement state of a single part on the board. */
|
||||
export interface PartState {
|
||||
@@ -19,8 +19,8 @@ export interface PartState {
|
||||
path: string;
|
||||
/** The part's position in its path's stack. */
|
||||
index: number;
|
||||
/** Whether the part's face is up (`true`) or down (`false`). */
|
||||
face: boolean;
|
||||
/** How the part is oriented on the board. */
|
||||
facing: Facing;
|
||||
}
|
||||
|
||||
/** Source-of-truth game state. */
|
||||
@@ -47,8 +47,8 @@ export interface Placement {
|
||||
index: number;
|
||||
/** The number of pieces on the path. */
|
||||
stackSize: number;
|
||||
/** Whether the piece's face is up. */
|
||||
face: boolean;
|
||||
/** How the piece is oriented on the board. */
|
||||
facing: Facing;
|
||||
}
|
||||
|
||||
interface TabletopState extends GameState {
|
||||
@@ -169,7 +169,7 @@ export function computeSurfacePlacements(surface: Surface, parts: Record<string,
|
||||
piece,
|
||||
index: ps.index,
|
||||
stackSize,
|
||||
face: ps.face,
|
||||
facing: ps.facing,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user