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
1 change: 1 addition & 0 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ const DEFAULT_SETTINGS: Settings = {
gamma: 2.2,
},
scene: {
seed: Math.floor(Math.random() * 9_999_999),
showRabbit: false,
sphereCount: 250,
},
Expand Down
60 changes: 48 additions & 12 deletions src/RenderSettings.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { useState, useEffect, useRef, useCallback } from "react";

export interface Settings {
render: {
width: number;
Expand All @@ -10,6 +12,7 @@ export interface Settings {
gamma: number;
};
scene: {
seed: number;
showRabbit: boolean;
sphereCount: number;
};
Expand All @@ -21,11 +24,32 @@ interface RenderSettingsProps {
}

function RenderSettings({ settings, onSettingsChange }: RenderSettingsProps) {
const updateRender = (patch: Partial<Settings["render"]>) =>
onSettingsChange({ ...settings, render: { ...settings.render, ...patch } });
const [local, setLocal] = useState(settings);
const timerRef = useRef<ReturnType<typeof setTimeout>>();

useEffect(() => setLocal(settings), [settings]);

const debouncedChange = useCallback(
(next: Settings) => {
clearTimeout(timerRef.current);
timerRef.current = setTimeout(() => onSettingsChange(next), 300);
},
[onSettingsChange],
);

const updateScene = (patch: Partial<Settings["scene"]>) =>
onSettingsChange({ ...settings, scene: { ...settings.scene, ...patch } });
useEffect(() => () => clearTimeout(timerRef.current), []);

const updateRender = (patch: Partial<Settings["render"]>) => {
const next = { ...local, render: { ...local.render, ...patch } };
setLocal(next);
debouncedChange(next);
};

const updateScene = (patch: Partial<Settings["scene"]>) => {
const next = { ...local, scene: { ...local.scene, ...patch } };
setLocal(next);
debouncedChange(next);
};

return (
<div className="settings">
Expand All @@ -38,7 +62,7 @@ function RenderSettings({ settings, onSettingsChange }: RenderSettingsProps) {
<input
type="number"
min={1}
value={settings.render.samples}
value={local.render.samples}
onChange={(e) => updateRender({ samples: e.target.valueAsNumber })}
/>
</label>
Expand All @@ -49,7 +73,7 @@ function RenderSettings({ settings, onSettingsChange }: RenderSettingsProps) {
<input
type="number"
min={1}
value={settings.render.bounces}
value={local.render.bounces}
onChange={(e) => updateRender({ bounces: e.target.valueAsNumber })}
/>
</label>
Expand All @@ -60,7 +84,7 @@ function RenderSettings({ settings, onSettingsChange }: RenderSettingsProps) {
<input
type="number"
min={1}
value={settings.render.focalLength}
value={local.render.focalLength}
onChange={(e) => updateRender({ focalLength: e.target.valueAsNumber })}
/>
</label>
Expand All @@ -71,7 +95,7 @@ function RenderSettings({ settings, onSettingsChange }: RenderSettingsProps) {
<input
type="number"
min={1}
value={settings.render.focalDistance}
value={local.render.focalDistance}
onChange={(e) => updateRender({ focalDistance: e.target.valueAsNumber })}
/>
</label>
Expand All @@ -83,7 +107,7 @@ function RenderSettings({ settings, onSettingsChange }: RenderSettingsProps) {
type="number"
min={0}
step={0.01}
value={settings.render.aperture}
value={local.render.aperture}
onChange={(e) => updateRender({ aperture: e.target.valueAsNumber })}
/>
</label>
Expand All @@ -95,7 +119,7 @@ function RenderSettings({ settings, onSettingsChange }: RenderSettingsProps) {
type="number"
min={1}
step={0.1}
value={settings.render.gamma}
value={local.render.gamma}
onChange={(e) => updateRender({ gamma: e.target.valueAsNumber })}
/>
</label>
Expand All @@ -106,13 +130,25 @@ function RenderSettings({ settings, onSettingsChange }: RenderSettingsProps) {
<fieldset>
<legend>Scene</legend>
<ul>
<li>
<label>
Seed
<input
type="number"
min={0}
max={9_999_999}
value={local.scene.seed}
onChange={(e) => updateScene({ seed: e.target.valueAsNumber })}
/>
</label>
</li>
<li>
<label>
Sphere Count
<input
type="number"
min={0}
value={settings.scene.sphereCount}
value={local.scene.sphereCount}
onChange={(e) => updateScene({ sphereCount: e.target.valueAsNumber })}
/>
</label>
Expand All @@ -122,7 +158,7 @@ function RenderSettings({ settings, onSettingsChange }: RenderSettingsProps) {
Rabbit
<input
type="checkbox"
checked={settings.scene.showRabbit}
checked={local.scene.showRabbit}
onChange={(e) => updateScene({ showRabbit: e.target.checked })}
/>
</label>
Expand Down
2 changes: 1 addition & 1 deletion src/hooks/useRenderer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function startRender(canvas: HTMLCanvasElement, settings: Settings): Worker {
type: "start",
canvas: offscreen,
settings: settings.render,
entities: buildSceneData(settings.scene.sphereCount, settings.render.focalDistance),
entities: buildSceneData(settings.scene.sphereCount, settings.render.focalDistance, settings.scene.seed),
models: settings.scene.showRabbit ? [RABBIT_MODEL_DATA] : [],
gamma: settings.render.gamma,
};
Expand Down
19 changes: 10 additions & 9 deletions src/scene.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { vec3, mag, sub } from "./utils/math";
import { vec3, mag, sub, createRng } from "./utils/math";
import { rgb } from "./utils/colour";
import type { SceneObject, ModelData } from "./render.types";
import RABBIT_MODEL from "./models/rabbit";
Expand Down Expand Up @@ -81,14 +81,15 @@ export const RABBIT_MODEL_DATA: ModelData = {
ior: 1.5,
};

export function buildSceneData(sphereCount: number, focalDistance: number): SceneObject[] {
export function buildSceneData(sphereCount: number, focalDistance: number, seed: number): SceneObject[] {
const random = createRng(seed);
const scene: SceneObject[] = [...BASE_SCENE];

for (let i = 0; i < sphereCount; i++) {
for (let attempts = 0; attempts < 100; attempts++) {
const radius = 2 + Math.random() * 5;
const x = (Math.random() - 0.5) * 150;
const z = focalDistance + (Math.random() - 0.5) * 175;
const radius = 2 + random() * 5;
const x = (random() - 0.5) * 150;
const z = focalDistance + (random() - 0.5) * 175;
const position = vec3(x, MAIN_SIZE - radius, z);

let isIntersecting = false;
Expand All @@ -102,17 +103,17 @@ export function buildSceneData(sphereCount: number, focalDistance: number): Scen
}

if (!isIntersecting) {
const metallic = Math.random() > 0.6 ? 1.0 : 0.0;
const transmission = !metallic && Math.random() > 0.7 ? 1.0 : 0.0;
const metallic = random() > 0.6 ? 1.0 : 0.0;
const transmission = !metallic && random() > 0.7 ? 1.0 : 0.0;

scene.push({
shape: "sphere",
radius,
position,
emission: rgb(0, 0, 0),
albedo: rgb(Math.random(), Math.random(), Math.random()),
albedo: rgb(random(), random(), random()),
metallic,
roughness: Math.random(),
roughness: random(),
transmission,
ior: 1.5,
});
Expand Down
28 changes: 28 additions & 0 deletions src/utils/math.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
reflect,
degreeToRadians,
vecToArray,
createRng,
} from "./math";

describe("vec3", () => {
Expand Down Expand Up @@ -138,6 +139,33 @@ describe("avg", () => {
});
});

describe("createRng", () => {
it("produces values in [0, 1)", () => {
const random = createRng(123);
for (let i = 0; i < 1000; i++) {
const v = random();
expect(v).toBeGreaterThanOrEqual(0);
expect(v).toBeLessThan(1);
}
});

it("produces the same sequence for the same seed", () => {
const a = createRng(42);
const b = createRng(42);
for (let i = 0; i < 100; i++) {
expect(a()).toBe(b());
}
});

it("produces different sequences for different seeds", () => {
const a = createRng(1);
const b = createRng(2);
const valuesA = Array.from({ length: 10 }, () => a());
const valuesB = Array.from({ length: 10 }, () => b());
expect(valuesA).not.toEqual(valuesB);
});
});

describe("reflect", () => {
it("reflects off a flat surface", () => {
const direction = vec3(1, -1, 0);
Expand Down
11 changes: 11 additions & 0 deletions src/utils/math.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,14 @@ export const dot = (a: Vec3, b: Vec3): number => a.x * b.x + a.y * b.y + a.z * b
export const normalize = (vec: Vec3): Vec3 => mul(vec, 1 / mag(vec));

export const reflect = (direction: Vec3, normal: Vec3) => sub(direction, mul(normal, dot(direction, normal) * 2));

// Mulberry32
export const createRng = (seed: number): (() => number) => {
let s: number = seed;
return () => {
s = (s + 0x6d2b79f5) | 0;
let t = Math.imul(s ^ (s >>> 15), 1 | s);
t = (t + Math.imul(t ^ (t >>> 7), 61 | t)) ^ t;
return ((t ^ (t >>> 14)) >>> 0) / 4294967296;
};
};
Loading