refactor: 完善材质系统相关代码

- 修复 node-actions.ts 中 forEach 返回值 lint 警告
- 更新材质 schema 定义和渲染器
- wall-cutout.tsx 材质颜色保留修复
This commit is contained in:
Developer
2026-03-30 20:29:29 +08:00
parent d0cdeb2ac4
commit 0be6d84c98
12 changed files with 129 additions and 33 deletions
+80 -10
View File
@@ -38,16 +38,86 @@ export const MaterialSchema = z.object({
export type MaterialSchema = z.infer<typeof MaterialSchema>
export const DEFAULT_MATERIALS: Record<MaterialPreset, MaterialProperties> = {
white: { color: '#ffffff', roughness: 0.9, metalness: 0, opacity: 1, transparent: false, side: 'front' },
brick: { color: '#8b4513', roughness: 0.85, metalness: 0, opacity: 1, transparent: false, side: 'front' },
concrete: { color: '#808080', roughness: 0.8, metalness: 0, opacity: 1, transparent: false, side: 'front' },
wood: { color: '#deb887', roughness: 0.7, metalness: 0, opacity: 1, transparent: false, side: 'front' },
glass: { color: '#87ceeb', roughness: 0.1, metalness: 0.1, opacity: 0.3, transparent: true, side: 'double' },
metal: { color: '#c0c0c0', roughness: 0.3, metalness: 0.9, opacity: 1, transparent: false, side: 'front' },
plaster: { color: '#f5f5dc', roughness: 0.95, metalness: 0, opacity: 1, transparent: false, side: 'front' },
tile: { color: '#d3d3d3', roughness: 0.4, metalness: 0.1, opacity: 1, transparent: false, side: 'front' },
marble: { color: '#fafafa', roughness: 0.2, metalness: 0.1, opacity: 1, transparent: false, side: 'front' },
custom: { color: '#ffffff', roughness: 0.5, metalness: 0, opacity: 1, transparent: false, side: 'front' },
white: {
color: '#ffffff',
roughness: 0.9,
metalness: 0,
opacity: 1,
transparent: false,
side: 'front',
},
brick: {
color: '#8b4513',
roughness: 0.85,
metalness: 0,
opacity: 1,
transparent: false,
side: 'front',
},
concrete: {
color: '#808080',
roughness: 0.8,
metalness: 0,
opacity: 1,
transparent: false,
side: 'front',
},
wood: {
color: '#deb887',
roughness: 0.7,
metalness: 0,
opacity: 1,
transparent: false,
side: 'front',
},
glass: {
color: '#87ceeb',
roughness: 0.1,
metalness: 0.1,
opacity: 0.3,
transparent: true,
side: 'double',
},
metal: {
color: '#c0c0c0',
roughness: 0.3,
metalness: 0.9,
opacity: 1,
transparent: false,
side: 'front',
},
plaster: {
color: '#f5f5dc',
roughness: 0.95,
metalness: 0,
opacity: 1,
transparent: false,
side: 'front',
},
tile: {
color: '#d3d3d3',
roughness: 0.4,
metalness: 0.1,
opacity: 1,
transparent: false,
side: 'front',
},
marble: {
color: '#fafafa',
roughness: 0.2,
metalness: 0.1,
opacity: 1,
transparent: false,
side: 'front',
},
custom: {
color: '#ffffff',
roughness: 0.5,
metalness: 0,
opacity: 1,
transparent: false,
side: 'front',
},
}
export function resolveMaterial(material?: MaterialSchema): MaterialProperties {
@@ -104,11 +104,17 @@ export const updateNodesAction = (
})
// Collect all IDs that need to be marked dirty
updates.forEach((u) => idsToMarkDirty.add(u.id))
parentsToUpdate.forEach((pId) => idsToMarkDirty.add(pId))
for (const u of updates) {
idsToMarkDirty.add(u.id)
}
for (const pId of parentsToUpdate) {
idsToMarkDirty.add(pId)
}
// Add to pending updates set
idsToMarkDirty.forEach((id) => pendingUpdates.add(id))
for (const id of idsToMarkDirty) {
pendingUpdates.add(id)
}
// Cancel any pending RAF and schedule a new one
if (pendingRafId !== null) {
+1 -3
View File
@@ -52,9 +52,7 @@ export function cloneSceneGraph(sceneGraph: SceneGraph): SceneGraph {
// Remap children array (walls, levels, buildings, sites, items can have children)
if ('children' in clonedNode && Array.isArray(clonedNode.children)) {
;(clonedNode as Record<string, unknown>).children = (
clonedNode.children as string[]
)
;(clonedNode as Record<string, unknown>).children = (clonedNode.children as string[])
.map((childId) => idMap.get(childId))
.filter((id): id is string => id !== undefined)
}