Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/composables/useLoad3dViewer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -630,6 +630,10 @@ export const useLoad3dViewer = (node?: LGraphNode) => {
handleBackgroundImageUpdate,
handleModelDrop,
handleSeek,
cleanup
cleanup,

hasSkeleton: false,
intensity: lightIntensity,
showSkeleton: false
}
}
32 changes: 22 additions & 10 deletions src/renderer/extensions/linearMode/Preview3d.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<script setup lang="ts">
import { useTemplateRef, watch } from 'vue'
import { ref, useTemplateRef, watch } from 'vue'

import Load3DControls from '@/components/load3d/Load3DControls.vue'
import AnimationControls from '@/components/load3d/controls/AnimationControls.vue'
import { useLoad3dViewer } from '@/composables/useLoad3dViewer'

Expand All @@ -10,12 +11,12 @@ const { modelUrl } = defineProps<{

const containerRef = useTemplateRef('containerRef')

const viewer = useLoad3dViewer()
const viewer = ref(useLoad3dViewer())

watch([containerRef, () => modelUrl], async () => {
if (!containerRef.value || !modelUrl) return

await viewer.initializeStandaloneViewer(containerRef.value, modelUrl)
await viewer.value.initializeStandaloneViewer(containerRef.value, modelUrl)
})

//TODO: refactor to add control buttons
Expand All @@ -29,14 +30,25 @@ watch([containerRef, () => modelUrl], async () => {
@resize="viewer.handleResize"
>
<div class="pointer-events-none absolute top-0 left-0 size-full">
<Load3DControls
v-model:scene-config="viewer"
v-model:model-config="viewer"
v-model:camera-config="viewer"
v-model:light-config="viewer"
:is-splat-model="viewer.isSplatModel"
:is-ply-model="viewer.isPlyModel"
:has-skeleton="viewer.hasSkeleton"
@update-background-image="viewer.handleBackgroundImageUpdate"
@export-model="viewer.exportModel"
/>
Comment on lines +33 to +43
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

🧩 Analysis chain

🏁 Script executed:

find src -name "Load3DControls.vue" -o -name "*load3d*" -o -name "*Load3d*" | head -20

Repository: Comfy-Org/ComfyUI_frontend

Length of output: 553


🏁 Script executed:

find src -name "*load3d*" -o -name "*Load3d*" -type f | grep -E "\.(vue|ts)$"

Repository: Comfy-Org/ComfyUI_frontend

Length of output: 463


🏁 Script executed:

rg -l "useLoad3dViewer" src --type vue --type ts

Repository: Comfy-Org/ComfyUI_frontend

Length of output: 97


🏁 Script executed:

cat -n src/components/load3d/Load3DControls.vue

Repository: Comfy-Org/ComfyUI_frontend

Length of output: 7265


🏁 Script executed:

cat -n src/composables/useLoad3dViewer.ts

Repository: Comfy-Org/ComfyUI_frontend

Length of output: 21869


🏁 Script executed:

find src -name "Preview3d.vue" -type f

Repository: Comfy-Org/ComfyUI_frontend

Length of output: 118


🏁 Script executed:

cat -n src/renderer/extensions/linearMode/Preview3d.vue | head -60

Repository: Comfy-Org/ComfyUI_frontend

Length of output: 2325


Binding individual config properties instead of the full viewer object.

The v-model bindings pass the entire viewer composable to Load3DControls, but the component's emitted update:* events expect Config-shaped payloads. This would replace viewer.value with a config object, losing composable methods. Create computed getters/setters for each config or bind individual properties instead:

const sceneConfig = computed({
  get: () => ({ showGrid: viewer.value.showGrid, backgroundColor: viewer.value.backgroundColor, backgroundImage: viewer.value.backgroundImage, backgroundRenderMode: viewer.value.backgroundRenderMode }),
  set: (config) => Object.assign(viewer.value, config)
})

Then use v-model:scene-config="sceneConfig" (similarly for model, camera, light configs).

🤖 Prompt for AI Agents
In `@src/renderer/extensions/linearMode/Preview3d.vue` around lines 33 - 43, The
v-models on Load3DControls are currently passing the entire viewer composable
(viewer) which will be replaced by config-shaped payloads and lose methods;
create computed getters/setters for each config (e.g., sceneConfig, modelConfig,
cameraConfig, lightConfig) that read the relevant fields from viewer.value in
the getter and merge/assign back into viewer.value in the setter, then change
v-model:scene-config, v-model:model-config, v-model:camera-config and
v-model:light-config to use those computed refs (keep the existing event
handlers like viewer.handleBackgroundImageUpdate and viewer.exportModel
unchanged).

<AnimationControls
v-if="viewer.animations.value && viewer.animations.value.length > 0"
v-model:animations="viewer.animations.value"
v-model:playing="viewer.playing.value"
v-model:selected-speed="viewer.selectedSpeed.value"
v-model:selected-animation="viewer.selectedAnimation.value"
v-model:animation-progress="viewer.animationProgress.value"
v-model:animation-duration="viewer.animationDuration.value"
v-if="viewer.animations && viewer.animations.length > 0"
v-model:animations="viewer.animations"
v-model:playing="viewer.playing"
v-model:selected-speed="viewer.selectedSpeed"
v-model:selected-animation="viewer.selectedAnimation"
v-model:animation-progress="viewer.animationProgress"
v-model:animation-duration="viewer.animationDuration"
@seek="viewer.handleSeek"
/>
</div>
Expand Down