From f3c5ece9838ceb338fa7f08f540405143d66ccb1 Mon Sep 17 00:00:00 2001
From: Vechro <stenmr@gmail.com>
Date: Tue, 23 Jul 2019 14:38:56 +0300
Subject: [PATCH] Add tent

---
 assets/voxygen/voxel/object/tent.vox | 3 +++
 common/src/comp/body/object.rs       | 4 +++-
 voxygen/src/scene/figure.rs          | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 assets/voxygen/voxel/object/tent.vox

diff --git a/assets/voxygen/voxel/object/tent.vox b/assets/voxygen/voxel/object/tent.vox
new file mode 100644
index 0000000000..309ec9e4ff
--- /dev/null
+++ b/assets/voxygen/voxel/object/tent.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:61b3234033b22364675297c9064eb61b2fc796a4d05e3154ae95fa744d25d0d2
+size 11248
diff --git a/common/src/comp/body/object.rs b/common/src/comp/body/object.rs
index 6cc7d1fb5d..321229c07f 100644
--- a/common/src/comp/body/object.rs
+++ b/common/src/comp/body/object.rs
@@ -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,
 ];
diff --git a/voxygen/src/scene/figure.rs b/voxygen/src/scene/figure.rs
index f75e852870..5fc1d43bf9 100644
--- a/voxygen/src/scene/figure.rs
+++ b/voxygen/src/scene/figure.rs
@@ -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)
     }