neocturne/MinedMap
1
0
Fork 0
mirror of https://github.com/neocturne/MinedMap.git synced 2025-03-05 17:44:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

resource/block_color: actually apply grass color modifiers to grass

Browse source 
Apply the modifiers to grass, not to foliage.
This commit is contained in:
Matthias Schiffer 2023-07-04 00:21:27 +02:00
parent d84e2ca49d
commit c472b61ef7
Signed by: neocturne
GPG key ID: 16EF3F64CB201D9C
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/resource/block_color.rs
View file

@ -25,39 +25,39 @@ trait BiomeExt {
impl BiomeExt for Biome { impl BiomeExt for Biome {
fn grass_color(&self, depth: f32) -> Vec3 { fn grass_color(&self, depth: f32) -> Vec3 {
use super::BiomeGrassColorModifier::*;
const GRASS_COLORS: [Vec3; 3] = [ const GRASS_COLORS: [Vec3; 3] = [
Vec3::new(0.502, 0.706, 0.592), // lower right Vec3::new(0.502, 0.706, 0.592), // lower right
Vec3::new(0.247, 0.012, -0.259), // lower left - lower right Vec3::new(0.247, 0.012, -0.259), // lower left - lower right
Vec3::new(-0.471, 0.086, -0.133), // upper left - lower left Vec3::new(-0.471, 0.086, -0.133), // upper left - lower left
]; ];
const DARK_FOREST_GRASS_COLOR: Vec3 = Vec3::new(0.157, 0.204, 0.039); // == color_vec(Color([40, 52, 10]))
const SWAMP_GRASS_COLOR: Vec3 = Vec3::new(0.416, 0.439, 0.224); // == color_vec(Color([106, 112, 57]))
self.grass_color let regular_color = || {
.map(color_vec) self.grass_color
.unwrap_or_else(|| color_from_params(&GRASS_COLORS, self, depth)) .map(color_vec)
.unwrap_or_else(|| color_from_params(&GRASS_COLORS, self, depth))
};
match self.grass_color_modifier {
Some(DarkForest) => 0.5 * (regular_color() + DARK_FOREST_GRASS_COLOR),
Some(Swamp) => SWAMP_GRASS_COLOR,
None => regular_color(),
}
} }
fn foliage_color(&self, depth: f32) -> Vec3 { fn foliage_color(&self, depth: f32) -> Vec3 {
use super::BiomeGrassColorModifier::*;
const FOLIAGE_COLORS: [Vec3; 3] = [ const FOLIAGE_COLORS: [Vec3; 3] = [
Vec3::new(0.376, 0.631, 0.482), // lower right Vec3::new(0.376, 0.631, 0.482), // lower right
Vec3::new(0.306, 0.012, -0.317), // lower left - lower right Vec3::new(0.306, 0.012, -0.317), // lower left - lower right
Vec3::new(-0.580, 0.106, -0.165), // upper left - lower left Vec3::new(-0.580, 0.106, -0.165), // upper left - lower left
]; ];
const DARK_FOREST_COLOR: Vec3 = Vec3::new(0.157, 0.204, 0.039); // == color_vec(Color([40, 52, 10]))
const SWAMP_FOLIAGE_COLOR: Vec3 = Vec3::new(0.416, 0.439, 0.224); // == color_vec(Color([106, 112, 57]))
let regular_color = || { self.foliage_color
self.foliage_color .map(color_vec)
.map(color_vec) .unwrap_or_else(|| color_from_params(&FOLIAGE_COLORS, self, depth))
.unwrap_or_else(|| color_from_params(&FOLIAGE_COLORS, self, depth))
};
match self.grass_color_modifier {
Some(DarkForest) => 0.5 * (regular_color() + DARK_FOREST_COLOR),
Some(Swamp) => SWAMP_FOLIAGE_COLOR,
None => regular_color(),
}
} }
fn water_color(&self) -> Vec3 { fn water_color(&self) -> Vec3 {