Skip to content
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ import {
metersToLinearUnit,
squareMetersToAreaUnit,
} from './../../../../../lib/measurements'
import { createLocalGuideImage } from './../../../../../lib/local-guide-image'
import { createLocalGuideImage, createLocalScan } from './../../../../../lib/local-guide-image'
import { editorHostTreeChildrenRegistry } from './../../../../../lib/host-tree-children'
import { cn } from './../../../../../lib/utils'
import useEditor from './../../../../../store/use-editor'
Expand Down Expand Up @@ -566,14 +566,30 @@ const LevelReferences = memo(function LevelReferences({
return
}

if (!onUploadAsset) {
useUploadStore.getState().startUpload(levelId, 'scan', file.name)
useUploadStore.getState().setStatus(levelId, 'uploading')

try {
const { scan, url } = await createLocalScan({ createNode, file, levelId })
setSelectedReferenceId(scan.id)
setSelection({ selectedIds: [], zoneId: null })
useUploadStore.getState().setResult(levelId, url)
window.setTimeout(() => useUploadStore.getState().clearUpload(levelId), 600)

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Uploaded scan can stay hidden

Low Severity

The new local scan success path selects the created ScanNode but never calls setShowScans(true). The guide-image path in the same handler does call setShowGuides(true). If showScans is off (a persisted per-project preference), the scan appears in the tree while ScanRenderer keeps the mesh unmounted, so the upload can look like it failed.

Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit 0a6549d. Configure here.

} catch {
useUploadStore.getState().setError(levelId, 'Could not add that scan.')
}
return
}

if (!projectId) {
useUploadStore.getState().startUpload(levelId, 'scan', file.name)
useUploadStore.getState().setError(levelId, 'No active project. Please open a project first.')
return
}

clearUpload(levelId)
onUploadAsset?.(projectId, levelId, file, type)
onUploadAsset(projectId, levelId, file, type)
}

const handleDelete = async (nodeId: string, e: React.MouseEvent) => {
Expand Down
24 changes: 24 additions & 0 deletions packages/editor/src/lib/local-guide-image.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { expect, mock, test } from 'bun:test'
import * as core from '@pascal-app/core'

const saveAsset = mock(async () => 'asset://stored-scan')

mock.module('@pascal-app/core', () => ({ ...core, saveAsset }))

const { createLocalScan } = await import('./local-guide-image')

test('createLocalScan stores and attaches a scan asset to its level', async () => {
const createNode = mock()
const file = new File(['scan data'], 'living-room.glb', { type: 'model/gltf-binary' })

const { scan, url } = await createLocalScan({ createNode, file, levelId: 'level_ground' })

expect(saveAsset).toHaveBeenCalledWith(file)
expect(scan).toMatchObject({
name: 'living-room',
type: 'scan',
url: 'asset://stored-scan',
})
expect(url).toBe('asset://stored-scan')
expect(createNode).toHaveBeenCalledWith(scan, 'level_ground')
})
35 changes: 34 additions & 1 deletion packages/editor/src/lib/local-guide-image.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,23 @@ import {
type AnyNodeId,
GuideNode,
type GuideNode as GuideNodeType,
ScanNode,
type ScanNode as ScanNodeType,
saveAsset,
} from '@pascal-app/core'

export function getGuideImageName(filename: string) {
return getAssetName(filename, 'Guide image')
}

export function getScanName(filename: string) {
return getAssetName(filename, 'Scan')
}

function getAssetName(filename: string, fallback: string) {
const trimmed = filename.trim()
if (!trimmed) {
return 'Guide image'
return fallback
}

const dotIndex = trimmed.lastIndexOf('.')
Expand Down Expand Up @@ -40,3 +50,26 @@ export async function createLocalGuideImage({
createNode(guide, levelId as AnyNodeId)
return guide
}

export async function createLocalScan({
createNode,
file,
levelId,
}: {
createNode: (node: ScanNodeType, parentId: AnyNodeId) => void
file: File
levelId: string
}) {
const assetUrl = await saveAsset(file)
const scan = ScanNode.parse({
name: getScanName(file.name),
url: assetUrl,
position: [0, 0, 0],
rotation: [0, 0, 0],
scale: 1,
opacity: 100,
})

createNode(scan, levelId as AnyNodeId)
return { scan, url: assetUrl }
}