neocturne/MinedMap
1
0
Fork 0
mirror of https://github.com/neocturne/MinedMap.git synced 2025-07-01 05:29:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

resource: do not require Biome to get color for all block types

Browse source 
Only grass, foliage and water have biome-dependent colors.
This commit is contained in:
Matthias Schiffer 2023-08-03 18:28:57 +02:00
parent 45171aa26a
commit 0a485343a0
Signed by: neocturne
GPG key ID: 16EF3F64CB201D9C
3 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/resource/block_color.rs
View file

@ -72,16 +72,24 @@ impl BiomeExt for Biome {
const BIRCH_COLOR: Vec3 = Vec3::new(0.502, 0.655, 0.333); // == color_vec(Color([128, 167, 85]))
const EVERGREEN_COLOR: Vec3 = Vec3::new(0.380, 0.600, 0.380); // == color_vec(Color([97, 153, 97]))
pub fn block_color(block: BlockType, biome: &Biome, depth: f32) -> [u8; 4] {
pub fn needs_biome(block: BlockType) -> bool {
use super::BlockFlag::*;
block.is(Grass) || block.is(Foliage) || block.is(Water)
}
pub fn block_color(block: BlockType, biome: Option<&Biome>, depth: f32) -> [u8; 4] {
use super::BlockFlag::*;
let get_biome = || biome.expect("needs biome to determine block color");
let mut color = color_vec_unscaled(block.color);
if block.is(Grass) {
color *= biome.grass_color(depth);
color *= get_biome().grass_color(depth);
}
if block.is(Foliage) {
color *= biome.foliage_color(depth);
color *= get_biome().foliage_color(depth);
}
if block.is(Birch) {
color *= BIRCH_COLOR;
@ -90,7 +98,7 @@ pub fn block_color(block: BlockType, biome: &Biome, depth: f32) -> [u8; 4] {
color *= EVERGREEN_COLOR;
}
if block.is(Water) {
color *= biome.water_color();
color *= get_biome().water_color();
}
color *= 0.5 + 0.005 * depth;