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 @@ -616,6 +616,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"
/>
<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
Loading