Use per-face colors in light propagation.

kpreid · Nov 16, 2023 · b5e3cbc · b5e3cbc
1 parent f4bd20f
commit b5e3cbc
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/all-is-cubes-desktop/tests/end-to-end/output-path-with-graphics.stdout b/all-is-cubes-desktop/tests/end-to-end/output-path-with-graphics.stdout
@@ -1,5 +1,5 @@
-[?25l[0m[38;5;0m[49m                            [38;5;145m[49m▄[38;5;235m[49m▄[38;5;246m[49m▄[38;5;236m[49m▄[38;5;246m[49m▄▄[38;5;145m[49m▄[38;5;235m[49m▄▄[38;5;236m[49m▄[38;5;245m[49m▄▄[0m
-[38;5;0m[49m                            [38;5;145m[48;5;138m▄[38;5;145m[48;5;235m▄[38;5;236m[48;5;245m▄[39m[48;5;246m▄[38;5;246m[48;5;245m▄[39m[48;5;245m▄[38;5;236m[48;5;145m▄[38;5;145m[48;5;235m▄▄[39m[48;5;235m▄[38;5;145m[48;5;245m▄[38;5;138m[48;5;245m▄[0m
+[?25l[0m[38;5;0m[49m                            [38;5;145m[49m▄[38;5;235m[49m▄[38;5;246m[49m▄[38;5;236m[49m▄[38;5;246m[49m▄▄[38;5;145m[49m▄[38;5;235m[49m▄▄[38;5;236m[49m▄[38;5;246m[49m▄▄[0m
+[38;5;0m[49m                            [38;5;145m[48;5;138m▄[38;5;145m[48;5;235m▄[38;5;236m[48;5;246m▄[39m[48;5;246m▄[38;5;247m[48;5;246m▄[39m[48;5;245m▄[38;5;236m[48;5;145m▄[38;5;145m[48;5;235m▄▄[39m[48;5;235m▄[38;5;145m[48;5;245m▄▄[0m
 [38;5;0m[49m                                        [0m
 [38;5;0m[49m                                        [0m
 [38;5;0m[49m                                        [0m

diff --git a/all-is-cubes/src/block/evaluated.rs b/all-is-cubes/src/block/evaluated.rs
@@ -7,7 +7,7 @@ use euclid::Vector3D;
 use ordered_float::NotNan;
 
 use crate::content::palette;
-use crate::math::{Cube, Face6, FaceMap, GridAab, OpacityCategory, Rgb, Rgba, Vol};
+use crate::math::{Cube, Face6, Face7, FaceMap, GridAab, OpacityCategory, Rgb, Rgba, Vol};
 use crate::raytracer;
 use crate::universe::RefError;
 use crate::{
@@ -314,6 +314,13 @@ impl EvaluatedBlock {
         self.voxels.bounds()
     }
 
+    pub(crate) fn face7_color(&self, face: Face7) -> Rgba {
+        match Face6::try_from(face) {
+            Ok(face) => self.face_colors[face],
+            Err(_) => self.color,
+        }
+    }
+
     /// Expresses the opacity of the block as an [`OpacityCategory`].
     ///
     /// If the return value is [`OpacityCategory::Partial`], this does not necessarily mean

diff --git a/all-is-cubes/src/space/light/updater.rs b/all-is-cubes/src/space/light/updater.rs
@@ -688,7 +688,8 @@ impl LightBuffer {
             }
             let stored_light = current_light.get(light_cube);
 
-            let surface_color = ev_hit.color.clamp().to_rgb() * SURFACE_ABSORPTION
+            let surface_color = ev_hit.face7_color(hit.face()).clamp().to_rgb()
+                * SURFACE_ABSORPTION
                 + Rgb::ONE * (1. - SURFACE_ABSORPTION);
             let light_from_struck_face =
                 ev_hit.light_emission + stored_light.value() * surface_color;
@@ -728,7 +729,11 @@ impl LightBuffer {
             // as opposed to passing through it.
             // The block evaluation algorithm incidentally computes a suitable
             // approximation as an alpha value.
-            let coverage = ev_hit.color.alpha().into_inner().clamp(0.0, 1.0);
+            let coverage = ev_hit
+                .face7_color(hit.face())
+                .alpha()
+                .into_inner()
+                .clamp(0.0, 1.0);
             self.incoming_light += (ev_hit.light_emission + stored_light)
                 * coverage
                 * ray_state.alpha

diff --git a/test-renderers/expected/icons-all.png b/test-renderers/expected/icons-all.png