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
34 changes: 34 additions & 0 deletions src/composables/useLoad3dViewer.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,23 @@ describe('useLoad3dViewer', () => {
.intensity
).toBe(1)
})

it('should preserve unknown fields on Model Config when restoring', async () => {
const viewer = useLoad3dViewer(mockNode)
const containerRef = document.createElement('div')

await viewer.initializeViewer(containerRef, mockSourceLoad3d as Load3d)
;(
mockNode.properties!['Model Config'] as Record<string, unknown>
).futureField = 'preserve-me'

viewer.restoreInitialState()

expect(
(mockNode.properties!['Model Config'] as Record<string, unknown>)
.futureField
).toBe('preserve-me')
})
})

describe('applyChanges', () => {
Expand Down Expand Up @@ -457,6 +474,23 @@ describe('useLoad3dViewer', () => {

expect(result).toBe(false)
})

it('should preserve unknown fields on Model Config when applying', async () => {
const viewer = useLoad3dViewer(mockNode)
const containerRef = document.createElement('div')

await viewer.initializeViewer(containerRef, mockSourceLoad3d as Load3d)
;(
mockNode.properties!['Model Config'] as Record<string, unknown>
).futureField = 'preserve-me'

await viewer.applyChanges()

expect(
(mockNode.properties!['Model Config'] as Record<string, unknown>)
.futureField
).toBe('preserve-me')
})
})

describe('refreshViewport', () => {
Expand Down
9 changes: 8 additions & 1 deletion src/composables/useLoad3dViewer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,11 @@ export const useLoad3dViewer = (node?: LGraphNode) => {
intensity: initialState.value.lightIntensity
}

const existingModelConfig = nodeValue.properties['Model Config'] as
| ModelConfig
| undefined
nodeValue.properties['Model Config'] = {
...existingModelConfig,
upDirection: initialState.value.upDirection,
materialMode: initialState.value.materialMode,
gizmo: {
Expand Down Expand Up @@ -671,10 +675,13 @@ export const useLoad3dViewer = (node?: LGraphNode) => {
}

const gizmoTransform = load3d.getGizmoTransform()
const existingModelConfig = nodeValue.properties['Model Config'] as
| ModelConfig
| undefined
nodeValue.properties['Model Config'] = {
...existingModelConfig,
upDirection: upDirection.value,
materialMode: materialMode.value,
showSkeleton: false,
gizmo: {
enabled: gizmoEnabled.value,
mode: gizmoMode.value,
Expand Down
Loading