GameCult/Ratatoskr
Watch
9
0
Fork
You've already forked Ratatoskr
 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

scene: a throwing ray-march createScene goes to onCompileFail #85

Merged
void merged 1 commit from nibu/scene-throw-compile-fail into dev 2026-11-11 20:52:40 +00:00
Conversation 1 Commits 1 Files changed 2 +19 -7
2 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/app/features/scene/index.test.ts
View file

@ -239,4 +239,19 @@ describe('startBackgroundScene follows the sky state', () => {
await flush();
expect(createScene).toHaveBeenCalledOnce();
});
it('keeps the ground and reports a ray-march scene that throws while being created', async () => {
const boom = new Error('shader link failed');
createScene.mockImplementation(() => {
throw boom;
});
const onCompileFail = vi.fn();
const scene = await startBackgroundScene({ ...config, style: 'raymarch' }, caps, {
canvas,
onCompileFail,
});
expect(scene).toBeNull();
expect(onCompileFail).toHaveBeenCalledOnce();
expect(onCompileFail).toHaveBeenCalledWith(boom);
});
});

11
src/app/features/scene/index.ts
View file

@ -21,12 +21,11 @@ async function create(
options: StartOptions & { tier: SceneTier; debug?: boolean },
state: SkyState
): Promise<Scene | null> {
let createScene: (o: SceneOptions) => Scene | null;
try {
// Loaded here, with the scenes, so the main chunk does not carry the terrain sky or the baked tables.
const { ridgeSkyFor, terrainSkyFor } = await import('./skyForState');
if (config?.style === 'raymarch') createScene = (await import('./Scene')).createScene;
else if (config?.style === 'terrain') {
if (config?.style === 'raymarch') return (await import('./Scene')).createScene(options);
if (config?.style === 'terrain') {
const { createTerrainScene } = await import('./terrain/Terrain');
const sky = terrainSkyFor(state);
const scene = createTerrainScene({ ...options, ...sky });
@ -34,15 +33,13 @@ async function create(
if (scene) return scene;
const { createTerrainSkyScene } = await import('./terrain/TerrainSky2D');
return createTerrainSkyScene({ ...options, ...sky });
} else {
const { createRidgeScene } = await import('./ridge/Ridge');
return createRidgeScene({ ...options, sky: ridgeSkyFor(state) });
}
const { createRidgeScene } = await import('./ridge/Ridge');
return createRidgeScene({ ...options, sky: ridgeSkyFor(state) });
} catch (e) {
options.onCompileFail?.(e instanceof Error ? e : new Error(String(e)));
return null;
}
return createScene(options);
}
/**