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 tent

Browse Source
This commit is contained in:
Vechro 2019-07-23 14:38:56 +03:00 committed by Pfauenauge90
parent 215a2640f4
commit f3c5ece983
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/tent.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

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

@ -27,6 +27,7 @@ pub enum Body {
PotionGreen,
PotionRed,
Crate,
Tent,
}
impl Body {
@ -36,7 +37,7 @@ impl Body {
}
}
const ALL_OBJECTS: [Body; 25] = [
const ALL_OBJECTS: [Body; 26] = [
Body::Bomb,
Body::Scarecrow,
Body::Cauldron,
@ -62,4 +63,5 @@ const ALL_OBJECTS: [Body; 25] = [
Body::PotionBlue,
Body::PotionGreen,
Body::Crate,
Body::Tent,
];

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

@ -547,6 +547,7 @@ impl FigureModelCache {
object::Body::PotionBlue => ("object/potion_blue.vox", Vec3::new(-2.0, -2.0, 0.0)),
object::Body::PotionGreen => ("object/potion_green.vox", Vec3::new(-2.0, -2.0, 0.0)),
object::Body::Crate => ("object/crate.vox", Vec3::new(-7.0, -7.0, 0.0)),
object::Body::Tent => ("object/tent.vox", Vec3::new(-18.5, -19.5, 0.0)),
};
Self::load_mesh(name, offset)
}