mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-05-04 21:22:07 +00:00
* refactor: move settingStore to platform/settings Move src/stores/settingStore.ts to src/platform/settings/settingStore.ts to separate platform infrastructure from domain logic following DDD principles. Updates all import references across ~70 files to maintain compatibility. * fix: update remaining settingStore imports after rebase * fix: complete remaining settingStore import updates * fix: update vi.mock paths for settingStore in tests Update all test files to mock the new settingStore location at @/platform/settings/settingStore instead of @/stores/settingStore * fix: resolve remaining settingStore imports and unused imports after rebase * fix: update settingStore mock path in SelectionToolbox test Fix vi.mock path from @/stores/settingStore to @/platform/settings/settingStore to resolve failing Load3D viewer button test. * refactor: complete comprehensive settings migration to platform layer This commit completes the migration of all settings-related code to the platform layer as part of the Domain-Driven Design (DDD) architecture refactoring. - constants/coreSettings.ts → platform/settings/constants/coreSettings.ts - types/settingTypes.ts → platform/settings/types.ts - stores/settingStore.ts → platform/settings/settingStore.ts (already moved) - composables/setting/useSettingUI.ts → platform/settings/composables/useSettingUI.ts - composables/setting/useSettingSearch.ts → platform/settings/composables/useSettingSearch.ts - composables/useLitegraphSettings.ts → platform/settings/composables/useLitegraphSettings.ts - components/dialog/content/SettingDialogContent.vue → platform/settings/components/SettingDialogContent.vue - components/dialog/content/setting/SettingItem.vue → platform/settings/components/SettingItem.vue - components/dialog/content/setting/SettingGroup.vue → platform/settings/components/SettingGroup.vue - components/dialog/content/setting/SettingsPanel.vue → platform/settings/components/SettingsPanel.vue - components/dialog/content/setting/ColorPaletteMessage.vue → platform/settings/components/ColorPaletteMessage.vue - components/dialog/content/setting/ExtensionPanel.vue → platform/settings/components/ExtensionPanel.vue - components/dialog/content/setting/ServerConfigPanel.vue → platform/settings/components/ServerConfigPanel.vue - ~100+ import statements updated across the codebase - Test file imports corrected - Component imports fixed in dialog service and command menubar - Composable imports updated in GraphCanvas.vue ``` src/platform/settings/ ├── components/ # All settings UI components ├── composables/ # Settings-related composables ├── constants/ # Core settings definitions ├── types.ts # Settings type definitions └── settingStore.ts # Central settings state management ``` ✅ TypeScript compilation successful ✅ All tests passing (settings store, search functionality, UI components) ✅ Production build successful ✅ Domain boundaries properly established This migration consolidates all settings functionality into a cohesive platform domain, improving maintainability and following DDD principles for better code organization. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * fix: format and lint after rebase conflict resolution * fix: update remaining import paths to platform settings - Fix browser test import: extensionAPI.spec.ts - Fix script import: collect-i18n-general.ts - Complete settings migration import path updates 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> --------- Co-authored-by: Claude <noreply@anthropic.com>
190 lines
4.9 KiB
TypeScript
190 lines
4.9 KiB
TypeScript
import Load3d from '@/extensions/core/load3d/Load3d'
|
|
import Load3dUtils from '@/extensions/core/load3d/Load3dUtils'
|
|
import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
|
|
import { useSettingStore } from '@/platform/settings/settingStore'
|
|
import { api } from '@/scripts/api'
|
|
|
|
class Load3DConfiguration {
|
|
constructor(private load3d: Load3d) {}
|
|
|
|
configureForSaveMesh(loadFolder: 'input' | 'output', filePath: string) {
|
|
this.setupModelHandlingForSaveMesh(filePath, loadFolder)
|
|
this.setupDefaultProperties()
|
|
}
|
|
|
|
configure(
|
|
loadFolder: 'input' | 'output',
|
|
modelWidget: IBaseWidget,
|
|
cameraState?: any,
|
|
width: IBaseWidget | null = null,
|
|
height: IBaseWidget | null = null
|
|
) {
|
|
this.setupModelHandling(modelWidget, loadFolder, cameraState)
|
|
this.setupTargetSize(width, height)
|
|
this.setupDefaultProperties()
|
|
}
|
|
|
|
private setupTargetSize(
|
|
width: IBaseWidget | null,
|
|
height: IBaseWidget | null
|
|
) {
|
|
if (width && height) {
|
|
this.load3d.setTargetSize(width.value as number, height.value as number)
|
|
|
|
width.callback = (value: number) => {
|
|
this.load3d.setTargetSize(value, height.value as number)
|
|
}
|
|
|
|
height.callback = (value: number) => {
|
|
this.load3d.setTargetSize(width.value as number, value)
|
|
}
|
|
}
|
|
}
|
|
|
|
private setupModelHandlingForSaveMesh(
|
|
filePath: string,
|
|
loadFolder: 'input' | 'output'
|
|
) {
|
|
const onModelWidgetUpdate = this.createModelUpdateHandler(loadFolder)
|
|
|
|
if (filePath) {
|
|
onModelWidgetUpdate(filePath)
|
|
}
|
|
}
|
|
|
|
private setupModelHandling(
|
|
modelWidget: IBaseWidget,
|
|
loadFolder: 'input' | 'output',
|
|
cameraState?: any
|
|
) {
|
|
const onModelWidgetUpdate = this.createModelUpdateHandler(
|
|
loadFolder,
|
|
cameraState
|
|
)
|
|
if (modelWidget.value) {
|
|
onModelWidgetUpdate(modelWidget.value)
|
|
}
|
|
|
|
modelWidget.callback = (value: string | number | boolean | object) => {
|
|
this.load3d.node.properties['Texture'] = undefined
|
|
|
|
onModelWidgetUpdate(value)
|
|
}
|
|
}
|
|
|
|
private setupDefaultProperties() {
|
|
const cameraType = this.load3d.loadNodeProperty(
|
|
'Camera Type',
|
|
useSettingStore().get('Comfy.Load3D.CameraType')
|
|
)
|
|
this.load3d.toggleCamera(cameraType)
|
|
|
|
const showGrid = this.load3d.loadNodeProperty(
|
|
'Show Grid',
|
|
useSettingStore().get('Comfy.Load3D.ShowGrid')
|
|
)
|
|
|
|
this.load3d.toggleGrid(showGrid)
|
|
|
|
const showPreview = this.load3d.loadNodeProperty(
|
|
'Show Preview',
|
|
useSettingStore().get('Comfy.Load3D.ShowPreview')
|
|
)
|
|
|
|
this.load3d.togglePreview(showPreview)
|
|
|
|
const bgColor = this.load3d.loadNodeProperty(
|
|
'Background Color',
|
|
'#' + useSettingStore().get('Comfy.Load3D.BackgroundColor')
|
|
)
|
|
|
|
this.load3d.setBackgroundColor(bgColor)
|
|
|
|
const lightIntensity: number = Number(
|
|
this.load3d.loadNodeProperty(
|
|
'Light Intensity',
|
|
useSettingStore().get('Comfy.Load3D.LightIntensity')
|
|
)
|
|
)
|
|
|
|
this.load3d.setLightIntensity(lightIntensity)
|
|
|
|
const fov: number = Number(this.load3d.loadNodeProperty('FOV', 35))
|
|
|
|
this.load3d.setFOV(fov)
|
|
|
|
const backgroundImage = this.load3d.loadNodeProperty('Background Image', '')
|
|
|
|
this.load3d.setBackgroundImage(backgroundImage)
|
|
}
|
|
|
|
private createModelUpdateHandler(
|
|
loadFolder: 'input' | 'output',
|
|
cameraState?: any
|
|
) {
|
|
let isFirstLoad = true
|
|
return async (value: string | number | boolean | object) => {
|
|
if (!value) return
|
|
|
|
const filename = value as string
|
|
|
|
this.setResourceFolder(filename)
|
|
|
|
const modelUrl = api.apiURL(
|
|
Load3dUtils.getResourceURL(
|
|
...Load3dUtils.splitFilePath(filename),
|
|
loadFolder
|
|
)
|
|
)
|
|
|
|
await this.load3d.loadModel(modelUrl, filename)
|
|
|
|
const upDirection = this.load3d.loadNodeProperty(
|
|
'Up Direction',
|
|
'original'
|
|
)
|
|
|
|
this.load3d.setUpDirection(upDirection)
|
|
|
|
const materialMode = this.load3d.loadNodeProperty(
|
|
'Material Mode',
|
|
'original'
|
|
)
|
|
|
|
this.load3d.setMaterialMode(materialMode)
|
|
|
|
const edgeThreshold: number = Number(
|
|
this.load3d.loadNodeProperty('Edge Threshold', 85)
|
|
)
|
|
|
|
this.load3d.setEdgeThreshold(edgeThreshold)
|
|
|
|
if (isFirstLoad && cameraState && typeof cameraState === 'object') {
|
|
try {
|
|
this.load3d.setCameraState(cameraState)
|
|
} catch (error) {
|
|
console.warn('Failed to restore camera state:', error)
|
|
}
|
|
isFirstLoad = false
|
|
}
|
|
}
|
|
}
|
|
|
|
private setResourceFolder(filename: string): void {
|
|
const pathParts = filename.split('/').filter((part) => part.trim())
|
|
|
|
if (pathParts.length <= 2) {
|
|
return
|
|
}
|
|
|
|
const subfolderParts = pathParts.slice(1, -1)
|
|
const subfolder = subfolderParts.join('/')
|
|
|
|
if (subfolder) {
|
|
this.load3d.node.properties['Resource Folder'] = subfolder
|
|
}
|
|
}
|
|
}
|
|
|
|
export default Load3DConfiguration
|