Skip to content

improve logic of 3d scene size #7619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jtydhr88 merged 2 commits into from
Dec 19, 2025
+12 −11
Merged

improve logic of 3d scene size #7619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
846c511
improve logic of 3d scene size
jtydhr88 Dec 18, 2025
4bcc2c8
test fix
jtydhr88 Dec 18, 2025
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
17 changes: 9 additions & 8 deletions src/composables/useLoad3dViewer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,17 +187,18 @@ export const useLoad3dViewer = (node?: LGraphNode) => {
const width = node.widgets?.find((w) => w.name === 'width')
const height = node.widgets?.find((w) => w.name === 'height')

const hasTargetDimensions = !!(width && height)

load3d = new Load3d(containerRef, {
width: width ? (toRaw(width).value as number) : undefined,
height: height ? (toRaw(height).value as number) : undefined,
getDimensions:
width && height
? () => ({
width: width.value as number,
height: height.value as number
})
: undefined,
isViewerMode: true
getDimensions: hasTargetDimensions
? () => ({
width: width.value as number,
height: height.value as number
Comment on lines +197 to +198
Copy link
Contributor

@DrJKL DrJKL Dec 18, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Question: Why do we need so many type assertions around these?

Copy link
Collaborator Author

@jtydhr88 jtydhr88 Dec 18, 2025

Choose a reason for hiding this comment

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

width and height need number type, but width.value could be others

Copy link
Contributor

@DrJKL DrJKL Dec 18, 2025

Choose a reason for hiding this comment

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

Can we constrain the type upstream?

})
: undefined,
isViewerMode: hasTargetDimensions
})

await useLoad3dService().copyLoad3dState(source, load3d)
Expand Down
4 changes: 2 additions & 2 deletions src/extensions/core/load3d/Load3d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ class Load3d {
STATUS_MOUSE_ON_VIEWER: boolean
INITIAL_RENDER_DONE: boolean = false

targetWidth: number = 512
targetHeight: number = 512
targetWidth: number = 0
targetHeight: number = 0
targetAspectRatio: number = 1
isViewerMode: boolean = false

Expand Down
2 changes: 1 addition & 1 deletion tests-ui/tests/composables/useLoad3dViewer.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ describe('useLoad3dViewer', () => {
width: undefined,
height: undefined,
getDimensions: undefined,
isViewerMode: true
isViewerMode: false
})

expect(mockLoad3dService.copyLoad3dState).toHaveBeenCalledWith(
Expand Down
Loading