fix: harden viewer/editor renderer init and error handling (#133)

This commit is contained in:
Aymeric Rabot
2026-03-05 15:42:58 -05:00
committed by GitHub
parent 862798b5e7
commit fb2c7c6c71
7 changed files with 386 additions and 155 deletions
@@ -0,0 +1,42 @@
'use client'
import Link from 'next/link'
import { useEffect } from 'react'
export default function EditorRouteError({
error,
reset,
}: Readonly<{
error: Error & { digest?: string }
reset: () => void
}>) {
useEffect(() => {
console.error('[editor-route] Unhandled editor error:', error)
}, [error])
return (
<div className="flex min-h-screen w-full items-center justify-center bg-background p-4 text-foreground">
<div className="w-full max-w-md rounded-2xl border border-border/60 bg-background p-6 shadow-xl">
<h1 className="text-lg font-semibold">Editor error</h1>
<p className="mt-2 text-sm text-muted-foreground">
We couldn&apos;t load this editor route. You can retry or return home.
</p>
<div className="mt-4 flex items-center gap-2">
<button
className="rounded-md border border-border bg-accent px-3 py-2 text-sm font-medium hover:bg-accent/80"
onClick={reset}
type="button"
>
Try again
</button>
<Link
className="rounded-md border border-border bg-background px-3 py-2 text-sm font-medium hover:bg-accent/40"
href="/"
>
Back to home
</Link>
</div>
</div>
</div>
)
}
+42
View File
@@ -0,0 +1,42 @@
'use client'
import Link from 'next/link'
import { useEffect } from 'react'
export default function ViewerRouteError({
error,
reset,
}: Readonly<{
error: Error & { digest?: string }
reset: () => void
}>) {
useEffect(() => {
console.error('[viewer-route] Unhandled viewer error:', error)
}, [error])
return (
<div className="flex min-h-screen w-full items-center justify-center bg-background p-4 text-foreground">
<div className="w-full max-w-md rounded-2xl border border-border/60 bg-background p-6 shadow-xl">
<h1 className="text-lg font-semibold">Viewer error</h1>
<p className="mt-2 text-sm text-muted-foreground">
We couldn&apos;t load this project view. You can retry without leaving the app.
</p>
<div className="mt-4 flex items-center gap-2">
<button
className="rounded-md border border-border bg-accent px-3 py-2 text-sm font-medium hover:bg-accent/80"
onClick={reset}
type="button"
>
Try again
</button>
<Link
className="rounded-md border border-border bg-background px-3 py-2 text-sm font-medium hover:bg-accent/40"
href="/"
>
Back to home
</Link>
</div>
</div>
</div>
)
}
+70 -10
View File
@@ -2,8 +2,11 @@
import { initSpatialGridSync, useScene } from '@pascal-app/core' import { initSpatialGridSync, useScene } from '@pascal-app/core'
import { useViewer, Viewer } from '@pascal-app/viewer' import { useViewer, Viewer } from '@pascal-app/viewer'
import Link from 'next/link'
import { useParams } from 'next/navigation' import { useParams } from 'next/navigation'
import { useEffect, useState } from 'react' import { useEffect, useState } from 'react'
import { ErrorBoundary } from '@/components/ui/primitives/error-boundary'
import { SceneLoader } from '@/components/ui/scene-loader'
import { import {
getProjectModelPublic, getProjectModelPublic,
incrementProjectViews, incrementProjectViews,
@@ -14,7 +17,34 @@ import { ViewerGuestCTA } from './viewer-guest-cta'
import { ViewerOverlay } from './viewer-overlay' import { ViewerOverlay } from './viewer-overlay'
import { ViewerZoneSystem } from './viewer-zone-system' import { ViewerZoneSystem } from './viewer-zone-system'
import { SceneLoader } from '@/components/ui/scene-loader' function ViewerSceneCrashFallback({ projectName }: { projectName?: string | null }) {
return (
<div className="absolute inset-0 z-30 flex items-center justify-center bg-background/95 p-4 text-foreground">
<div className="w-full max-w-md rounded-2xl border border-border/60 bg-background p-6 shadow-xl">
<h2 className="text-lg font-semibold">The 3D scene failed to render</h2>
<p className="mt-2 text-sm text-muted-foreground">
{projectName ? `"${projectName}" ` : ''}
hit a rendering error. The rest of the app is still available.
</p>
<div className="mt-4 flex items-center gap-2">
<button
className="rounded-md border border-border bg-accent px-3 py-2 text-sm font-medium hover:bg-accent/80"
onClick={() => window.location.reload()}
type="button"
>
Reload scene
</button>
<Link
className="rounded-md border border-border bg-background px-3 py-2 text-sm font-medium hover:bg-accent/40"
href="/"
>
Back to home
</Link>
</div>
</div>
</div>
)
}
export default function ViewerPage() { export default function ViewerPage() {
const params = useParams() const params = useParams()
@@ -33,27 +63,46 @@ export default function ViewerPage() {
}, [projectId]) }, [projectId])
useEffect(() => { useEffect(() => {
let cancelled = false
setLoading(true)
setError(null)
setProjectId(null)
setProjectName(null)
setOwner(null)
setCanShowScans(true)
setCanShowGuides(true)
useViewer.getState().setShowScans(true)
useViewer.getState().setShowGuides(true)
const loadContent = async () => { const loadContent = async () => {
try { try {
// Check if it's a demo file (starts with 'demo_') // Check if it's a demo file (starts with 'demo_')
if (id.startsWith('demo_')) { if (id.startsWith('demo_')) {
const response = await fetch(`/demos/${id}.json`) const response = await fetch(`/demos/${id}.json`)
if (cancelled) return
if (!response.ok) { if (!response.ok) {
throw new Error(`Demo "${id}" not found`) throw new Error(`Demo "${id}" not found`)
} }
const data = await response.json() const data = await response.json()
if (cancelled) return
if (data.nodes && data.rootNodeIds) { if (data.nodes && data.rootNodeIds) {
setScene(data.nodes, data.rootNodeIds) setScene(data.nodes, data.rootNodeIds)
initSpatialGridSync() initSpatialGridSync()
} }
setProjectName('Demo') setProjectName('Demo')
} else { } else {
// Load from database (public project) // Load from database (public project)
const result = await getProjectModelPublic(id) const result = await getProjectModelPublic(id)
if (cancelled) return
if (result.success && result.data) { if (result.success && result.data) {
const { project, model, isOwner } = result.data const { project, model, isOwner } = result.data
const projectData = project as any const projectData = project as any
setProjectId(project.id) setProjectId(project.id)
setProjectName(project.name) setProjectName(project.name)
setOwner(projectData.owner ?? null) setOwner(projectData.owner ?? null)
@@ -81,19 +130,28 @@ export default function ViewerPage() {
// Increment view count // Increment view count
await incrementProjectViews(id) await incrementProjectViews(id)
if (cancelled) return
} else { } else {
throw new Error(result.error || 'Project not found') throw new Error(result.error || 'Project not found')
} }
} }
setLoading(false) if (!cancelled) {
setLoading(false)
}
} catch (err) { } catch (err) {
setError(err instanceof Error ? err.message : 'Failed to load content') if (!cancelled) {
setLoading(false) setError(err instanceof Error ? err.message : 'Failed to load content')
setLoading(false)
}
} }
} }
loadContent() loadContent()
return () => {
cancelled = true
}
}, [id, setScene]) }, [id, setScene])
if (error) { if (error) {
@@ -107,7 +165,7 @@ export default function ViewerPage() {
return ( return (
<div className="relative h-screen w-full"> <div className="relative h-screen w-full">
{loading && <SceneLoader fullScreen />} {loading && <SceneLoader fullScreen />}
{!loading && ( {!loading && (
<> <>
<ViewerOverlay <ViewerOverlay
@@ -117,13 +175,15 @@ export default function ViewerPage() {
canShowGuides={canShowGuides} canShowGuides={canShowGuides}
/> />
<ViewerGuestCTA /> <ViewerGuestCTA />
<ErrorBoundary key={id} fallback={<ViewerSceneCrashFallback projectName={projectName} />}>
<Viewer>
<ViewerCameraControls />
<ViewerZoneSystem />
</Viewer>
</ErrorBoundary>
</> </>
)} )}
<Viewer>
<ViewerCameraControls />
<ViewerZoneSystem />
</Viewer>
</div> </div>
) )
} }
+47 -17
View File
@@ -16,6 +16,7 @@ import { ToolManager } from '../tools/tool-manager'
import { ActionMenu } from '../ui/action-menu' import { ActionMenu } from '../ui/action-menu'
import { HelperManager } from '../ui/helpers/helper-manager' import { HelperManager } from '../ui/helpers/helper-manager'
import { PanelManager } from '../ui/panels/panel-manager' import { PanelManager } from '../ui/panels/panel-manager'
import { ErrorBoundary } from '../ui/primitives/error-boundary'
import { SidebarProvider } from '../ui/primitives/sidebar' import { SidebarProvider } from '../ui/primitives/sidebar'
import { SceneLoader } from '../ui/scene-loader' import { SceneLoader } from '../ui/scene-loader'
import { AppSidebar } from '../ui/sidebar/app-sidebar' import { AppSidebar } from '../ui/sidebar/app-sidebar'
@@ -23,12 +24,11 @@ import { CustomCameraControls } from './custom-camera-controls'
import { ExportManager } from './export-manager' import { ExportManager } from './export-manager'
import { FloatingActionMenu } from './floating-action-menu' import { FloatingActionMenu } from './floating-action-menu'
import { Grid } from './grid' import { Grid } from './grid'
import { PresetThumbnailGenerator } from './preset-thumbnail-generator'
import { SelectionManager } from './selection-manager' import { SelectionManager } from './selection-manager'
import { SiteEdgeLabels } from './site-edge-labels' import { SiteEdgeLabels } from './site-edge-labels'
import { PresetThumbnailGenerator } from './preset-thumbnail-generator'
import { ThumbnailGenerator } from './thumbnail-generator' import { ThumbnailGenerator } from './thumbnail-generator'
// Load default scene initially (will be replaced when project loads) // Load default scene initially (will be replaced when project loads)
useScene.getState().loadScene() useScene.getState().loadScene()
initSpatialGridSync() initSpatialGridSync()
@@ -66,6 +66,34 @@ interface EditorProps {
projectId?: string projectId?: string
} }
function EditorSceneCrashFallback() {
return (
<div className="fixed inset-0 z-[80] flex items-center justify-center bg-background/95 p-4 text-foreground">
<div className="w-full max-w-md rounded-2xl border border-border/60 bg-background p-6 shadow-xl">
<h2 className="text-lg font-semibold">The editor scene failed to render</h2>
<p className="mt-2 text-sm text-muted-foreground">
You can retry the scene or return home without reloading the whole app shell.
</p>
<div className="mt-4 flex items-center gap-2">
<button
className="rounded-md border border-border bg-accent px-3 py-2 text-sm font-medium hover:bg-accent/80"
onClick={() => window.location.reload()}
type="button"
>
Reload editor
</button>
<a
className="rounded-md border border-border bg-background px-3 py-2 text-sm font-medium hover:bg-accent/40"
href="/"
>
Back to home
</a>
</div>
</div>
</div>
)
}
export default function Editor({ projectId }: EditorProps) { export default function Editor({ projectId }: EditorProps) {
useKeyboard() useKeyboard()
useProjectScene() useProjectScene()
@@ -109,21 +137,23 @@ export default function Editor({ projectId }: EditorProps) {
<SidebarProvider className="fixed z-20"> <SidebarProvider className="fixed z-20">
<AppSidebar /> <AppSidebar />
</SidebarProvider> </SidebarProvider>
<Viewer selectionManager="custom"> <ErrorBoundary key={projectId} fallback={<EditorSceneCrashFallback />}>
<SelectionManager /> <Viewer selectionManager="custom">
<FloatingActionMenu /> <SelectionManager />
<ExportManager /> <FloatingActionMenu />
{/* Editor only system to toggle zone visibility */} <ExportManager />
<ZoneSystem /> {/* Editor only system to toggle zone visibility */}
<CeilingSystem /> <ZoneSystem />
{/* <Stats /> */} <CeilingSystem />
<Grid cellColor="#aaa" sectionColor="#ccc" fadeDistance={500} /> {/* <Stats /> */}
<ToolManager /> <Grid cellColor="#aaa" sectionColor="#ccc" fadeDistance={500} />
<CustomCameraControls /> <ToolManager />
<ThumbnailGenerator projectId={projectId} /> <CustomCameraControls />
<PresetThumbnailGenerator /> <ThumbnailGenerator projectId={projectId} />
<SiteEdgeLabels /> <PresetThumbnailGenerator />
</Viewer> <SiteEdgeLabels />
</Viewer>
</ErrorBoundary>
</div> </div>
) )
} }
@@ -64,20 +64,18 @@ interface ViewerProps {
selectionManager?: 'default' | 'custom' selectionManager?: 'default' | 'custom'
} }
const Viewer: React.FC<ViewerProps> = ({ const Viewer: React.FC<ViewerProps> = ({ children, selectionManager = 'default' }) => {
children,
selectionManager = 'default',
}) => {
const theme = useViewer((state) => state.theme) const theme = useViewer((state) => state.theme)
return ( return (
<Canvas <Canvas
dpr={[1, 1.5]} dpr={[1, 1.5]}
className={`transition-colors duration-700 ${theme === 'dark' ? 'bg-[#1f2433]' : 'bg-[#fafafa]'}`} className={`transition-colors duration-700 ${theme === 'dark' ? 'bg-[#1f2433]' : 'bg-[#fafafa]'}`}
gl={(props) => { gl={async (props) => {
const renderer = new THREE.WebGPURenderer(props as any) const renderer = new THREE.WebGPURenderer(props as any)
renderer.toneMapping = THREE.ACESFilmicToneMapping renderer.toneMapping = THREE.ACESFilmicToneMapping
renderer.toneMappingExposure = 0.9 renderer.toneMappingExposure = 0.9
await renderer.init()
return renderer return renderer
}} }}
shadows={{ shadows={{
@@ -27,7 +27,7 @@ import useViewer from '../../store/use-viewer'
// SSGI Parameters - adjust these to fine-tune global illumination and ambient occlusion // SSGI Parameters - adjust these to fine-tune global illumination and ambient occlusion
export const SSGI_PARAMS = { export const SSGI_PARAMS = {
enabled: true, enabled: true,
sliceCount: 2, sliceCount: 2,
stepCount: 8, stepCount: 8,
radius: 1, radius: 1,
expFactor: 1.5, expFactor: 1.5,
@@ -43,19 +43,31 @@ export const SSGI_PARAMS = {
const PostProcessingPasses = () => { const PostProcessingPasses = () => {
const { gl: renderer, scene, camera } = useThree() const { gl: renderer, scene, camera } = useThree()
const renderPipelineRef = useRef<RenderPipeline | null>(null) const renderPipelineRef = useRef<RenderPipeline | null>(null)
const hasPipelineErrorRef = useRef(false)
const [isInitialized, setIsInitialized] = useState(false) const [isInitialized, setIsInitialized] = useState(false)
useEffect(() => { useEffect(() => {
let mounted = true let mounted = true
const initRenderer = async () => { const initRenderer = async () => {
if (renderer && (renderer as any).init) { try {
await (renderer as any).init() if (renderer && (renderer as any).init) {
} await (renderer as any).init()
if (mounted) { }
setIsInitialized(true)
if (mounted) {
setIsInitialized(true)
}
} catch (error) {
console.error('[viewer] Failed to initialize renderer for post-processing.', error)
if (mounted) {
setIsInitialized(false)
}
} }
} }
initRenderer() initRenderer()
return () => { return () => {
mounted = false mounted = false
} }
@@ -66,123 +78,138 @@ const PostProcessingPasses = () => {
return return
} }
// Scene pass with MRT for SSGI hasPipelineErrorRef.current = false
const scenePass = pass(scene, camera)
scenePass.setMRT(
mrt({
output: output,
diffuseColor: diffuseColor,
normal: directionToColor(normalView),
velocity: velocity,
}),
)
// Get texture outputs try {
const scenePassColor = scenePass.getTextureNode('output') // Scene pass with MRT for SSGI
const scenePassDiffuse = scenePass.getTextureNode('diffuseColor') const scenePass = pass(scene, camera)
const scenePassDepth = scenePass.getTextureNode('depth') scenePass.setMRT(
const scenePassNormal = scenePass.getTextureNode('normal') mrt({
const scenePassVelocity = scenePass.getTextureNode('velocity') output: output,
diffuseColor: diffuseColor,
normal: directionToColor(normalView),
velocity: velocity,
}),
)
// Optimize texture bandwidth // Get texture outputs
const diffuseTexture = scenePass.getTexture('diffuseColor') const scenePassColor = scenePass.getTextureNode('output')
diffuseTexture.type = UnsignedByteType const scenePassDiffuse = scenePass.getTextureNode('diffuseColor')
const scenePassDepth = scenePass.getTextureNode('depth')
const scenePassNormal = scenePass.getTextureNode('normal')
const scenePassVelocity = scenePass.getTextureNode('velocity')
const normalTexture = scenePass.getTexture('normal') // Optimize texture bandwidth
normalTexture.type = UnsignedByteType const diffuseTexture = scenePass.getTexture('diffuseColor')
diffuseTexture.type = UnsignedByteType
// Extract normal from color-encoded texture const normalTexture = scenePass.getTexture('normal')
const sceneNormal = sample((uv) => { normalTexture.type = UnsignedByteType
return colorToDirection(scenePassNormal.sample(uv))
})
// SSGI Pass (cast to PerspectiveCamera for SSGI) // Extract normal from color-encoded texture
const giPass = ssgi(scenePassColor, scenePassDepth, sceneNormal, camera as any) const sceneNormal = sample((uv) => {
return colorToDirection(scenePassNormal.sample(uv))
giPass.sliceCount.value = SSGI_PARAMS.sliceCount
giPass.stepCount.value = SSGI_PARAMS.stepCount
giPass.radius.value = SSGI_PARAMS.radius
giPass.expFactor.value = SSGI_PARAMS.expFactor
giPass.thickness.value = SSGI_PARAMS.thickness
giPass.backfaceLighting.value = SSGI_PARAMS.backfaceLighting
giPass.aoIntensity.value = SSGI_PARAMS.aoIntensity
giPass.giIntensity.value = SSGI_PARAMS.giIntensity
giPass.useLinearThickness.value = SSGI_PARAMS.useLinearThickness
giPass.useScreenSpaceSampling.value = SSGI_PARAMS.useScreenSpaceSampling
giPass.useTemporalFiltering = SSGI_PARAMS.useTemporalFiltering
// Extract GI and AO from SSGI pass
const gi = giPass.rgb
const ao = giPass.a
// Composite: scene * AO + diffuse * GI
const compositePass = vec4(
add(scenePassColor.rgb.mul(ao), scenePassDiffuse.rgb.mul(gi)),
scenePassColor.a,
)
function generateSelectedOutlinePass() {
const edgeStrength = uniform(3)
const edgeGlow = uniform(0)
const edgeThickness = uniform(1)
const visibleEdgeColor = uniform(new Color(0xffffff))
const hiddenEdgeColor = uniform(new Color(0xf3ff47))
const outlinePass = outline(scene, camera, {
selectedObjects: useViewer.getState().outliner.selectedObjects,
edgeGlow,
edgeThickness,
}) })
const { visibleEdge, hiddenEdge } = outlinePass
const outlineColor = visibleEdge // SSGI Pass (cast to PerspectiveCamera for SSGI)
.mul(visibleEdgeColor) const giPass = ssgi(scenePassColor, scenePassDepth, sceneNormal, camera as any)
.add(hiddenEdge.mul(hiddenEdgeColor))
.mul(edgeStrength)
return outlineColor giPass.sliceCount.value = SSGI_PARAMS.sliceCount
giPass.stepCount.value = SSGI_PARAMS.stepCount
giPass.radius.value = SSGI_PARAMS.radius
giPass.expFactor.value = SSGI_PARAMS.expFactor
giPass.thickness.value = SSGI_PARAMS.thickness
giPass.backfaceLighting.value = SSGI_PARAMS.backfaceLighting
giPass.aoIntensity.value = SSGI_PARAMS.aoIntensity
giPass.giIntensity.value = SSGI_PARAMS.giIntensity
giPass.useLinearThickness.value = SSGI_PARAMS.useLinearThickness
giPass.useScreenSpaceSampling.value = SSGI_PARAMS.useScreenSpaceSampling
giPass.useTemporalFiltering = SSGI_PARAMS.useTemporalFiltering
// Extract GI and AO from SSGI pass
const gi = giPass.rgb
const ao = giPass.a
// Composite: scene * AO + diffuse * GI
const compositePass = vec4(
add(scenePassColor.rgb.mul(ao), scenePassDiffuse.rgb.mul(gi)),
scenePassColor.a,
)
function generateSelectedOutlinePass() {
const edgeStrength = uniform(3)
const edgeGlow = uniform(0)
const edgeThickness = uniform(1)
const visibleEdgeColor = uniform(new Color(0xffffff))
const hiddenEdgeColor = uniform(new Color(0xf3ff47))
const outlinePass = outline(scene, camera, {
selectedObjects: useViewer.getState().outliner.selectedObjects,
edgeGlow,
edgeThickness,
})
const { visibleEdge, hiddenEdge } = outlinePass
const outlineColor = visibleEdge
.mul(visibleEdgeColor)
.add(hiddenEdge.mul(hiddenEdgeColor))
.mul(edgeStrength)
return outlineColor
}
function generateHoverOutlinePass() {
const edgeStrength = uniform(5)
const edgeGlow = uniform(0.5)
const edgeThickness = uniform(1.5)
const pulsePeriod = uniform(3)
const visibleEdgeColor = uniform(new Color(0x00aaff))
const hiddenEdgeColor = uniform(new Color(0xf3ff47))
const outlinePass = outline(scene, camera, {
selectedObjects: useViewer.getState().outliner.hoveredObjects,
edgeGlow,
edgeThickness,
})
const { visibleEdge, hiddenEdge } = outlinePass
const period = time.div(pulsePeriod).mul(2)
const osc = oscSine(period).mul(0.5).add(0.5) // osc [ 0.5, 1.0 ]
const outlineColor = visibleEdge
.mul(visibleEdgeColor)
.add(hiddenEdge.mul(hiddenEdgeColor))
.mul(edgeStrength)
const outlinePulse = pulsePeriod.greaterThan(0).select(outlineColor.mul(osc), outlineColor)
return outlinePulse
}
const selectedOutlinePass = generateSelectedOutlinePass()
const hoverOutlinePass = generateHoverOutlinePass()
// Combine composite with outlines BEFORE applying TRAA
const compositeWithOutlines = SSGI_PARAMS.enabled
? vec4(add(compositePass.rgb, selectedOutlinePass.add(hoverOutlinePass)), compositePass.a)
: vec4(add(scenePassColor.rgb, selectedOutlinePass.add(hoverOutlinePass)), scenePassColor.a)
// TRAA (Temporal Reprojection Anti-Aliasing) - applied AFTER combining everything
const finalOutput = traa(compositeWithOutlines, scenePassDepth, scenePassVelocity, camera)
const renderPipeline = new RenderPipeline(renderer as unknown as WebGPURenderer)
renderPipeline.outputNode = finalOutput
renderPipelineRef.current = renderPipeline
} catch (error) {
hasPipelineErrorRef.current = true
console.error(
'[viewer] Failed to set up post-processing pipeline. Rendering without post FX.',
error,
)
if (renderPipelineRef.current) {
renderPipelineRef.current.dispose()
}
renderPipelineRef.current = null
} }
function generateHoverOutlinePass() {
const edgeStrength = uniform(5)
const edgeGlow = uniform(0.5)
const edgeThickness = uniform(1.5)
const pulsePeriod = uniform(3)
const visibleEdgeColor = uniform(new Color(0x00aaff))
const hiddenEdgeColor = uniform(new Color(0xf3ff47))
const outlinePass = outline(scene, camera, {
selectedObjects: useViewer.getState().outliner.hoveredObjects,
edgeGlow,
edgeThickness,
})
const { visibleEdge, hiddenEdge } = outlinePass
const period = time.div(pulsePeriod).mul(2)
const osc = oscSine(period).mul(0.5).add(0.5) // osc [ 0.5, 1.0 ]
const outlineColor = visibleEdge
.mul(visibleEdgeColor)
.add(hiddenEdge.mul(hiddenEdgeColor))
.mul(edgeStrength)
const outlinePulse = pulsePeriod.greaterThan(0).select(outlineColor.mul(osc), outlineColor)
return outlinePulse
}
const selectedOutlinePass = generateSelectedOutlinePass()
const hoverOutlinePass = generateHoverOutlinePass()
// Combine composite with outlines BEFORE applying TRAA
const compositeWithOutlines = SSGI_PARAMS.enabled
? vec4(add(compositePass.rgb, selectedOutlinePass.add(hoverOutlinePass)), compositePass.a)
: vec4(add(scenePassColor.rgb, selectedOutlinePass.add(hoverOutlinePass)), scenePassColor.a)
// TRAA (Temporal Reprojection Anti-Aliasing) - applied AFTER combining everything
const finalOutput = traa(compositeWithOutlines, scenePassDepth, scenePassVelocity, camera)
const renderPipeline = new RenderPipeline(renderer as unknown as WebGPURenderer)
renderPipeline.outputNode = finalOutput
renderPipelineRef.current = renderPipeline
return () => { return () => {
if (renderPipelineRef.current) { if (renderPipelineRef.current) {
@@ -193,8 +220,20 @@ const PostProcessingPasses = () => {
}, [renderer, scene, camera, isInitialized]) }, [renderer, scene, camera, isInitialized])
useFrame(() => { useFrame(() => {
if (renderPipelineRef.current) { if (hasPipelineErrorRef.current || !renderPipelineRef.current) {
return
}
try {
renderPipelineRef.current.render() renderPipelineRef.current.render()
} catch (error) {
hasPipelineErrorRef.current = true
console.error(
'[viewer] Post-processing render pass failed. Disabling post FX for this session.',
error,
)
renderPipelineRef.current.dispose()
renderPipelineRef.current = null
} }
}, 1) }, 1)
+28 -8
View File
@@ -1,19 +1,39 @@
import { useGLTF } from "@react-three/drei" import { useGLTF } from '@react-three/drei'
import { useThree } from "@react-three/fiber" import { useThree } from '@react-three/fiber'
import { KTX2Loader } from "three/examples/jsm/Addons.js" import { KTX2Loader } from 'three/examples/jsm/Addons.js'
import { MeshoptDecoder } from "three/examples/jsm/libs/meshopt_decoder.module.js" import { MeshoptDecoder } from 'three/examples/jsm/libs/meshopt_decoder.module.js'
const ktx2LoaderInstance = new KTX2Loader() const ktx2LoaderInstance = new KTX2Loader()
ktx2LoaderInstance.setTranscoderPath('https://cdn.jsdelivr.net/gh/pmndrs/drei-assets@master/basis/') ktx2LoaderInstance.setTranscoderPath('https://cdn.jsdelivr.net/gh/pmndrs/drei-assets@master/basis/')
const ktx2ConfiguredRenderers = new WeakSet<object>()
const ktx2WarningLoggedRenderers = new WeakSet<object>()
const useGLTFKTX2 = (path: string): ReturnType<typeof useGLTF> => { const useGLTFKTX2 = (path: string): ReturnType<typeof useGLTF> => {
const gl = useThree((state) => state.gl) const gl = useThree((state) => state.gl)
return useGLTF(path, true, true, (loader) => { return useGLTF(path, true, true, (loader) => {
ktx2LoaderInstance.detectSupport(gl) const renderer = gl as unknown as object
// eslint-disable-next-line @typescript-eslint/no-explicit-any
loader.setKTX2Loader(ktx2LoaderInstance as any) if (!ktx2ConfiguredRenderers.has(renderer)) {
try {
ktx2LoaderInstance.detectSupport(gl)
ktx2ConfiguredRenderers.add(renderer)
} catch (error) {
// Some WebGPU flows can transiently call this before backend init.
// Avoid crashing the whole scene; scans may render without KTX2 on this pass.
if (!ktx2WarningLoggedRenderers.has(renderer)) {
console.warn('[viewer] Skipping KTX2 support detection for now.', error)
ktx2WarningLoggedRenderers.add(renderer)
}
}
}
if (ktx2ConfiguredRenderers.has(renderer)) {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
loader.setKTX2Loader(ktx2LoaderInstance as any)
}
loader.setMeshoptDecoder(MeshoptDecoder) loader.setMeshoptDecoder(MeshoptDecoder)
}) })
} }
export { useGLTFKTX2 } export { useGLTFKTX2 }