Skip to content

armgit / 67.js

Public Imported from GitHub
0

3D engine that AI agents drive

Merge remote-tracking branch 'origin/main' into feat/fog-generalise

Nguyen Xuan An7cf496b53b5c
diff --cc CHANGELOG.md
index 3200e147,5b454099..e98d430a
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -2,8 -2,8 +2,10 @@@
## Unreleased
+- Add `fog-valley` and `fog-room` to the reference suite (part of issue #165, which stays open). Against Cycles `fog-room` scores 0.1953 (EEVEE 0.3730) and `fog-valley` 0.1967 (EEVEE 0.1952), so the fog constants of #161 hold on both. Scaling the fog ambient by the share of the sky the volume sees was measured and not kept: it worsened the region of `temple-hall` (0.2305 to 0.2513), so #164 is not fixed. See `bench/reference/README.md`.
+- Fix a thin bright line at the corners of baked rooms (issue #165). The texel just outside a lightmap chart took the average of the neighbouring chart, so the wall of `dark-shaft` read 128 of 255 sky visibility at its bottom edge where the interior reads 1. `rasterizeTexels` in `src/light-bake.js` now gives that texel to the nearest triangle. Baked `dark-shaft` goes from 0.0653 to 0.0607 and `temple-hall` from 0.0578 to 0.0559 against Cycles.
+ - Add three options for each grand reference scene, to pick from (part of issue #168, which stays open until An picks). `bench/reference/grand-scenes.js` holds `mountain-valley`, `temple-hall` and `megacity-dusk` as `-a`, `-b` and `-c`, each with its own composition, light and time of day, drawn by `npm run reference -- --grand` into `grand.json` and `images/grand-<id>.jpg` (`baseline.json` and the existing images are unchanged). The Blender side gained a `gradient` world, written as the same equirectangular image 67js draws. `bench/reference/grand-sheets.py` makes one comparison sheet per scene.
+
- Hide sky light where the scene blocks it: inside tree crowns and on a valley floor (issue #191, part of it). `createTree` bakes a sky visibility into each foliage vertex from the leaf density above it, and `createTerrain` bakes one into each terrain vertex from the horizon in 16 directions. The shader multiplies it into the environment light only, and meshes without it read 1. On `bench/reference`, the `foliage` crown went from 0.298 to 0.200 (Cycles 0.175) and the score from 0.1173 to 0.1023 (EEVEE 0.0888); `mountain-valley` went from 0.3483 to 0.2623 (EEVEE 0.1879), and its floor from 0.417 to 0.360 (Cycles 0.272). No other scene changed to four digits. The agent scene geometry bound allows 4 more bytes for each terrain vertex.
- Compare trees like with like (issue #166, part of it). The Blender side of `bench/reference` now rebuilds the 67js leaf model for `foliage` materials (back-face normal, colour and normal variation, sky reflection 0.3, and light from behind as a Translucent BSDF with weight `0.3 * pi / (3.7, 3.4, 2.9)`), and the 67js back light is now shadowed by the sun shadow. `foliage` goes from 0.1290 to 0.1173 against Cycles (EEVEE 0.0864 to 0.0888) and `mountain-valley` from 0.3473 to 0.3483 (EEVEE 0.1828 to 0.1879); no other scene moved. The remaining gap is canopy and valley sky occlusion, recorded in `bench/reference/README.md`.
- Make the recipe bake presets bake large rooms (issue #189). A preset that does not fit the 5 million path step budget at 16 samples and 1 texel per unit now gives up bounces one at a time instead of refusing, and `bake.reduction` tells the agent what it asked for, what ran and that explicit samples, bounces and texelsPerUnit (up to 24 million path steps, 20 s inline) buy more. `temple-hall` at `standard` now bakes (16 samples, 1 bounce, 1.37 texels per unit, 0.0705 against 0.1504 unbaked with a probe). `fine` is now the same as `standard`: five samples and density mixes within the 20 s limit scored no better on the room scenes. Table in `bench/reference/README.md`.
diff --cc bench/reference/scenes.js
index af691932,6643ac1a..6d11da2f
--- a/bench/reference/scenes.js
+++ b/bench/reference/scenes.js
@@@ -40,17 -40,10 +40,17 @@@ export async function skyLighting(inten
const parsed = parseRadianceHdr(await response.arrayBuffer());
const data = parsed.data.map((radiance) => Math.min(radiance, HDRI_RADIANCE_LIMIT));
const map = createEnvironmentMap({ ...parsed, data, intensity, showBackground: true });
- return { map, blenderWorld: { type: 'hdri', file: HDRI_FILE, intensity, radianceLimit: HDRI_RADIANCE_LIMIT } };
+ return { map, meanRadiance: meanRadiance(data, intensity), blenderWorld: { type: 'hdri', file: HDRI_FILE, intensity, radianceLimit: HDRI_RADIANCE_LIMIT } };
+}
+
+// The average colour of an equirectangular map. Rows are not weighted by solid angle: the scenes that use it do not need that.
+function meanRadiance(data, intensity) {
+ const sum = [0, 0, 0];
+ for (let index = 0; index < data.length; index++) sum[index % 3] += data[index];
+ return sum.map(channel => (channel / (data.length / 3)) * intensity);
}
- function constantLighting(value) {
+ export function constantLighting(value) {
const data = new Float32Array(8 * 4 * 3).fill(value);
const map = createEnvironmentMap({ width: 8, height: 4, data, showBackground: true });
return { map, blenderWorld: { type: 'constant', value } };