Add commands and update brush face handling

This commit is contained in:
2026-03-31 02:33:18 +02:00
parent d1ae2499e5
commit 8760b210d4
9 changed files with 513 additions and 15 deletions

View File

@@ -1,12 +1,23 @@
import { createOpaqueId } from "../core/ids";
import type { Vec3 } from "../core/vector";
import type { Vec2, Vec3 } from "../core/vector";
export const BOX_FACE_IDS = ["posX", "negX", "posY", "negY", "posZ", "negZ"] as const;
export const FACE_UV_ROTATION_QUARTER_TURNS = [0, 1, 2, 3] as const;
export type BoxFaceId = (typeof BOX_FACE_IDS)[number];
export type FaceUvRotationQuarterTurns = (typeof FACE_UV_ROTATION_QUARTER_TURNS)[number];
export interface FaceUvState {
offset: Vec2;
scale: Vec2;
rotationQuarterTurns: FaceUvRotationQuarterTurns;
flipU: boolean;
flipV: boolean;
}
export interface BrushFace {
materialId: string | null;
uv: FaceUvState;
}
export type BoxBrushFaces = Record<BoxFaceId, BrushFace>;
@@ -45,7 +56,8 @@ function cloneVec3(vector: Vec3): Vec3 {
function cloneBrushFace(face: BrushFace): BrushFace {
return {
materialId: face.materialId
materialId: face.materialId,
uv: cloneFaceUvState(face.uv)
};
}
@@ -53,10 +65,44 @@ export function isBoxFaceId(value: unknown): value is BoxFaceId {
return typeof value === "string" && BOX_FACE_IDS.some((faceId) => faceId === value);
}
export function isFaceUvRotationQuarterTurns(value: unknown): value is FaceUvRotationQuarterTurns {
return typeof value === "number" && FACE_UV_ROTATION_QUARTER_TURNS.includes(value as FaceUvRotationQuarterTurns);
}
export function hasPositiveBoxSize(size: Vec3): boolean {
return size.x > 0 && size.y > 0 && size.z > 0;
}
export function createDefaultFaceUvState(): FaceUvState {
return {
offset: {
x: 0,
y: 0
},
scale: {
x: 1,
y: 1
},
rotationQuarterTurns: 0,
flipU: false,
flipV: false
};
}
export function cloneFaceUvState(uv: FaceUvState): FaceUvState {
return {
offset: {
...uv.offset
},
scale: {
...uv.scale
},
rotationQuarterTurns: uv.rotationQuarterTurns,
flipU: uv.flipU,
flipV: uv.flipV
};
}
export function cloneBoxBrushFaces(faces: BoxBrushFaces): BoxBrushFaces {
return {
posX: cloneBrushFace(faces.posX),
@@ -71,22 +117,28 @@ export function cloneBoxBrushFaces(faces: BoxBrushFaces): BoxBrushFaces {
export function createDefaultBoxBrushFaces(): BoxBrushFaces {
return {
posX: {
materialId: null
materialId: null,
uv: createDefaultFaceUvState()
},
negX: {
materialId: null
materialId: null,
uv: createDefaultFaceUvState()
},
posY: {
materialId: null
materialId: null,
uv: createDefaultFaceUvState()
},
negY: {
materialId: null
materialId: null,
uv: createDefaultFaceUvState()
},
posZ: {
materialId: null
materialId: null,
uv: createDefaultFaceUvState()
},
negZ: {
materialId: null
materialId: null,
uv: createDefaultFaceUvState()
}
};
}

View File

@@ -1,8 +1,10 @@
import { DEFAULT_SUN_DIRECTION, type Vec3 } from "../core/vector";
import type { Brush } from "./brushes";
import { cloneMaterialRegistry, createStarterMaterialRegistry, type MaterialDef } from "../materials/starter-material-library";
export const SCENE_DOCUMENT_VERSION = 2 as const;
export const SCENE_DOCUMENT_VERSION = 3 as const;
export const FOUNDATION_SCENE_DOCUMENT_VERSION = 1 as const;
export const BOX_BRUSH_SCENE_DOCUMENT_VERSION = 2 as const;
export interface WorldBackgroundSettings {
mode: "solid";
@@ -30,7 +32,7 @@ export interface SceneDocument {
version: typeof SCENE_DOCUMENT_VERSION;
name: string;
world: WorldSettings;
materials: Record<string, never>;
materials: Record<string, MaterialDef>;
textures: Record<string, never>;
assets: Record<string, never>;
brushes: Record<string, Brush>;
@@ -59,12 +61,12 @@ export function createDefaultWorldSettings(): WorldSettings {
};
}
export function createEmptySceneDocument(overrides: Partial<Pick<SceneDocument, "name" | "world">> = {}): SceneDocument {
export function createEmptySceneDocument(overrides: Partial<Pick<SceneDocument, "name" | "world" | "materials">> = {}): SceneDocument {
return {
version: SCENE_DOCUMENT_VERSION,
name: overrides.name ?? "Untitled Scene",
world: overrides.world ?? createDefaultWorldSettings(),
materials: {},
materials: cloneMaterialRegistry(overrides.materials ?? createStarterMaterialRegistry()),
textures: {},
assets: {},
brushes: {},