From e6f1dfeeac4947817ab5b05082290cce1630e1d1 Mon Sep 17 00:00:00 2001 From: Kevin Reid Date: Thu, 8 Aug 2024 21:46:12 -0700 Subject: [PATCH] content: Adjust jetpack exhaust emission. Part of fixing . Previously, emission would be reduced by alpha, which I am now defining to be the wrong approach. So, within the new paradigm, the jetpack exhaust needs to be dimmer to produce the desired visual results. The good(?) news is, this means the jetpack no longer lights up brightly because the new rendering better matches what light propagation does. This commit makes the renderer tests pass again by blessing the new `icons` output. --- all-is-cubes/src/inv/icons.rs | 2 +- .../expected/renderers/icons-all.png | Bin 4239 -> 4026 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/all-is-cubes/src/inv/icons.rs b/all-is-cubes/src/inv/icons.rs index 5ca3c57d2..f2b2d4f68 100644 --- a/all-is-cubes/src/inv/icons.rs +++ b/all-is-cubes/src/inv/icons.rs @@ -209,7 +209,7 @@ impl Icons { let exhaust = if active { Block::builder() .color(rgba_const!(1.0, 1.0, 1.0, 0.1)) - .light_emission(rgb_const!(1.0, 0.8, 0.8) * 10.0) + .light_emission(rgb_const!(1.0, 0.8, 0.8) * 1.0) .build() } else { AIR diff --git a/test-renderers/expected/renderers/icons-all.png b/test-renderers/expected/renderers/icons-all.png index aad16e54ebf340a728ab6ce366465ad65ddd67e5..ed16965734d2991b406c39305e8aa2b83fccb8eb 100644 GIT binary patch literal 4026 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 Bpfdmf literal 4239 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