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

Add cauldron

Browse Source
This commit is contained in:
Vechro 2019-07-22 15:23:22 +03:00 committed by Pfauenauge90
parent 870229cd1c
commit 81f66457de
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/voxygen/voxel/object/cauldron.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

4
common/src/comp/body/object.rs
View File

@ -4,6 +4,7 @@ use rand::{seq::SliceRandom, thread_rng};
pub enum Body { pub enum Body {
Bomb, Bomb,
Scarecrow, Scarecrow,
Cauldron,
ChestVines, ChestVines,
Chest, Chest,
ChestDark, ChestDark,
@ -35,9 +36,10 @@ impl Body {
} }
} }
const ALL_OBJECTS: [Body; 24] = [ const ALL_OBJECTS: [Body; 25] = [
Body::Bomb, Body::Bomb,
Body::Scarecrow, Body::Scarecrow,
Body::Cauldron,
Body::ChestVines, Body::ChestVines,
Body::Chest, Body::Chest,
Body::ChestDark, Body::ChestDark,

1
voxygen/src/scene/figure.rs
View File

@ -516,6 +516,7 @@ impl FigureModelCache {
let (name, offset) = match obj { let (name, offset) = match obj {
object::Body::Bomb => ("object/bomb.vox", Vec3::new(-5.5, -5.5, 0.0)), object::Body::Bomb => ("object/bomb.vox", Vec3::new(-5.5, -5.5, 0.0)),
object::Body::Scarecrow => ("object/scarecrow.vox", Vec3::new(-9.5, -4.0, 0.0)), object::Body::Scarecrow => ("object/scarecrow.vox", Vec3::new(-9.5, -4.0, 0.0)),
object::Body::Cauldron => ("object/cauldron.vox", Vec3::new(-10.0, -10.0, 0.0)),
object::Body::ChestVines => ("object/chest_vines.vox", Vec3::new(-7.5, -6.0, 0.0)), object::Body::ChestVines => ("object/chest_vines.vox", Vec3::new(-7.5, -6.0, 0.0)),
object::Body::Chest => ("object/chest.vox", Vec3::new(-7.5, -6.0, 0.0)), object::Body::Chest => ("object/chest.vox", Vec3::new(-7.5, -6.0, 0.0)),
object::Body::ChestDark => ("object/chest_dark.vox", Vec3::new(-7.5, -6.0, 0.0)), object::Body::ChestDark => ("object/chest_dark.vox", Vec3::new(-7.5, -6.0, 0.0)),