From 7a141ad111922fa022cee7c84c5ba559984005cd Mon Sep 17 00:00:00 2001 From: Pfauenauge90 <44173739+Pfauenauge90@users.noreply.github.com> Date: Wed, 24 Jul 2019 02:49:16 +0200 Subject: [PATCH] More objects --- assets/voxygen/voxel/object/anvil.vox | 3 +++ assets/voxygen/voxel/object/bed_blue.vox | 3 +++ assets/voxygen/voxel/object/bench.vox | 3 +++ assets/voxygen/voxel/object/carpet1.vox | 3 +++ assets/voxygen/voxel/object/chair.vox | 3 +++ assets/voxygen/voxel/object/door_spooky.vox | 3 +++ assets/voxygen/voxel/object/drawer.vox | 3 +++ assets/voxygen/voxel/object/gravestone1.vox | 3 +++ assets/voxygen/voxel/object/gravestone2.vox | 3 +++ assets/voxygen/voxel/object/table.vox | 3 +++ assets/voxygen/voxel/object/window_spooky.vox | 3 +++ common/src/comp/body/object.rs | 24 ++++++++++++++++++- server/src/cmd.rs | 10 ++++++++ voxygen/src/scene/figure.rs | 11 +++++++++ 14 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 assets/voxygen/voxel/object/anvil.vox create mode 100644 assets/voxygen/voxel/object/bed_blue.vox create mode 100644 assets/voxygen/voxel/object/bench.vox create mode 100644 assets/voxygen/voxel/object/carpet1.vox create mode 100644 assets/voxygen/voxel/object/chair.vox create mode 100644 assets/voxygen/voxel/object/door_spooky.vox create mode 100644 assets/voxygen/voxel/object/drawer.vox create mode 100644 assets/voxygen/voxel/object/gravestone1.vox create mode 100644 assets/voxygen/voxel/object/gravestone2.vox create mode 100644 assets/voxygen/voxel/object/table.vox create mode 100644 assets/voxygen/voxel/object/window_spooky.vox diff --git a/assets/voxygen/voxel/object/anvil.vox b/assets/voxygen/voxel/object/anvil.vox new file mode 100644 index 0000000000..5c801a2586 --- /dev/null +++ b/assets/voxygen/voxel/object/anvil.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:efa901f8c256ca65e71fd240ab27877839c867276878a4403ca33e3947cc52d6 +size 56637 diff --git a/assets/voxygen/voxel/object/bed_blue.vox b/assets/voxygen/voxel/object/bed_blue.vox new file mode 100644 index 0000000000..23f77ac032 --- /dev/null +++ b/assets/voxygen/voxel/object/bed_blue.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c0425b495101cf3ea75e1bf2a9d17d2196c016a670a376fe235f44664b558ee6 +size 60541 diff --git a/assets/voxygen/voxel/object/bench.vox b/assets/voxygen/voxel/object/bench.vox new file mode 100644 index 0000000000..22846826b5 --- /dev/null +++ b/assets/voxygen/voxel/object/bench.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f956ba5f857163cbba699cc497f6d40db3a8ae7ba215b37806daddfc7d43cb5d +size 56305 diff --git a/assets/voxygen/voxel/object/carpet1.vox b/assets/voxygen/voxel/object/carpet1.vox new file mode 100644 index 0000000000..8929e0cf53 --- /dev/null +++ b/assets/voxygen/voxel/object/carpet1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd7bc5401d7b1f2dec05f6c306940c08bfdbdc9b685b64eb3a869f391b4f7c47 +size 58661 diff --git a/assets/voxygen/voxel/object/chair.vox b/assets/voxygen/voxel/object/chair.vox new file mode 100644 index 0000000000..c137e0c605 --- /dev/null +++ b/assets/voxygen/voxel/object/chair.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:861f2aee863abe8b9b612abbd753ccf9a4c966ae392945624e903e8d79c8d7c7 +size 56093 diff --git a/assets/voxygen/voxel/object/door_spooky.vox b/assets/voxygen/voxel/object/door_spooky.vox new file mode 100644 index 0000000000..51f8eca2b8 --- /dev/null +++ b/assets/voxygen/voxel/object/door_spooky.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df6b8d028f0334f37746418b8317de992e1645ad8076eb084e5a210c0753e7cc +size 69180 diff --git a/assets/voxygen/voxel/object/drawer.vox b/assets/voxygen/voxel/object/drawer.vox new file mode 100644 index 0000000000..f05829b7d7 --- /dev/null +++ b/assets/voxygen/voxel/object/drawer.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d74477239c07cf089eca70397a099658dad7fff66d587b2d452f4eafed12d5b +size 58645 diff --git a/assets/voxygen/voxel/object/gravestone1.vox b/assets/voxygen/voxel/object/gravestone1.vox new file mode 100644 index 0000000000..56fc1d4707 --- /dev/null +++ b/assets/voxygen/voxel/object/gravestone1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4efe0580b5cccf7f9754703d032513984940bfdd044ac43dff2f79507624ae6e +size 56333 diff --git a/assets/voxygen/voxel/object/gravestone2.vox b/assets/voxygen/voxel/object/gravestone2.vox new file mode 100644 index 0000000000..dd4cab6027 --- /dev/null +++ b/assets/voxygen/voxel/object/gravestone2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:46c126ef04c3f242337d492240fee7464f82ead1c5dd20c0f9a776133e5d4b1c +size 57269 diff --git a/assets/voxygen/voxel/object/table.vox b/assets/voxygen/voxel/object/table.vox new file mode 100644 index 0000000000..a2a003fa1c --- /dev/null +++ b/assets/voxygen/voxel/object/table.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3ef4257a1c0d6ce67b8f7541097bf8cf5fa1689c94eaa7f2e127d13f112e024 +size 56853 diff --git a/assets/voxygen/voxel/object/window_spooky.vox b/assets/voxygen/voxel/object/window_spooky.vox new file mode 100644 index 0000000000..7360c573cc --- /dev/null +++ b/assets/voxygen/voxel/object/window_spooky.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:35944786a274f505a1733e95a3051c76e50e62425c3f44279d0e8027e6f531e6 +size 52396 diff --git a/common/src/comp/body/object.rs b/common/src/comp/body/object.rs index 321229c07f..9289c38607 100644 --- a/common/src/comp/body/object.rs +++ b/common/src/comp/body/object.rs @@ -28,6 +28,17 @@ pub enum Body { PotionRed, Crate, Tent, + WindowSpooky, + DoorSpooky, + Anvil, + Gravestone1, + Gravestone2, + Bench, + Chair, + Table, + Drawer, + BedBlue, + Carpet1, } impl Body { @@ -37,7 +48,7 @@ impl Body { } } -const ALL_OBJECTS: [Body; 26] = [ +const ALL_OBJECTS: [Body; 37] = [ Body::Bomb, Body::Scarecrow, Body::Cauldron, @@ -64,4 +75,15 @@ const ALL_OBJECTS: [Body; 26] = [ Body::PotionGreen, Body::Crate, Body::Tent, + Body::WindowSpooky, + Body::DoorSpooky, + Body::Anvil, + Body::Gravestone1, + Body::Gravestone2, + Body::Bench, + Body::Chair, + Body::Table, + Body::Drawer, + Body::BedBlue, + Body::Carpet1, ]; diff --git a/server/src/cmd.rs b/server/src/cmd.rs index c3b7b97c82..843c3e2710 100644 --- a/server/src/cmd.rs +++ b/server/src/cmd.rs @@ -487,6 +487,16 @@ fn handle_object(server: &mut Server, entity: EcsEntity, args: String, _action: Some("Crate") => comp::object::Body::Crate, Some("Tent") => comp::object::Body::Tent, Some("Bomb") => comp::object::Body::Bomb, + Some("Window_Spooky") => comp::object::Body::WindowSpooky, + Some("Carpet_1") => comp::object::Body::Carpet1, + Some("Table") => comp::object::Body::Table, + Some("Drawer") => comp::object::Body::Drawer, + Some("Bed_Blue") => comp::object::Body::BedBlue, + Some("Anvil") => comp::object::Body::Anvil, + Some("Gravestone_1") => comp::object::Body::Gravestone1, + Some("Gravestone_2") => comp::object::Body::Gravestone2, + Some("Chair") => comp::object::Body::Chair, + Some("Bench") => comp::object::Body::Bench, _ => { return server .clients diff --git a/voxygen/src/scene/figure.rs b/voxygen/src/scene/figure.rs index 5fc1d43bf9..6febf75cf8 100644 --- a/voxygen/src/scene/figure.rs +++ b/voxygen/src/scene/figure.rs @@ -548,6 +548,17 @@ impl FigureModelCache { 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)), + object::Body::WindowSpooky => ("object/window_spooky.vox", Vec3::new(-15.0, -1.5, 0.0)), + object::Body::DoorSpooky => ("object/door_spooky.vox", Vec3::new(-15.0, -4.5, 0.0)), + object::Body::Table => ("object/table.vox", Vec3::new(-15.0, -4.5, 0.0)), + object::Body::Drawer => ("object/drawer.vox", Vec3::new(-15.0, -4.5, 0.0)), + object::Body::BedBlue => ("object/bed_blue.vox", Vec3::new(-15.0, -4.5, 0.0)), + object::Body::Anvil => ("object/anvil.vox", Vec3::new(-15.0, -4.5, 0.0)), + object::Body::Gravestone1 => ("object/gravestone1.vox", Vec3::new(-15.0, -4.5, 0.0)), + object::Body::Gravestone2 => ("object/gravestone2.vox", Vec3::new(-15.0, -4.5, 0.0)), + object::Body::Chair => ("object/chair.vox", Vec3::new(-15.0, -4.5, 0.0)), + object::Body::Bench => ("object/bench.vox", Vec3::new(-15.0, -4.5, 0.0)), + object::Body::Carpet1 => ("object/carpet1.vox", Vec3::new(-14.0, -14.0, -0.5)), }; Self::load_mesh(name, offset) }