mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-05-23 22:25:05 +00:00
Follow-up to the previous FE-729 commit. After deleting
isAssetAPIEnabled, isAssetPreviewSupported() became a wrapper that
always returned true. Remove the function and simplify all callers.
Changes:
- Delete isAssetPreviewSupported() from assetPreviewUtil.ts.
- Media3DTop.vue: drop the isAssetPreviewSupported() arm of the
loadThumbnail guard (asset.name check is still required).
- saveMesh.ts: unwrap two `if (isAssetPreviewSupported()) { ... }`
blocks in applySaveGLBOutput and the SaveGLB beforeRegisterNodeDef
extension callback.
- FormDropdownMenuItem.vue: drop the early return from
resolveMeshPreview.
- useLoad3d.ts: drop the isAssetPreviewSupported() arm of the
modelReady guard.
- Tests: remove the dead "asset preview is unsupported" branches
(useLoad3d, Media3DTop, FormDropdownMenuItem) and clean up the
associated mocks and hoisted state.
Auto-fixed unrelated tailwind class-order lint errors in five files
(VirtualGrid, RightSidePanel, Textarea, ModelInfoPanel,
WidgetSelectDefault) to keep CI green.
205 lines
6.0 KiB
TypeScript
205 lines
6.0 KiB
TypeScript
import { nextTick } from 'vue'
|
|
|
|
import Load3D from '@/components/load3d/Load3D.vue'
|
|
import { useLoad3d } from '@/composables/useLoad3d'
|
|
import { createExportMenuItems } from '@/extensions/core/load3d/exportMenuHelper'
|
|
import Load3DConfiguration from '@/extensions/core/load3d/Load3DConfiguration'
|
|
import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
|
|
import type { IContextMenuValue } from '@/lib/litegraph/src/interfaces'
|
|
import type {
|
|
NodeExecutionOutput,
|
|
NodeOutputWith,
|
|
ResultItem
|
|
} from '@/schemas/apiSchema'
|
|
import type { ComfyNodeDef } from '@/schemas/nodeDefSchema'
|
|
|
|
type SaveMeshOutput = NodeOutputWith<{
|
|
'3d'?: ResultItem[]
|
|
}>
|
|
import type { CustomInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2'
|
|
import { persistThumbnail } from '@/platform/assets/utils/assetPreviewUtil'
|
|
import { app } from '@/scripts/app'
|
|
import { ComponentWidgetImpl, addWidget } from '@/scripts/domWidget'
|
|
import { useExtensionService } from '@/services/extensionService'
|
|
import { useLoad3dService } from '@/services/load3dService'
|
|
import type { NodeLocatorId } from '@/types/nodeIdentification'
|
|
import { getNodeByLocatorId } from '@/utils/graphTraversalUtil'
|
|
|
|
const inputSpec: CustomInputSpec = {
|
|
name: 'image',
|
|
type: 'Preview3D',
|
|
isPreview: true
|
|
}
|
|
|
|
function applySaveGLBOutput(node: LGraphNode, fileInfo: ResultItem): void {
|
|
const filePath = (fileInfo.subfolder ?? '') + '/' + (fileInfo.filename ?? '')
|
|
const loadFolder = fileInfo.type as 'input' | 'output'
|
|
|
|
const modelWidget = node.widgets?.find((w) => w.name === 'image')
|
|
if (!modelWidget) return
|
|
|
|
if (
|
|
modelWidget.value === filePath &&
|
|
node.properties['Last Time Model File'] === filePath &&
|
|
node.properties['Last Time Model Folder'] === loadFolder
|
|
) {
|
|
return
|
|
}
|
|
|
|
modelWidget.value = filePath
|
|
node.properties['Last Time Model File'] = filePath
|
|
node.properties['Last Time Model Folder'] = loadFolder
|
|
|
|
useLoad3d(node).waitForLoad3d((load3d) => {
|
|
if (!load3d) return
|
|
const config = new Load3DConfiguration(load3d, node.properties)
|
|
config.configureForSaveMesh(loadFolder, filePath, {
|
|
silentOnNotFound: true
|
|
})
|
|
|
|
const filename = fileInfo.filename ?? ''
|
|
void load3d
|
|
.whenLoadIdle()
|
|
.then(() => load3d.captureThumbnail(256, 256))
|
|
.then((dataUrl) => fetch(dataUrl).then((r) => r.blob()))
|
|
.then((blob) => persistThumbnail(filename, blob))
|
|
.catch(() => {})
|
|
})
|
|
}
|
|
|
|
useExtensionService().registerExtension({
|
|
name: 'Comfy.SaveGLB',
|
|
|
|
async beforeRegisterNodeDef(
|
|
_nodeType: typeof LGraphNode,
|
|
nodeData: ComfyNodeDef
|
|
) {
|
|
if ('SaveGLB' === nodeData.name) {
|
|
// @ts-expect-error InputSpec is not typed correctly
|
|
nodeData.input.required.image = ['PREVIEW_3D']
|
|
}
|
|
},
|
|
|
|
onNodeOutputsUpdated(
|
|
nodeOutputs: Record<NodeLocatorId, NodeExecutionOutput>
|
|
) {
|
|
for (const [locatorId, output] of Object.entries(nodeOutputs)) {
|
|
const fileInfo = (output as SaveMeshOutput)['3d']?.[0]
|
|
if (!fileInfo) continue
|
|
|
|
const node = getNodeByLocatorId(app.rootGraph, locatorId)
|
|
if (!node || node.constructor.comfyClass !== 'SaveGLB') continue
|
|
|
|
applySaveGLBOutput(node, fileInfo)
|
|
}
|
|
},
|
|
|
|
getCustomWidgets() {
|
|
return {
|
|
PREVIEW_3D(node) {
|
|
const widget = new ComponentWidgetImpl({
|
|
node,
|
|
name: inputSpec.name,
|
|
component: Load3D,
|
|
inputSpec,
|
|
options: {}
|
|
})
|
|
|
|
widget.type = 'load3D'
|
|
|
|
addWidget(node, widget)
|
|
|
|
return { widget }
|
|
}
|
|
}
|
|
},
|
|
|
|
getNodeMenuItems(node: LGraphNode): (IContextMenuValue | null)[] {
|
|
// Only show menu items for SaveGLB nodes
|
|
if (node.constructor.comfyClass !== 'SaveGLB') return []
|
|
|
|
const load3d = useLoad3dService().getLoad3d(node)
|
|
if (!load3d) return []
|
|
|
|
if (load3d.isSplatModel()) return []
|
|
|
|
return createExportMenuItems(load3d)
|
|
},
|
|
|
|
async nodeCreated(node: LGraphNode) {
|
|
if (node.constructor.comfyClass !== 'SaveGLB') return
|
|
|
|
const [oldWidth, oldHeight] = node.size
|
|
|
|
node.setSize([Math.max(oldWidth, 400), Math.max(oldHeight, 550)])
|
|
|
|
await nextTick()
|
|
|
|
useLoad3d(node).onLoad3dReady((load3d) => {
|
|
if (!load3d) return
|
|
|
|
const modelWidget = node.widgets?.find((w) => w.name === 'image')
|
|
if (!modelWidget) return
|
|
|
|
const lastTimeModelFile = node.properties['Last Time Model File'] as
|
|
| string
|
|
| undefined
|
|
const lastTimeModelFolder =
|
|
(node.properties['Last Time Model Folder'] as
|
|
| 'input'
|
|
| 'output'
|
|
| undefined) ?? 'output'
|
|
|
|
if (!lastTimeModelFile) return
|
|
|
|
modelWidget.value = lastTimeModelFile
|
|
|
|
const config = new Load3DConfiguration(load3d, node.properties)
|
|
config.configureForSaveMesh(lastTimeModelFolder, lastTimeModelFile, {
|
|
silentOnNotFound: true
|
|
})
|
|
})
|
|
|
|
const onExecuted = node.onExecuted
|
|
|
|
node.onExecuted = function (output: SaveMeshOutput) {
|
|
onExecuted?.call(this, output)
|
|
|
|
const fileInfo = output['3d']?.[0]
|
|
|
|
if (!fileInfo) return
|
|
|
|
useLoad3d(node).waitForLoad3d((load3d) => {
|
|
const modelWidget = node.widgets?.find((w) => w.name === 'image')
|
|
|
|
if (load3d && modelWidget) {
|
|
const filePath =
|
|
(fileInfo.subfolder ?? '') + '/' + (fileInfo.filename ?? '')
|
|
|
|
modelWidget.value = filePath
|
|
|
|
const config = new Load3DConfiguration(load3d, node.properties)
|
|
|
|
const loadFolder = fileInfo.type as 'input' | 'output'
|
|
|
|
node.properties['Last Time Model File'] = filePath
|
|
node.properties['Last Time Model Folder'] = loadFolder
|
|
|
|
config.configureForSaveMesh(loadFolder, filePath, {
|
|
silentOnNotFound: true
|
|
})
|
|
|
|
const filename = fileInfo.filename ?? ''
|
|
|
|
void load3d
|
|
.whenLoadIdle()
|
|
.then(() => load3d.captureThumbnail(256, 256))
|
|
.then((dataUrl) => fetch(dataUrl).then((r) => r.blob()))
|
|
.then((blob) => persistThumbnail(filename, blob))
|
|
.catch(() => {})
|
|
}
|
|
})
|
|
}
|
|
}
|
|
})
|