Skip to content

armgit / 67.js

Public Imported from GitHub
0

3D engine that AI agents drive

Make the sun shadow follow the sun (part of #206)

Nguyen Xuan Andbdd3bfe0dad
diff --git a/bench/reference/baseline.json b/bench/reference/baseline.json
index 19d87182..98933b26 100644
--- a/bench/reference/baseline.json
+++ b/bench/reference/baseline.json
@@ -3,92 +3,96 @@
"blenderVersion": "5.2.2 LTS",
"seconds": {
"brick-flat": {
- "cycles": 10.8,
- "eevee": 1.6
+ "cycles": 3.9,
+ "eevee": 0.9
},
"brick-graph": {
- "cycles": 8.9,
- "eevee": 0.4
+ "cycles": 4.3,
+ "eevee": 0.3
},
"brick-room": {
- "cycles": 19.6,
- "eevee": 0.6
+ "cycles": 8.6,
+ "eevee": 0.3
},
"brushed-film": {
- "cycles": 9.9,
- "eevee": 0.7
+ "cycles": 4.3,
+ "eevee": 0.3
},
"car-paint": {
- "cycles": 14.3,
- "eevee": 0.5
+ "cycles": 4.2,
+ "eevee": 0.3
},
"character": {
- "cycles": 7.7,
- "eevee": 0.4
+ "cycles": 4.1,
+ "eevee": 0.3
},
"dark-shaft": {
- "cycles": 129.3,
- "eevee": 67.2
- },
- "fog": {
- "cycles": 58.3,
- "eevee": 1.4
+ "cycles": 13.7,
+ "eevee": 0.8
},
"fog-room": {
- "cycles": 29.4,
- "eevee": 2.7
+ "cycles": 14.5,
+ "eevee": 0.9
},
- "foliage": {
- "cycles": 4.4,
+ "fog-valley": {
+ "cycles": 12.4,
+ "eevee": 0.8
+ },
+ "fog": {
+ "cycles": 14.5,
"eevee": 0.9
},
+ "foliage": {
+ "cycles": 5.0,
+ "eevee": 0.4
+ },
"glass": {
- "cycles": 18.9,
- "eevee": 0.5
+ "cycles": 4.9,
+ "eevee": 0.3
},
"light-linking": {
- "cycles": 6.9,
- "eevee": 0.6
+ "cycles": 2.9,
+ "eevee": 0.3
},
"lit-interior": {
- "cycles": 33.5,
- "eevee": 0.6
+ "cycles": 8.5,
+ "eevee": 0.4
},
"long-street": {
- "cycles": 10.1,
- "eevee": 0.4
+ "cycles": 3.7,
+ "eevee": 0.3
},
"material-spheres": {
- "cycles": 21.5,
- "eevee": 0.4
+ "cycles": 5.1,
+ "eevee": 0.3
},
"megacity-dusk": {
- "cycles": 22.1,
- "eevee": 1.5
- },
- "metal": {
- "cycles": 21,
- "eevee": 1.8
+ "cycles": 9.3,
+ "eevee": 0.7
},
"metal-room": {
- "cycles": 164.9,
- "eevee": 41.9
+ "cycles": 9.0,
+ "eevee": 0.3
+ },
+ "metal": {
+ "cycles": 4.4,
+ "eevee": 0.3
},
"mountain-valley": {
- "cycles": 13,
- "eevee": 28.3
+ "cycles": 15.5,
+ "eevee": 11.3
},
"outdoor-hdri": {
- "cycles": 12.3,
- "eevee": 0.5
+ "cycles": 3.7,
+ "eevee": 0.3
},
"spot-area": {
- "cycles": 8.7,
- "eevee": 0.6
+ "cycles": 3.4,
+ "eevee": 0.3
},
"temple-hall": {
- "cycles": 57.7,
- "eevee": 1.1
+ "cycles": 16.0,
+ "eevee": 0.8
}
},
"graphics": {
@@ -97,20 +101,20 @@
},
"scores": {
"brick-flat": {
- "gpu-vs-cycles": 0.1272,
- "gpu-vs-eevee": 0.0462,
- "cpu-vs-cycles": 0.1269,
- "cpu-vs-eevee": 0.0458,
- "eevee-vs-cycles": 0.1098,
- "gpu-vs-cpu": 0.0066
+ "gpu-vs-cycles": 0.1346,
+ "gpu-vs-eevee": 0.0581,
+ "cpu-vs-cycles": 0.1344,
+ "cpu-vs-eevee": 0.0579,
+ "eevee-vs-cycles": 0.1099,
+ "gpu-vs-cpu": 0.0067
},
"brick-graph": {
- "gpu-vs-cycles": 0.1602,
- "gpu-vs-eevee": 0.0896,
- "cpu-vs-cycles": 0.1602,
- "cpu-vs-eevee": 0.0897,
+ "gpu-vs-cycles": 0.1637,
+ "gpu-vs-eevee": 0.091,
+ "cpu-vs-cycles": 0.1637,
+ "cpu-vs-eevee": 0.0912,
"eevee-vs-cycles": 0.1221,
- "gpu-vs-cpu": 0.0078
+ "gpu-vs-cpu": 0.0079
},
"brick-room": {
"gpu-vs-cycles": 0.5102,
@@ -124,8 +128,8 @@
"gpu-vs-cycles": 0.1029,
"gpu-vs-eevee": 0.0855,
"cpu-vs-cycles": 0.1026,
- "cpu-vs-eevee": 0.0854,
- "eevee-vs-cycles": 0.0984,
+ "cpu-vs-eevee": 0.0855,
+ "eevee-vs-cycles": 0.0985,
"gpu-vs-cpu": 0.0062
},
"car-paint": {
@@ -137,58 +141,58 @@
"gpu-vs-cpu": 0.0059
},
"character": {
- "gpu-vs-cycles": 0.0799,
- "gpu-vs-eevee": 0.0553,
- "cpu-vs-cycles": 0.0796,
- "cpu-vs-eevee": 0.0552,
+ "gpu-vs-cycles": 0.0717,
+ "gpu-vs-eevee": 0.0443,
+ "cpu-vs-cycles": 0.0714,
+ "cpu-vs-eevee": 0.0442,
"eevee-vs-cycles": 0.0622,
- "gpu-vs-cpu": 0.0066
+ "gpu-vs-cpu": 0.0065
},
"dark-shaft": {
- "gpu-vs-cycles": 0.0619,
- "gpu-vs-eevee": 0.2808,
- "cpu-vs-cycles": 0.0618,
- "cpu-vs-eevee": 0.2807,
- "eevee-vs-cycles": 0.2653,
- "gpu-vs-cpu": 0.0024,
- "region-pixels": 0.099,
- "region-gpu-vs-cycles": 0.1858,
- "region-gpu-vs-eevee": 0.2997,
- "region-eevee-vs-cycles": 0.2643
+ "gpu-vs-cycles": 0.0558,
+ "gpu-vs-eevee": 0.2644,
+ "cpu-vs-cycles": 0.0559,
+ "cpu-vs-eevee": 0.2642,
+ "eevee-vs-cycles": 0.2654,
+ "gpu-vs-cpu": 0.0031,
+ "region-pixels": 0.0989,
+ "region-gpu-vs-cycles": 0.1277,
+ "region-gpu-vs-eevee": 0.2631,
+ "region-eevee-vs-cycles": 0.2645
},
"fog": {
- "gpu-vs-cycles": 0.2257,
- "gpu-vs-eevee": 0.106,
- "cpu-vs-cycles": 0.2254,
- "cpu-vs-eevee": 0.1066,
+ "gpu-vs-cycles": 0.2256,
+ "gpu-vs-eevee": 0.1016,
+ "cpu-vs-cycles": 0.2253,
+ "cpu-vs-eevee": 0.102,
"eevee-vs-cycles": 0.2662,
- "gpu-vs-cpu": 0.0089
+ "gpu-vs-cpu": 0.0085
},
"fog-room": {
- "gpu-vs-cycles": 0.1049,
- "gpu-vs-eevee": 0.3917,
- "cpu-vs-cycles": 0.1047,
- "cpu-vs-eevee": 0.3915,
+ "gpu-vs-cycles": 0.1036,
+ "gpu-vs-eevee": 0.3635,
+ "cpu-vs-cycles": 0.1036,
+ "cpu-vs-eevee": 0.363,
"eevee-vs-cycles": 0.373,
- "gpu-vs-cpu": 0.0043,
- "region-pixels": 0.243,
- "region-gpu-vs-cycles": 0.2405,
- "region-gpu-vs-eevee": 0.3662,
- "region-eevee-vs-cycles": 0.3146
+ "gpu-vs-cpu": 0.0066,
+ "region-pixels": 0.2428,
+ "region-gpu-vs-cycles": 0.1617,
+ "region-gpu-vs-eevee": 0.3269,
+ "region-eevee-vs-cycles": 0.3147
},
"fog-valley": {
"gpu-vs-cycles": 0.1855,
- "gpu-vs-eevee": 0.1443,
+ "gpu-vs-eevee": 0.1442,
"cpu-vs-cycles": 0.1857,
- "cpu-vs-eevee": 0.1447,
+ "cpu-vs-eevee": 0.1446,
"eevee-vs-cycles": 0.1952,
"gpu-vs-cpu": 0.012
},
"foliage": {
- "gpu-vs-cycles": 0.1023,
- "gpu-vs-eevee": 0.0853,
- "cpu-vs-cycles": 0.102,
- "cpu-vs-eevee": 0.0849,
+ "gpu-vs-cycles": 0.0989,
+ "gpu-vs-eevee": 0.0811,
+ "cpu-vs-cycles": 0.0986,
+ "cpu-vs-eevee": 0.0808,
"eevee-vs-cycles": 0.0888,
"gpu-vs-cpu": 0.0098
},
@@ -196,8 +200,8 @@
"gpu-vs-cycles": 0.1034,
"gpu-vs-eevee": 0.0996,
"cpu-vs-cycles": 0.1034,
- "cpu-vs-eevee": 0.1,
- "eevee-vs-cycles": 0.1009,
+ "cpu-vs-eevee": 0.0999,
+ "eevee-vs-cycles": 0.1008,
"gpu-vs-cpu": 0.0083
},
"light-linking": {
@@ -217,18 +221,18 @@
"gpu-vs-cpu": 0.0062
},
"long-street": {
- "gpu-vs-cycles": 0.1407,
- "gpu-vs-eevee": 0.1252,
- "cpu-vs-cycles": 0.1408,
- "cpu-vs-eevee": 0.1254,
+ "gpu-vs-cycles": 0.1267,
+ "gpu-vs-eevee": 0.1112,
+ "cpu-vs-cycles": 0.1267,
+ "cpu-vs-eevee": 0.1113,
"eevee-vs-cycles": 0.0976,
- "gpu-vs-cpu": 0.0095
+ "gpu-vs-cpu": 0.0094
},
"material-spheres": {
"gpu-vs-cycles": 0.1293,
"gpu-vs-eevee": 0.0756,
"cpu-vs-cycles": 0.1291,
- "cpu-vs-eevee": 0.0753,
+ "cpu-vs-eevee": 0.0754,
"eevee-vs-cycles": 0.1053,
"gpu-vs-cpu": 0.007
},
@@ -261,14 +265,14 @@
"gpu-vs-eevee": 0.2692,
"cpu-vs-cycles": 0.1765,
"cpu-vs-eevee": 0.2676,
- "eevee-vs-cycles": 0.1879,
+ "eevee-vs-cycles": 0.1893,
"gpu-vs-cpu": 0.0124
},
"outdoor-hdri": {
- "gpu-vs-cycles": 0.0462,
- "gpu-vs-eevee": 0.0296,
- "cpu-vs-cycles": 0.0456,
- "cpu-vs-eevee": 0.0293,
+ "gpu-vs-cycles": 0.046,
+ "gpu-vs-eevee": 0.0293,
+ "cpu-vs-cycles": 0.0454,
+ "cpu-vs-eevee": 0.029,
"eevee-vs-cycles": 0.0403,
"gpu-vs-cpu": 0.0065
},
@@ -281,16 +285,16 @@
"gpu-vs-cpu": 0.0032
},
"temple-hall": {
- "gpu-vs-cycles": 0.0659,
- "gpu-vs-eevee": 0.2394,
- "cpu-vs-cycles": 0.0659,
- "cpu-vs-eevee": 0.2393,
+ "gpu-vs-cycles": 0.0646,
+ "gpu-vs-eevee": 0.2326,
+ "cpu-vs-cycles": 0.0647,
+ "cpu-vs-eevee": 0.2325,
"eevee-vs-cycles": 0.2341,
- "gpu-vs-cpu": 0.0016,
- "region-pixels": 0.0958,
- "region-gpu-vs-cycles": 0.2805,
- "region-gpu-vs-eevee": 0.3061,
- "region-eevee-vs-cycles": 0.2455
+ "gpu-vs-cpu": 0.0021,
+ "region-pixels": 0.0961,
+ "region-gpu-vs-cycles": 0.2418,
+ "region-gpu-vs-eevee": 0.2913,
+ "region-eevee-vs-cycles": 0.2453
}
}
}
diff --git a/bench/reference/images/brick-flat.jpg b/bench/reference/images/brick-flat.jpg
index 4e1e0636..aea57a90 100644
Binary files a/bench/reference/images/brick-flat.jpg and b/bench/reference/images/brick-flat.jpg differ
diff --git a/bench/reference/images/brick-graph.jpg b/bench/reference/images/brick-graph.jpg
index 64f482be..e747f98f 100644
Binary files a/bench/reference/images/brick-graph.jpg and b/bench/reference/images/brick-graph.jpg differ
diff --git a/bench/reference/images/brick-room.jpg b/bench/reference/images/brick-room.jpg
index 46a0e848..b248c60b 100644
Binary files a/bench/reference/images/brick-room.jpg and b/bench/reference/images/brick-room.jpg differ
diff --git a/bench/reference/images/brushed-film.jpg b/bench/reference/images/brushed-film.jpg
index 3dbdab84..e80926c3 100644
Binary files a/bench/reference/images/brushed-film.jpg and b/bench/reference/images/brushed-film.jpg differ
diff --git a/bench/reference/images/car-paint.jpg b/bench/reference/images/car-paint.jpg
index 45f76e61..8be8dbbb 100644
Binary files a/bench/reference/images/car-paint.jpg and b/bench/reference/images/car-paint.jpg differ
diff --git a/bench/reference/images/character.jpg b/bench/reference/images/character.jpg
index b4b124c6..83e37b0a 100644
Binary files a/bench/reference/images/character.jpg and b/bench/reference/images/character.jpg differ
diff --git a/bench/reference/images/dark-shaft.jpg b/bench/reference/images/dark-shaft.jpg
index 50e597ff..a6a65bc5 100644
Binary files a/bench/reference/images/dark-shaft.jpg and b/bench/reference/images/dark-shaft.jpg differ
diff --git a/bench/reference/images/fog-room.jpg b/bench/reference/images/fog-room.jpg
index aa00ff2b..87b49981 100644
Binary files a/bench/reference/images/fog-room.jpg and b/bench/reference/images/fog-room.jpg differ
diff --git a/bench/reference/images/fog-valley.jpg b/bench/reference/images/fog-valley.jpg
index 7bf7e5f1..9ec49adb 100644
Binary files a/bench/reference/images/fog-valley.jpg and b/bench/reference/images/fog-valley.jpg differ
diff --git a/bench/reference/images/fog.jpg b/bench/reference/images/fog.jpg
index 91628a7a..1e33a63a 100644
Binary files a/bench/reference/images/fog.jpg and b/bench/reference/images/fog.jpg differ
diff --git a/bench/reference/images/foliage.jpg b/bench/reference/images/foliage.jpg
index 5a1b9ecc..c72599ed 100644
Binary files a/bench/reference/images/foliage.jpg and b/bench/reference/images/foliage.jpg differ
diff --git a/bench/reference/images/glass.jpg b/bench/reference/images/glass.jpg
index 8b695191..5e4475ce 100644
Binary files a/bench/reference/images/glass.jpg and b/bench/reference/images/glass.jpg differ
diff --git a/bench/reference/images/light-linking.jpg b/bench/reference/images/light-linking.jpg
index caa72283..8e6a7d86 100644
Binary files a/bench/reference/images/light-linking.jpg and b/bench/reference/images/light-linking.jpg differ
diff --git a/bench/reference/images/lit-interior.jpg b/bench/reference/images/lit-interior.jpg
index 8b82b680..7bba6028 100644
Binary files a/bench/reference/images/lit-interior.jpg and b/bench/reference/images/lit-interior.jpg differ
diff --git a/bench/reference/images/long-street.jpg b/bench/reference/images/long-street.jpg
index 4c687e95..d8365d0f 100644
Binary files a/bench/reference/images/long-street.jpg and b/bench/reference/images/long-street.jpg differ
diff --git a/bench/reference/images/material-spheres.jpg b/bench/reference/images/material-spheres.jpg
index efc2f507..4de771a4 100644
Binary files a/bench/reference/images/material-spheres.jpg and b/bench/reference/images/material-spheres.jpg differ
diff --git a/bench/reference/images/megacity-dusk.jpg b/bench/reference/images/megacity-dusk.jpg
index 649ee1f8..c8fdd467 100644
Binary files a/bench/reference/images/megacity-dusk.jpg and b/bench/reference/images/megacity-dusk.jpg differ
diff --git a/bench/reference/images/metal-room.jpg b/bench/reference/images/metal-room.jpg
index 7a659b32..8eed5114 100644
Binary files a/bench/reference/images/metal-room.jpg and b/bench/reference/images/metal-room.jpg differ
diff --git a/bench/reference/images/metal.jpg b/bench/reference/images/metal.jpg
index d75f90cf..d0ab70a0 100644
Binary files a/bench/reference/images/metal.jpg and b/bench/reference/images/metal.jpg differ
diff --git a/bench/reference/images/outdoor-hdri.jpg b/bench/reference/images/outdoor-hdri.jpg
index 3461a36f..6fd64555 100644
Binary files a/bench/reference/images/outdoor-hdri.jpg and b/bench/reference/images/outdoor-hdri.jpg differ
diff --git a/bench/reference/images/spot-area.jpg b/bench/reference/images/spot-area.jpg
index 3e491803..b57442bd 100644
Binary files a/bench/reference/images/spot-area.jpg and b/bench/reference/images/spot-area.jpg differ
diff --git a/bench/reference/images/temple-hall.jpg b/bench/reference/images/temple-hall.jpg
index 7ddeee85..14e7c6b4 100644
Binary files a/bench/reference/images/temple-hall.jpg and b/bench/reference/images/temple-hall.jpg differ
diff --git a/bench/reference/scenes.js b/bench/reference/scenes.js
index 6d11da2f..6e6fe848 100644
--- a/bench/reference/scenes.js
+++ b/bench/reference/scenes.js
@@ -121,7 +121,7 @@ async function brickWallScene({ withGraph }) {
parts: [floor([0.4, 0.38, 0.32]), wall], blenderWorld: lighting.blenderWorld,
environment: environment(lighting, { keyColor: SUN_COLOR }),
camera: { eye: [0, 2, 8.5], target: [0, 2, 0], up: [0, 1, 0], fov: 40, near: 0.1, far: 100 },
- shadow: { eye: [-6, 10, 8], target: [0, 1, 0], up: [0, 1, 0], extent: 8, near: 0.1, far: 40 },
+ shadow: shadowAlongSun(DEFAULT_SUN_DIRECTION, { target: [0, 1, 0], distance: 13.45, extent: 8, near: 0.1, far: 40 }),
};
}
@@ -168,7 +168,7 @@ async function khronosAssetScene(name) {
parts: asset.parts, glb: file, blenderWorld: lighting.blenderWorld,
environment: environment(lighting, { keyColor: SUN_COLOR }),
camera,
- shadow: { eye: [center[0] - radius, center[1] + radius * 2, center[2] + radius], target: center, up: [0, 1, 0], extent: radius * 1.5, near: radius * 0.1, far: radius * 8 },
+ shadow: shadowAlongSun(DEFAULT_SUN_DIRECTION, { target: center, distance: radius * Math.sqrt(6), extent: radius * 1.5, near: radius * 0.1, far: radius * 8 }),
};
}
@@ -211,6 +211,15 @@ export function sunShadow(towardLight, target, extent, depth) {
return { eye: target.map((value, axis) => value + direction[axis] * depth), target, up: [0, 1, 0], extent, near: 1, far: depth * 2 };
}
+// The sun every scene gets from environment() unless it names its own.
+const DEFAULT_SUN_DIRECTION = [-3, 6, 4];
+
+// A shadow map that looks along the sun toward `target` from `distance` metres away, so shadows fall where the shading says.
+function shadowAlongSun(towardLight, { target, distance, extent, near, far }) {
+ const direction = normalized(towardLight);
+ return { eye: target.map((value, axis) => value + direction[axis] * distance), target, up: [0, 1, 0], extent, near, far };
+}
+
// Mountain valley: a bowl about 2 km across whose rim rises into ridged peaks, a conifer forest on the lower slopes.
export const VALLEY_TERRAIN = { size: 5120, chunks: 20, resolution: 64, levels: 4 };
const VALLEY_FLOOR_RADIUS = 520;
@@ -637,7 +646,7 @@ export const REFERENCE_SCENES = {
parts, blenderWorld: lighting.blenderWorld,
environment: environment(lighting, { keyColor: SUN_COLOR }),
camera: { eye: [0, 3.5, 7.5], target: [0, 0.4, 0], up: [0, 1, 0], fov: 35, near: 0.1, far: 200 },
- shadow: { eye: [-6, 12, 8], target: [0, 0, 0], up: [0, 1, 0], extent: 8, near: 0.1, far: 40 },
+ shadow: shadowAlongSun(DEFAULT_SUN_DIRECTION, { target: [0, 0, 0], distance: 15.62, extent: 8, near: 0.1, far: 40 }),
};
},
@@ -787,7 +796,7 @@ export const REFERENCE_SCENES = {
parts, blenderWorld: lighting.blenderWorld,
environment: environment(lighting, { keyColor: SUN_COLOR, lightDirection: [-0.7, 0.8, 0.35] }),
camera: { eye: [-1.5, 1.7, 56], target: [0, 2.2, -40], up: [0, 1, 0], fov: 50, near: 0.1, far: 200 },
- shadow: { eye: [-58, 66, 30], target: [0, 0, -10], up: [0, 1, 0], extent: 85, near: 1, far: 260 },
+ shadow: shadowAlongSun([-0.7, 0.8, 0.35], { target: [0, 0, -10], distance: 96.54, extent: 85, near: 1, far: 260 }),
};
},
@@ -823,7 +832,7 @@ export const REFERENCE_SCENES = {
parts: [floor([0.4, 0.42, 0.45]), ...asset.parts], blenderWorld: lighting.blenderWorld,
environment: environment(lighting, { keyColor: SUN_COLOR }),
camera: { eye: [2, 3.5, 9], target: [0, 2.4, 0], up: [0, 1, 0], fov: 35, near: 0.1, far: 200 },
- shadow: { eye: [-6, 12, 8], target: [0, 2, 0], up: [0, 1, 0], extent: 7, near: 0.1, far: 40 },
+ shadow: shadowAlongSun(DEFAULT_SUN_DIRECTION, { target: [0, 2, 0], distance: 14.14, extent: 7, near: 0.1, far: 40 }),
};
},
@@ -835,7 +844,7 @@ export const REFERENCE_SCENES = {
blenderWorld: lighting.blenderWorld,
environment: environment(lighting, { keyColor: SUN_COLOR }),
camera: { eye: [0, 3.5, 12], target: [0, 3.2, 0], up: [0, 1, 0], fov: 40, near: 0.1, far: 200 },
- shadow: { eye: [-6, 14, 8], target: [0, 3, 0], up: [0, 1, 0], extent: 9, near: 0.1, far: 40 },
+ shadow: shadowAlongSun(DEFAULT_SUN_DIRECTION, { target: [0, 3, 0], distance: 14.87, extent: 9, near: 0.1, far: 40 }),
};
},
@@ -854,7 +863,7 @@ export const REFERENCE_SCENES = {
parts, blenderWorld: lighting.blenderWorld,
environment: environment(lighting, { keyColor: SUN_COLOR }),
camera: { eye: [0, 1.8, 6], target: [0, 0.9, 0], up: [0, 1, 0], fov: 35, near: 0.1, far: 200 },
- shadow: { eye: [-6, 12, 8], target: [0, 0, 0], up: [0, 1, 0], extent: 6, near: 0.1, far: 40 },
+ shadow: shadowAlongSun(DEFAULT_SUN_DIRECTION, { target: [0, 0, 0], distance: 15.62, extent: 6, near: 0.1, far: 40 }),
};
},
@@ -870,7 +879,7 @@ export const REFERENCE_SCENES = {
parts, blenderWorld: lighting.blenderWorld,
environment: environment(lighting, { keyColor: SUN_COLOR }),
camera: { eye: [0, 2.2, 7], target: [0, 0.7, 0], up: [0, 1, 0], fov: 35, near: 0.1, far: 200 },
- shadow: { eye: [-6, 12, 8], target: [0, 0, 0], up: [0, 1, 0], extent: 6, near: 0.1, far: 40 },
+ shadow: shadowAlongSun(DEFAULT_SUN_DIRECTION, { target: [0, 0, 0], distance: 15.62, extent: 6, near: 0.1, far: 40 }),
};
},
@@ -887,7 +896,7 @@ export const REFERENCE_SCENES = {
parts, blenderWorld: lighting.blenderWorld,
environment: environment(lighting, { keyColor: SUN_COLOR }),
camera: { eye: [0, 2.2, 7], target: [0, 0.7, 0], up: [0, 1, 0], fov: 35, near: 0.1, far: 200 },
- shadow: { eye: [-6, 12, 8], target: [0, 0, 0], up: [0, 1, 0], extent: 6, near: 0.1, far: 40 },
+ shadow: shadowAlongSun(DEFAULT_SUN_DIRECTION, { target: [0, 0, 0], distance: 15.62, extent: 6, near: 0.1, far: 40 }),
};
},
@@ -904,7 +913,7 @@ export const REFERENCE_SCENES = {
parts, blenderWorld: lighting.blenderWorld,
environment: environment(lighting, { keyColor: SUN_COLOR }),
camera: { eye: [0, 2.2, 7], target: [0, 0.7, 0], up: [0, 1, 0], fov: 35, near: 0.1, far: 200 },
- shadow: { eye: [-6, 12, 8], target: [0, 0, 0], up: [0, 1, 0], extent: 6, near: 0.1, far: 40 },
+ shadow: shadowAlongSun(DEFAULT_SUN_DIRECTION, { target: [0, 0, 0], distance: 15.62, extent: 6, near: 0.1, far: 40 }),
};
},
@@ -924,7 +933,7 @@ export const REFERENCE_SCENES = {
parts, blenderWorld: lighting.blenderWorld,
environment: environment(lighting, { lightDirection: [-5, 6, 2], keyColor: [6, 5.6, 5], volumeFog }),
camera: { eye: [0, 1.6, 7], target: [0, 1.6, -4], up: [0, 1, 0], fov: 50, near: 0.1, far: 80 },
- shadow: { eye: [-10, 12, 4], target: [0, 0, -1], up: [0, 1, 0], extent: 12, near: 0.1, far: 50 },
+ shadow: shadowAlongSun([-5, 6, 2], { target: [0, 0, -1], distance: 16.4, extent: 12, near: 0.1, far: 50 }),
};
},
@@ -941,7 +950,7 @@ export const REFERENCE_SCENES = {
parts, blenderWorld: lighting.blenderWorld,
environment: environment(lighting, { keyColor: SUN_COLOR }),
camera: { eye: [0, 2, 10], target: [0, 1.5, 0], up: [0, 1, 0], fov: 45, near: 0.1, far: 300 },
- shadow: { eye: [-8, 14, 10], target: [0, 0, 0], up: [0, 1, 0], extent: 10, near: 0.1, far: 50 },
+ shadow: shadowAlongSun(DEFAULT_SUN_DIRECTION, { target: [0, 0, 0], distance: 18.97, extent: 10, near: 0.1, far: 50 }),
};
},
};
@@ -993,7 +1002,7 @@ async function clothScene({ kind, seconds }) {
camera: isBanner
? { eye: [1.2, 2.2, 6.5], target: [0.1, 1.9, 0.3], up: [0, 1, 0], fov: 35, near: 0.1, far: 200 }
: { eye: [2.6, 1.5, 3.6], target: [0, 0.5, 0], up: [0, 1, 0], fov: 35, near: 0.1, far: 200 },
- shadow: { eye: [-6, 12, 8], target: [0, 0, 0], up: [0, 1, 0], extent: 8, near: 0.1, far: 40 },
+ shadow: shadowAlongSun(DEFAULT_SUN_DIRECTION, { target: [0, 0, 0], distance: 15.62, extent: 8, near: 0.1, far: 40 }),
blenderCloth: {
part: 'cloth', segments: CLOTH_SEGMENTS, restMatrix, seconds, framesPerSecond: 60,
vertexMass: CLOTH_DENSITY * sheetArea / ((CLOTH_SEGMENTS + 1) ** 2),
diff --git a/bench/size/budgets.json b/bench/size/budgets.json
index e99087e2..2fa9e1f9 100644
--- a/bench/size/budgets.json
+++ b/bench/size/budgets.json
@@ -33,10 +33,10 @@
"entry:light-bake": 28500,
"entry:path-tracer": 14600,
"entry:texture-set": 900,
- "entry:agent-scene": 77300,
- "entry:agent-scene+lazy": 259200,
- "entry:agent-asset": 108600,
- "entry:agent-asset+lazy": 270800,
+ "entry:agent-scene": 77600,
+ "entry:agent-scene+lazy": 259500,
+ "entry:agent-asset": 108900,
+ "entry:agent-asset+lazy": 271100,
"entry:hdri": 3300,
"entry:camera-effects": 8600,
"entry:water-reflection": 26000,
@@ -44,10 +44,10 @@
"entry:material-layer-shaders": 20700,
"entry:light-linking": 19000,
"entry:cascaded-shadows": 27700,
- "scene:lit-box": 62800,
+ "scene:lit-box": 62900,
"scene:gltf-box": 84200,
"scene:gltf-box+lazy": 87600,
- "scene:agent-scene": 104400,
- "scene:agent-scene+lazy": 286300
+ "scene:agent-scene": 104700,
+ "scene:agent-scene+lazy": 286600
}
}
diff --git a/changes/206-shadow-follows-sun.md b/changes/206-shadow-follows-sun.md
new file mode 100644
index 00000000..35210e13
--- /dev/null
+++ b/changes/206-shadow-follows-sun.md
@@ -0,0 +1 @@
+- The sun shadow now follows the sun (part of issue #206). When `shadowBounds` gives no `eye`, `Renderer67` and the cascaded shadows derive it from `environment.lightDirection` (`src/shadow-light.js`) and redraw the map when the sun moves, and every reference scene aims its shadow map along its own sun; before, the default eye and several scene eyes sat a few degrees off the shading sun.
diff --git a/src/cascaded-shadows.js b/src/cascaded-shadows.js
index d24aa9b6..9e860a43 100644
--- a/src/cascaded-shadows.js
+++ b/src/cascaded-shadows.js
@@ -1,5 +1,6 @@
import { mat4, vec3 } from 'gl-matrix';
import { registerShaderFeatureCode } from './shaders.js';
+import { resolveShadowLight } from './shadow-light.js';
// Cascaded sun shadows. The camera frustum is cut into up to four slices by view depth; each slice gets its own depth
// map, fitted to a bounding sphere of the slice, so a shadow near the camera is sharp and a far one is coarse. Pass
@@ -23,8 +24,6 @@ const DEFAULT_CASTER_REACH = 200;
// A sampler that a program never sets reads unit 0, and the cascade array lives on unit 0, so the main program's other
// samplers are pinned to their own units here. These are the units renderer.js uses: the five maps on 1 to 5, the light map on 6, the local shadow atlas on 15.
const MAIN_SAMPLER_UNITS = { baseMap: 1, normalMap: 2, metallicRoughnessMap: 3, occlusionMap: 4, emissiveMap: 5, lightMap: 6, localShadowAtlas: 15 };
-// The light direction when the renderer's shadowBounds do not give one, as renderer.js defaults it.
-const DEFAULT_LIGHT_VIEWS = { world: { eye: [-25, 60, 30], target: [0, 2, -10] }, studio: { eye: [-3, 6, 4], target: [0, 1, 0] } };
const NDC_CORNERS = [[-1, -1], [1, -1], [-1, 1], [1, 1]];
const CASCADE_DECLARATIONS = `uniform highp sampler2DArray cascadeShadowMap;
@@ -196,7 +195,7 @@ export class CascadedShadows {
// Fits every slice to the current camera. Returns the number of slices whose matrix moved.
fitToCamera(renderer) {
- const light = { ...DEFAULT_LIGHT_VIEWS[renderer.world ? 'world' : 'studio'], ...renderer.shadowBounds };
+ const light = resolveShadowLight(renderer.world, renderer.activeLightDirection, renderer.shadowBounds);
const towardLight = vec3.normalize(vec3.create(), vec3.subtract(vec3.create(), light.eye, light.target));
const corners = frustumCorners(renderer.inverseViewProjection);
const nearDistance = viewDepthOf(corners[0], renderer.view);
diff --git a/src/renderer.js b/src/renderer.js
index 49d68b12..0de903fe 100644
--- a/src/renderer.js
+++ b/src/renderer.js
@@ -14,6 +14,7 @@ import { validateSkinGeometry, validateSkinPose, skinTextureLayout, packSkinInfl
import { validateSplatMaterial, splatBatchState, splatTextureBytes, resolveSplatSize, packSplatParameters, buildSplatPixels } from './splat.js';
import { materialLayerState, materialLayerValue } from './material-layers.js';
import { InstanceSelection, extractFrustumPlanes, geometryBoundingSphere, selectInstances } from './render-culling.js';
+import { resolveShadowLight } from './shadow-light.js';
import { validateMorphGeometry, validateMorphPose, validateMorphTransform, packMorphTargets } from './morph.js';
const SHADOW_MAP_SIZE = 2048;
@@ -440,6 +441,7 @@ export class Renderer67 {
this.world = world;
this.environment = environment;
this.shadowBounds = shadowBounds;
+ this.activeLightDirection = environment.lightDirection ?? [-3, 6, 4];
this.shadowCascades = shadowCascades;
this.memoryBudgetMiB = memoryBudgetMiB;
this.hdr = Boolean(hdr && !benchmark && this.context.getExtension('EXT_color_buffer_float'));
@@ -1228,8 +1230,7 @@ export class Renderer67 {
context.drawBuffers([context.NONE]);
context.readBuffer(context.NONE);
if (context.checkFramebufferStatus(context.FRAMEBUFFER) !== context.FRAMEBUFFER_COMPLETE) throw new Error('Shadow framebuffer is incomplete.');
- const defaults = this.world ? { eye: [-25, 60, 30], target: [0, 2, -10], extent: 65, near: 1, far: 220 } : { eye: [-3, 6, 4], target: [0, 1, 0], extent: 3.5, near: 0.1, far: 15 };
- const light = { ...defaults, ...this.shadowBounds };
+ const light = resolveShadowLight(this.world, this.activeLightDirection, this.shadowBounds);
const lightView = mat4.lookAt(mat4.create(), light.eye, light.target, light.up ?? [0, 1, 0]);
mat4.ortho(this.lightProjection, -light.extent, light.extent, -light.extent, light.extent, light.near, light.far);
mat4.multiply(this.lightProjection, this.lightProjection, lightView);
@@ -1986,13 +1987,16 @@ export class Renderer67 {
if (!Number.isFinite(lightLength) || lightLength < 1e-6 || !Array.from(direction).every(component => typeof component === 'number' && Math.abs(component) <= 1e6)) throw new RangeError('Volume light direction must have a finite nonzero length and bounded components');
}
updateLightingState(this.lighting, environment, { world: this.world });
+ // The shadow view follows the sun, so a moved sun redraws the map.
+ const lightChanged = String(this.activeLightDirection) !== String(environment.lightDirection);
+ this.activeLightDirection = environment.lightDirection;
const start = performance.now();
const context = this.context;
this.beginGpuTiming();
const assemblyAmount = Math.max(0, Math.min(1, frame.assemblyAmount ?? 0));
// Swaying foliage moves every frame, so its shadow map is redrawn whenever time or wind changes.
const windChanged = this.updateWindState(frame);
- const casterChanged = this.assemblyAmount !== assemblyAmount || this.shadowsDirty || windChanged;
+ const casterChanged = this.assemblyAmount !== assemblyAmount || this.shadowsDirty || windChanged || lightChanged;
this.requireFeatureNames(shaderFeaturesOfLighting(this.lighting));
const passMode = this.preparePass(frame);
this.renderingPass = passMode > 0;
diff --git a/src/shadow-light.js b/src/shadow-light.js
new file mode 100644
index 00000000..8cc589cb
--- /dev/null
+++ b/src/shadow-light.js
@@ -0,0 +1,19 @@
+const DEFAULT_SUN_DIRECTION = [-3, 6, 4];
+const SHADOW_VIEWS = {
+ world: { distance: 75, target: [0, 2, -10], extent: 65, near: 1, far: 220 },
+ studio: { distance: 7.2, target: [0, 1, 0], extent: 3.5, near: 0.1, far: 15 },
+};
+
+/**
+ * The sun's shadow view for whatever `shadowBounds` leaves out. The eye sits on the sun's side of the target, so
+ * shadows fall the way the shading says the light travels. A `shadowBounds.eye` still wins.
+ */
+export function resolveShadowLight(world, lightDirection, shadowBounds = {}) {
+ const { distance, ...view } = SHADOW_VIEWS[world ? 'world' : 'studio'];
+ const target = shadowBounds.target ?? view.target;
+ const requested = lightDirection ?? DEFAULT_SUN_DIRECTION;
+ const direction = Math.hypot(requested[0], requested[1], requested[2]) > 1e-6 ? requested : DEFAULT_SUN_DIRECTION;
+ const length = Math.hypot(direction[0], direction[1], direction[2]);
+ const eye = target.map((value, axis) => value + (direction[axis] / length) * distance);
+ return { ...view, eye, ...shadowBounds, target };
+}
diff --git a/tests/shadow-light.test.js b/tests/shadow-light.test.js
new file mode 100644
index 00000000..6bf75093
--- /dev/null
+++ b/tests/shadow-light.test.js
@@ -0,0 +1,31 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import { resolveShadowLight } from '../src/shadow-light.js';
+
+function directionBetween(light) {
+ const offset = light.eye.map((value, axis) => value - light.target[axis]);
+ const length = Math.hypot(...offset);
+ return offset.map(value => value / length);
+}
+
+test('the default shadow eye sits along the sun direction', () => {
+ for (const world of [false, true]) {
+ for (const sun of [[-3, 6, 4], [0.85, 0.2, -0.25], [5, 5, 0]]) {
+ const length = Math.hypot(...sun);
+ const light = resolveShadowLight(world, sun);
+ directionBetween(light).forEach((component, axis) => assert.ok(Math.abs(component - sun[axis] / length) < 1e-9));
+ }
+ }
+});
+
+test('an explicit shadow eye wins and a custom target moves the derived eye', () => {
+ assert.deepEqual(resolveShadowLight(false, [0, 1, 0], { eye: [1, 2, 3] }).eye, [1, 2, 3]);
+ const moved = resolveShadowLight(false, [0, 1, 0], { target: [4, 0, 0] });
+ assert.equal(moved.eye[0], 4);
+ assert.ok(moved.eye[1] > 1);
+});
+
+test('a missing or zero sun falls back to the default direction', () => {
+ assert.deepEqual(resolveShadowLight(true, undefined).eye, resolveShadowLight(true, [-3, 6, 4]).eye);
+ assert.deepEqual(resolveShadowLight(true, [0, 0, 0]).eye, resolveShadowLight(true, [-3, 6, 4]).eye);
+});