Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed acacia colours

Browse Source
This commit is contained in:
Joshua Barretto 2019-07-08 20:28:48 +01:00
parent 8e8bad137a
commit 879789ecc4
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/world/structure/natural/witch-hut.vox (Stored with Git LFS)
View File

Binary file not shown.

2
common/src/terrain/structure.rs
View File

@ -12,6 +12,7 @@ use vek::*;
pub enum StructureBlock {
TemperateLeaves,
PineLeaves,
Acacia,
PalmLeaves,
Block(Block),
}
@ -90,6 +91,7 @@ impl Asset for Structure {
0 => StructureBlock::TemperateLeaves,
1 => StructureBlock::PineLeaves,
2 => StructureBlock::PalmLeaves,
4 => StructureBlock::Acacia,
index => {
let color = palette
.get(index as usize)

9
world/src/block/mod.rs
View File

@ -318,6 +318,15 @@ impl<'a> BlockGen<'a> {
)
.map(|e| e as u8),
),
StructureBlock::Acacia => Block::new(
1,
Lerp::lerp(
Rgb::new(60.0, 165.0, 20.0),
Rgb::new(150.0, 245.0, 30.0),
lerp,
)
.map(|e| e as u8),
),
StructureBlock::Block(block) => block,
}
}

2
world/src/block/natural.rs
View File

@ -421,7 +421,7 @@ lazy_static! {
pub static ref QUIRKY: Vec<Arc<Structure>> = vec![
st_asset("world/structure/natural/tower-ruin.vox", (11, 14, 5)),
st_asset("world/structure/natural/witch-hut.vox", (10, 13, 3)),
st_asset("world/structure/natural/witch-hut.vox", (10, 13, 9)),
];
pub static ref QUIRKY_DRY: Vec<Arc<Structure>> = vec![