Wawa
e618175bba
Wholesale swap of packages/{core,viewer,editor,mcp} and apps/editor with the
versions from the private editor repo, which is the production source of truth.
Setup changes:
- packages/{core,viewer,editor} versions held at 0.7.0 baseline (matching
the most recent published release) so a bump=minor publishes 0.8.0
- packages/mcp held at 0.1.1 (never published; first publish will go through
the new release.yml flow)
- peerDependencies and devDependencies for inter-package @pascal-app/*
references pinned to ^0.7.0 instead of '*' / 'workspace:*' so they are
valid for npm consumers
- Root package.json: TypeScript bumped to 6.0.2, added overrides for
@types/react, @types/react-dom, @types/three to prevent JSX namespace
fragmentation across the workspace
- release.yml extended to also publish editor and mcp; 'both' option renamed
to 'all'; added a sync step that updates inter-package peerDeps/devDeps to
match the new versions on every bump (so viewer/editor/mcp tarballs always
reference the version of core they were built against)
- Root scripts gained release:editor and release:mcp shortcuts
Verification:
- bun install --frozen-lockfile is consistent
- packages/{core,viewer,mcp} build cleanly, dist/index.d.ts emitted
- packages/editor check-types reports 21 pre-existing errors, identical to
what private-editor currently reports
Open PRs against editor-v2 will need rebasing/conflict resolution.
626 lines
15 KiB
TypeScript
626 lines
15 KiB
TypeScript
import {
|
|
type MaterialPresetPayload,
|
|
type MaterialTarget,
|
|
MaterialTarget as MaterialTargetSchema,
|
|
} from './schema/material'
|
|
|
|
export type MaterialCatalogItem = {
|
|
id: string
|
|
label: string
|
|
category: MaterialCategory
|
|
description?: string
|
|
previewThumbnailUrl?: string
|
|
previewColor?: string
|
|
preset: MaterialPresetPayload
|
|
}
|
|
|
|
const WALL_TARGETS: MaterialTarget[] = [MaterialTargetSchema.enum.wall]
|
|
|
|
const SLAB_TARGETS: MaterialTarget[] = [MaterialTargetSchema.enum.slab]
|
|
|
|
const WALL_AND_SLAB_TARGETS: MaterialTarget[] = [
|
|
MaterialTargetSchema.enum.wall,
|
|
MaterialTargetSchema.enum.slab,
|
|
]
|
|
|
|
const STAIR_TARGETS: MaterialTarget[] = [
|
|
MaterialTargetSchema.enum.stair,
|
|
MaterialTargetSchema.enum['stair-segment'],
|
|
]
|
|
|
|
const STAIR_AND_FENCE_TARGETS: MaterialTarget[] = [
|
|
...STAIR_TARGETS,
|
|
MaterialTargetSchema.enum.fence,
|
|
]
|
|
|
|
const ROOF_TARGETS: MaterialTarget[] = [
|
|
MaterialTargetSchema.enum.roof,
|
|
MaterialTargetSchema.enum['roof-segment'],
|
|
]
|
|
|
|
const CEILING_TARGETS: MaterialTarget[] = [MaterialTargetSchema.enum.ceiling]
|
|
|
|
export const MATERIAL_CATEGORIES = [
|
|
'wood',
|
|
'wallpaper',
|
|
'parquet',
|
|
'granite',
|
|
'marble',
|
|
'other',
|
|
] as const
|
|
export type MaterialCategory = (typeof MATERIAL_CATEGORIES)[number]
|
|
|
|
export const MATERIAL_CATALOG: MaterialCatalogItem[] = [
|
|
{
|
|
id: 'wall-wood1',
|
|
label: 'Wood',
|
|
category: 'wood',
|
|
description: 'Warm wood finish',
|
|
previewThumbnailUrl: '/material/wood1/wood1_thumbnail.webp',
|
|
preset: {
|
|
maps: {
|
|
albedoMap: '/material/wood1/albedoMap_basecolor.jpg',
|
|
normalMap: '/material/wood1/normalMap_normal.jpg',
|
|
},
|
|
mapProperties: {
|
|
color: '#ffffff',
|
|
roughness: 0.575,
|
|
metalness: 0,
|
|
repeatX: 1,
|
|
repeatY: 1,
|
|
rotation: 0,
|
|
wrapS: 'Repeat',
|
|
wrapT: 'Repeat',
|
|
normalScaleX: 1,
|
|
normalScaleY: 1,
|
|
emissiveIntensity: 1,
|
|
displacementScale: 0.02,
|
|
transparent: true,
|
|
flipY: true,
|
|
bumpScale: 1,
|
|
emissiveColor: '#000000',
|
|
aoMapIntensity: 1,
|
|
side: 0,
|
|
opacity: 1,
|
|
lightMapIntensity: 1,
|
|
},
|
|
},
|
|
},
|
|
{
|
|
id: 'wall-wood2',
|
|
label: 'Wood',
|
|
category: 'wood',
|
|
description: 'Textured wood finish',
|
|
previewThumbnailUrl: '/material/wood2/wood2_thumbnail.webp',
|
|
preset: {
|
|
maps: {
|
|
albedoMap: '/material/wood2/albedoMap_Wood.jpg',
|
|
normalMap: '/material/wood2/normalMap_Wood.jpg',
|
|
aoMap: '/material/wood2/aoMap_Wood.jpg',
|
|
},
|
|
mapProperties: {
|
|
color: '#ffffff',
|
|
roughness: 0.467,
|
|
metalness: 0,
|
|
repeatX: 1,
|
|
repeatY: 1,
|
|
rotation: 0,
|
|
wrapS: 'Repeat',
|
|
wrapT: 'Repeat',
|
|
normalScaleX: 2,
|
|
normalScaleY: 2,
|
|
emissiveIntensity: 1,
|
|
displacementScale: 0.02,
|
|
transparent: true,
|
|
flipY: true,
|
|
bumpScale: 1,
|
|
emissiveColor: '#000000',
|
|
aoMapIntensity: 2,
|
|
side: 0,
|
|
opacity: 1,
|
|
lightMapIntensity: 1,
|
|
},
|
|
},
|
|
},
|
|
{
|
|
id: 'wall-wood3',
|
|
label: 'Wood',
|
|
category: 'wood',
|
|
description: 'Knotted timber finish',
|
|
previewThumbnailUrl: '/material/wood3/wood3_thumbnail.webp',
|
|
preset: {
|
|
maps: {
|
|
albedoMap: '/material/wood3/albedoMap_knotted-timber.jpg',
|
|
},
|
|
mapProperties: {
|
|
color: '#ffffff',
|
|
roughness: 0.489,
|
|
metalness: 0,
|
|
repeatX: 1,
|
|
repeatY: 1,
|
|
rotation: 0,
|
|
wrapS: 'Repeat',
|
|
wrapT: 'Repeat',
|
|
normalScaleX: 0.2,
|
|
normalScaleY: 0.2,
|
|
emissiveIntensity: 1,
|
|
displacementScale: 0.02,
|
|
transparent: true,
|
|
flipY: true,
|
|
bumpScale: 1,
|
|
emissiveColor: '#000000',
|
|
aoMapIntensity: 2,
|
|
side: 0,
|
|
opacity: 1,
|
|
lightMapIntensity: 1,
|
|
},
|
|
},
|
|
},
|
|
{
|
|
id: 'wall-wood4',
|
|
label: 'Wood',
|
|
category: 'wood',
|
|
description: 'Oak stretcher finish',
|
|
previewThumbnailUrl: '/material/wood4/wood4_thumbnail.webp',
|
|
preset: {
|
|
maps: {
|
|
albedoMap: '/material/wood4/albedoMap_oak-stretcher.jpg',
|
|
},
|
|
mapProperties: {
|
|
color: '#ffffff',
|
|
roughness: 0.378,
|
|
metalness: 0,
|
|
repeatX: 1,
|
|
repeatY: 1,
|
|
rotation: 0,
|
|
wrapS: 'Repeat',
|
|
wrapT: 'Repeat',
|
|
normalScaleX: 1,
|
|
normalScaleY: 1,
|
|
emissiveIntensity: 1,
|
|
displacementScale: 0.02,
|
|
transparent: true,
|
|
flipY: true,
|
|
bumpScale: 1,
|
|
emissiveColor: '#000000',
|
|
aoMapIntensity: 1,
|
|
side: 0,
|
|
opacity: 1,
|
|
lightMapIntensity: 1,
|
|
},
|
|
},
|
|
},
|
|
{
|
|
id: 'wall-wood5',
|
|
label: 'Wood',
|
|
category: 'wood',
|
|
description: 'Rich grain wood finish',
|
|
previewThumbnailUrl: '/material/wood5/wood5_thumnail.webp',
|
|
preset: {
|
|
maps: {
|
|
albedoMap: '/material/wood5/albedoMap_3_base_color.webp',
|
|
normalMap: '/material/wood5/normalMap_3_normal.jpg',
|
|
aoMap: '/material/wood5/aoMap_3_ao.jpg',
|
|
},
|
|
mapProperties: {
|
|
color: '#ffffff',
|
|
roughness: 0.6,
|
|
metalness: 0,
|
|
repeatX: 1,
|
|
repeatY: 1,
|
|
rotation: 0,
|
|
wrapS: 'Repeat',
|
|
wrapT: 'Repeat',
|
|
normalScaleX: 1,
|
|
normalScaleY: 1,
|
|
emissiveIntensity: 1,
|
|
displacementScale: 0.02,
|
|
transparent: true,
|
|
flipY: true,
|
|
bumpScale: 1,
|
|
emissiveColor: '#000000',
|
|
aoMapIntensity: 10,
|
|
side: 0,
|
|
opacity: 1,
|
|
lightMapIntensity: 1,
|
|
},
|
|
},
|
|
},
|
|
{
|
|
id: 'wall-granite1',
|
|
label: 'Granite',
|
|
category: 'granite',
|
|
description: 'Polished granite finish',
|
|
previewThumbnailUrl: '/material/granite1/granite_thumbnail.webp',
|
|
preset: {
|
|
maps: {
|
|
albedoMap: '/material/granite1/albedoMap_Granite.jpg',
|
|
},
|
|
mapProperties: {
|
|
color: '#ffffff',
|
|
roughness: 0.189,
|
|
metalness: 0,
|
|
repeatX: 1,
|
|
repeatY: 1,
|
|
rotation: 0,
|
|
wrapS: 'Repeat',
|
|
wrapT: 'Repeat',
|
|
normalScaleX: 1,
|
|
normalScaleY: 1,
|
|
emissiveIntensity: 1,
|
|
displacementScale: 0.02,
|
|
transparent: true,
|
|
flipY: true,
|
|
bumpScale: 1,
|
|
emissiveColor: '#000000',
|
|
aoMapIntensity: 1,
|
|
side: 0,
|
|
opacity: 1,
|
|
lightMapIntensity: 1,
|
|
},
|
|
},
|
|
},
|
|
{
|
|
id: 'wall-marble1',
|
|
label: 'Marble',
|
|
category: 'marble',
|
|
description: 'Smooth marble finish',
|
|
previewThumbnailUrl: '/material/marble1/marble1_thumbnail.webp',
|
|
preset: {
|
|
maps: {
|
|
albedoMap: '/material/marble1/albedoMap_marble.jpg',
|
|
},
|
|
mapProperties: {
|
|
color: '#ffffff',
|
|
roughness: 0.133,
|
|
metalness: 0,
|
|
repeatX: 1,
|
|
repeatY: 1,
|
|
rotation: 0,
|
|
wrapS: 'Repeat',
|
|
wrapT: 'Repeat',
|
|
normalScaleX: 1,
|
|
normalScaleY: 1,
|
|
emissiveIntensity: 1,
|
|
displacementScale: 0.02,
|
|
transparent: true,
|
|
flipY: true,
|
|
bumpScale: 1,
|
|
emissiveColor: '#000000',
|
|
aoMapIntensity: 1,
|
|
side: 0,
|
|
opacity: 1,
|
|
lightMapIntensity: 1,
|
|
},
|
|
},
|
|
},
|
|
{
|
|
id: 'wall-marble2',
|
|
label: 'Marble',
|
|
category: 'marble',
|
|
description: 'Soft marble finish',
|
|
previewThumbnailUrl: '/material/marble2/marble2_thumbnail.webp',
|
|
preset: {
|
|
maps: {
|
|
albedoMap: '/material/marble2/albedoMap_marble.jpg',
|
|
},
|
|
mapProperties: {
|
|
color: '#ffffff',
|
|
roughness: 0.122,
|
|
metalness: 0,
|
|
repeatX: 1,
|
|
repeatY: 1,
|
|
rotation: 0,
|
|
wrapS: 'Repeat',
|
|
wrapT: 'Repeat',
|
|
normalScaleX: 1,
|
|
normalScaleY: 1,
|
|
emissiveIntensity: 1,
|
|
displacementScale: 0.02,
|
|
transparent: true,
|
|
flipY: true,
|
|
bumpScale: 1,
|
|
emissiveColor: '#000000',
|
|
aoMapIntensity: 1,
|
|
side: 0,
|
|
opacity: 1,
|
|
lightMapIntensity: 1,
|
|
},
|
|
},
|
|
},
|
|
{
|
|
id: 'wall-parquet1',
|
|
label: 'Parquet',
|
|
category: 'parquet',
|
|
description: 'Parquet wood finish',
|
|
previewThumbnailUrl: '/material/parquet1/parquet_thumnail.webp',
|
|
preset: {
|
|
maps: {
|
|
albedoMap: '/material/parquet1/albedoMap_parquet.jpg',
|
|
},
|
|
mapProperties: {
|
|
color: '#ffffff',
|
|
roughness: 0.644,
|
|
metalness: 0.4,
|
|
repeatX: 1,
|
|
repeatY: 1,
|
|
rotation: 0,
|
|
wrapS: 'Repeat',
|
|
wrapT: 'Repeat',
|
|
normalScaleX: 1,
|
|
normalScaleY: 1,
|
|
emissiveIntensity: 1,
|
|
displacementScale: 0.02,
|
|
transparent: true,
|
|
flipY: true,
|
|
bumpScale: 1,
|
|
emissiveColor: '#000000',
|
|
aoMapIntensity: 1,
|
|
side: 0,
|
|
opacity: 1,
|
|
lightMapIntensity: 1,
|
|
},
|
|
},
|
|
},
|
|
{
|
|
id: 'wall-parquet2',
|
|
label: 'Parquet',
|
|
category: 'parquet',
|
|
description: 'Soft parquet finish',
|
|
previewThumbnailUrl: '/material/parquet2/parquet2_thumbnail.webp',
|
|
preset: {
|
|
maps: {
|
|
albedoMap: '/material/parquet2/albedoMap_parquet.jpg',
|
|
},
|
|
mapProperties: {
|
|
color: '#ffffff',
|
|
roughness: 0.6,
|
|
metalness: 0,
|
|
repeatX: 1,
|
|
repeatY: 1,
|
|
rotation: 0,
|
|
wrapS: 'Repeat',
|
|
wrapT: 'Repeat',
|
|
normalScaleX: 1,
|
|
normalScaleY: 1,
|
|
emissiveIntensity: 1,
|
|
displacementScale: 0.02,
|
|
transparent: true,
|
|
flipY: true,
|
|
bumpScale: 1,
|
|
emissiveColor: '#000000',
|
|
aoMapIntensity: 1,
|
|
side: 0,
|
|
opacity: 1,
|
|
lightMapIntensity: 1,
|
|
},
|
|
},
|
|
},
|
|
{
|
|
id: 'wall-wallpaper1',
|
|
label: 'Wallpaper',
|
|
category: 'wallpaper',
|
|
description: 'Soft wallpaper finish',
|
|
previewThumbnailUrl: '/material/wallpaper1/wallpaper1_thumbnail.webp',
|
|
preset: {
|
|
maps: {
|
|
albedoMap: '/material/wallpaper1/albedoMap_1.webp',
|
|
normalMap: '/material/wallpaper1/normalMap_NormalMap.webp',
|
|
},
|
|
mapProperties: {
|
|
color: '#ffffff',
|
|
roughness: 0.911,
|
|
metalness: 0,
|
|
repeatX: 1,
|
|
repeatY: 1,
|
|
rotation: 0,
|
|
wrapS: 'Repeat',
|
|
wrapT: 'Repeat',
|
|
normalScaleX: 1,
|
|
normalScaleY: 1,
|
|
emissiveIntensity: 1,
|
|
displacementScale: 0.02,
|
|
transparent: true,
|
|
flipY: true,
|
|
bumpScale: 1,
|
|
emissiveColor: '#000000',
|
|
aoMapIntensity: 1,
|
|
side: 0,
|
|
opacity: 1,
|
|
lightMapIntensity: 1,
|
|
},
|
|
},
|
|
},
|
|
{
|
|
id: 'wall-wallpaper2',
|
|
label: 'Wallpaper',
|
|
category: 'wallpaper',
|
|
description: 'Decorative wallpaper finish',
|
|
previewThumbnailUrl: '/material/wallpaper2/wallpaper2_thumnail.webp',
|
|
preset: {
|
|
maps: {
|
|
albedoMap: '/material/wallpaper2/albedoMap_5.webp',
|
|
},
|
|
mapProperties: {
|
|
color: '#ffffff',
|
|
roughness: 0.889,
|
|
metalness: 0.255,
|
|
repeatX: 1,
|
|
repeatY: 1,
|
|
rotation: 0,
|
|
wrapS: 'Repeat',
|
|
wrapT: 'Repeat',
|
|
normalScaleX: 1,
|
|
normalScaleY: 1,
|
|
emissiveIntensity: 1,
|
|
displacementScale: 0.02,
|
|
transparent: true,
|
|
flipY: true,
|
|
bumpScale: 1,
|
|
emissiveColor: '#000000',
|
|
aoMapIntensity: 1,
|
|
side: 0,
|
|
opacity: 1,
|
|
lightMapIntensity: 1,
|
|
},
|
|
},
|
|
},
|
|
{
|
|
id: 'wall-wallpaper3',
|
|
label: 'Wallpaper',
|
|
category: 'wallpaper',
|
|
description: 'Patterned wallpaper finish',
|
|
previewThumbnailUrl: '/material/wallpaper3/wallpaper3_thumbnail.webp',
|
|
preset: {
|
|
maps: {
|
|
albedoMap: '/material/wallpaper3/albedoMap_wallpaper3.avif',
|
|
},
|
|
mapProperties: {
|
|
color: '#ffffff',
|
|
roughness: 0.887,
|
|
metalness: 0.35,
|
|
repeatX: 1,
|
|
repeatY: 1,
|
|
rotation: 0,
|
|
wrapS: 'Repeat',
|
|
wrapT: 'Repeat',
|
|
normalScaleX: 1,
|
|
normalScaleY: 1,
|
|
emissiveIntensity: 1,
|
|
displacementScale: 0.02,
|
|
transparent: true,
|
|
flipY: true,
|
|
bumpScale: 1,
|
|
emissiveColor: '#000000',
|
|
aoMapIntensity: 1,
|
|
side: 0,
|
|
opacity: 1,
|
|
lightMapIntensity: 1,
|
|
},
|
|
},
|
|
},
|
|
{
|
|
id: 'preset-white',
|
|
label: 'White',
|
|
category: 'other',
|
|
description: 'Clean painted finish',
|
|
previewColor: '#ffffff',
|
|
preset: {
|
|
maps: {},
|
|
mapProperties: {
|
|
color: '#ffffff',
|
|
roughness: 0.9,
|
|
metalness: 0,
|
|
repeatX: 1,
|
|
repeatY: 1,
|
|
rotation: 0,
|
|
wrapS: 'Repeat',
|
|
wrapT: 'Repeat',
|
|
normalScaleX: 1,
|
|
normalScaleY: 1,
|
|
emissiveIntensity: 1,
|
|
displacementScale: 0.02,
|
|
transparent: false,
|
|
flipY: true,
|
|
bumpScale: 1,
|
|
emissiveColor: '#000000',
|
|
aoMapIntensity: 1,
|
|
side: 0,
|
|
opacity: 1,
|
|
lightMapIntensity: 1,
|
|
},
|
|
},
|
|
},
|
|
{
|
|
id: 'preset-metal',
|
|
label: 'Metal',
|
|
category: 'other',
|
|
description: 'Brushed metal finish',
|
|
previewColor: '#c0c0c0',
|
|
preset: {
|
|
maps: {},
|
|
mapProperties: {
|
|
color: '#c7ccd2',
|
|
roughness: 0.26,
|
|
metalness: 0.82,
|
|
repeatX: 1,
|
|
repeatY: 1,
|
|
rotation: 0,
|
|
wrapS: 'Repeat',
|
|
wrapT: 'Repeat',
|
|
normalScaleX: 1,
|
|
normalScaleY: 1,
|
|
emissiveIntensity: 1,
|
|
displacementScale: 0.02,
|
|
transparent: false,
|
|
flipY: true,
|
|
bumpScale: 1,
|
|
emissiveColor: '#000000',
|
|
aoMapIntensity: 1,
|
|
side: 0,
|
|
opacity: 1,
|
|
lightMapIntensity: 1,
|
|
},
|
|
},
|
|
},
|
|
{
|
|
id: 'preset-glass',
|
|
label: 'Glass',
|
|
category: 'other',
|
|
description: 'Light glass finish',
|
|
previewColor: '#87ceeb',
|
|
preset: {
|
|
maps: {},
|
|
mapProperties: {
|
|
color: '#87ceeb',
|
|
roughness: 0.1,
|
|
metalness: 0.1,
|
|
repeatX: 1,
|
|
repeatY: 1,
|
|
rotation: 0,
|
|
wrapS: 'Repeat',
|
|
wrapT: 'Repeat',
|
|
normalScaleX: 1,
|
|
normalScaleY: 1,
|
|
emissiveIntensity: 1,
|
|
displacementScale: 0.02,
|
|
transparent: true,
|
|
flipY: true,
|
|
bumpScale: 1,
|
|
emissiveColor: '#000000',
|
|
aoMapIntensity: 1,
|
|
side: 2,
|
|
opacity: 0.3,
|
|
lightMapIntensity: 1,
|
|
},
|
|
},
|
|
},
|
|
]
|
|
|
|
export function getMaterialsForCategory(category: MaterialCategory): MaterialCatalogItem[] {
|
|
return MATERIAL_CATALOG.filter((item) => item.category === category)
|
|
}
|
|
|
|
export function getCatalogMaterialById(id?: string): MaterialCatalogItem | undefined {
|
|
if (!id) return undefined
|
|
return MATERIAL_CATALOG.find((item) => item.id === id)
|
|
}
|
|
|
|
export const LIBRARY_MATERIAL_REF_PREFIX = 'library:'
|
|
|
|
export function toLibraryMaterialRef(id: string) {
|
|
return `${LIBRARY_MATERIAL_REF_PREFIX}${id}`
|
|
}
|
|
|
|
export function getLibraryMaterialIdFromRef(materialRef?: string | null) {
|
|
if (!materialRef) return null
|
|
if (!materialRef.startsWith(LIBRARY_MATERIAL_REF_PREFIX)) return null
|
|
return materialRef.slice(LIBRARY_MATERIAL_REF_PREFIX.length)
|
|
}
|
|
|
|
export function getMaterialPresetByRef(materialRef?: string | null): MaterialPresetPayload | null {
|
|
const materialId = getLibraryMaterialIdFromRef(materialRef)
|
|
if (!materialId) return null
|
|
return getCatalogMaterialById(materialId)?.preset ?? null
|
|
}
|