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

scarecrow

Browse Source
This commit is contained in:
Pfauenauge90 2020-04-19 19:59:59 +02:00 committed by Joshua Barretto
parent 27dab981d2
commit db5311189d
3 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/voxygen/voxel/sprite/misc/scarecrow.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

4
common/src/terrain/block.rs
View File

@ -55,6 +55,7 @@ pub enum BlockKind {
Window2,
Window3,
Window4,
Scarecrow,
}
impl BlockKind {
@ -110,6 +111,7 @@ impl BlockKind {
BlockKind::Radish => true,
BlockKind::Turnip => true,
BlockKind::Coconut => true,
BlockKind::Scarecrow => true,
_ => false,
}
}
@ -169,6 +171,7 @@ impl BlockKind {
BlockKind::Window2 => false,
BlockKind::Window3 => false,
BlockKind::Window4 => false,
BlockKind::Scarecrow => false,
_ => true,
}
}
@ -215,6 +218,7 @@ impl BlockKind {
BlockKind::Radish => false,
BlockKind::Turnip => false,
BlockKind::Coconut => false,
BlockKind::Scarecrow => true,
_ => true,
}
}

12
voxygen/src/scene/terrain.rs
View File

@ -230,6 +230,10 @@ fn sprite_config_for(kind: BlockKind) -> Option<SpriteConfig> {
variations: 1,
wind_sway: 0.0,
}),
BlockKind::Scarecrow => Some(SpriteConfig {
variations: 1,
wind_sway: 0.0,
}),
_ => None,
}
}
@ -1559,6 +1563,14 @@ impl<V: RectRasterableVol> Terrain<V> {
Vec3::new(-6.0, -6.0, 0.0),
),
),
// Scarecrow
(
(BlockKind::Scarecrow, 0),
make_model(
"voxygen.voxel.sprite.misc.scarecrow",
Vec3::new(-9.5, -3.0, -0.25),
),
),
]
.into_iter()
.collect(),