From 33565b9480b92da2ca83efb7475908f698535cb1 Mon Sep 17 00:00:00 2001 From: Monty Marz Date: Sun, 28 Jul 2019 09:21:17 +0000 Subject: [PATCH] added comment about object rotation, changed lantern spawning command, changed /tell output when you /tell yourself --- assets/voxygen/voxel/object/bed_blue.vox | 3 - .../voxygen/voxel/object/bed_human_blue.vox | 3 + assets/voxygen/voxel/object/bedroll.vox | 3 + assets/voxygen/voxel/object/campfire.vox | 4 +- .../voxel/object/{carpet1.vox => carpet.vox} | 0 .../voxel/object/carpet_human_round.vox | 3 + .../voxel/object/carpet_human_square.vox | 3 + .../voxel/object/carpet_human_square_2.vox | 3 + .../voxel/object/carpet_human_squircle.vox | 3 + assets/voxygen/voxel/object/chair.vox | 4 +- assets/voxygen/voxel/object/chair_2.vox | 3 + assets/voxygen/voxel/object/chair_3.vox | 3 + assets/voxygen/voxel/object/drawer.vox | 4 +- .../{gravestone1.vox => gravestone.vox} | 0 .../{gravestone2.vox => gravestone_2.vox} | 0 .../object/{pumpkin1.vox => pumpkin.vox} | 0 .../object/{pumpkin2.vox => pumpkin_2.vox} | 0 .../object/{pumpkin3.vox => pumpkin_3.vox} | 0 .../object/{pumpkin4.vox => pumpkin_4.vox} | 0 .../object/{pumpkin5.vox => pumpkin_5.vox} | 0 assets/voxygen/voxel/object/table.vox | 4 +- assets/voxygen/voxel/object/table_2.vox | 3 + assets/voxygen/voxel/object/table_3.vox | 3 + common/src/comp/body/object.rs | 32 +++-- server/src/cmd.rs | 117 ++++++++++++------ server/src/lib.rs | 3 + server/src/settings.rs | 6 +- voxygen/src/scene/figure.rs | 45 +++++-- 28 files changed, 178 insertions(+), 74 deletions(-) delete mode 100644 assets/voxygen/voxel/object/bed_blue.vox create mode 100644 assets/voxygen/voxel/object/bed_human_blue.vox create mode 100644 assets/voxygen/voxel/object/bedroll.vox rename assets/voxygen/voxel/object/{carpet1.vox => carpet.vox} (100%) create mode 100644 assets/voxygen/voxel/object/carpet_human_round.vox create mode 100644 assets/voxygen/voxel/object/carpet_human_square.vox create mode 100644 assets/voxygen/voxel/object/carpet_human_square_2.vox create mode 100644 assets/voxygen/voxel/object/carpet_human_squircle.vox create mode 100644 assets/voxygen/voxel/object/chair_2.vox create mode 100644 assets/voxygen/voxel/object/chair_3.vox rename assets/voxygen/voxel/object/{gravestone1.vox => gravestone.vox} (100%) rename assets/voxygen/voxel/object/{gravestone2.vox => gravestone_2.vox} (100%) rename assets/voxygen/voxel/object/{pumpkin1.vox => pumpkin.vox} (100%) rename assets/voxygen/voxel/object/{pumpkin2.vox => pumpkin_2.vox} (100%) rename assets/voxygen/voxel/object/{pumpkin3.vox => pumpkin_3.vox} (100%) rename assets/voxygen/voxel/object/{pumpkin4.vox => pumpkin_4.vox} (100%) rename assets/voxygen/voxel/object/{pumpkin5.vox => pumpkin_5.vox} (100%) create mode 100644 assets/voxygen/voxel/object/table_2.vox create mode 100644 assets/voxygen/voxel/object/table_3.vox diff --git a/assets/voxygen/voxel/object/bed_blue.vox b/assets/voxygen/voxel/object/bed_blue.vox deleted file mode 100644 index 23f77ac032..0000000000 --- a/assets/voxygen/voxel/object/bed_blue.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c0425b495101cf3ea75e1bf2a9d17d2196c016a670a376fe235f44664b558ee6 -size 60541 diff --git a/assets/voxygen/voxel/object/bed_human_blue.vox b/assets/voxygen/voxel/object/bed_human_blue.vox new file mode 100644 index 0000000000..1700734401 --- /dev/null +++ b/assets/voxygen/voxel/object/bed_human_blue.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7b8b6f8793c63953ae93cc096a9621fe2f759e47d681a533220fab6932b19ee +size 11776 diff --git a/assets/voxygen/voxel/object/bedroll.vox b/assets/voxygen/voxel/object/bedroll.vox new file mode 100644 index 0000000000..78562780d5 --- /dev/null +++ b/assets/voxygen/voxel/object/bedroll.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae74df38fcbc0ba5e9930db73f06740985bf2ce78258293d66451f64f193a3ad +size 51684 diff --git a/assets/voxygen/voxel/object/campfire.vox b/assets/voxygen/voxel/object/campfire.vox index 5954a62edc..2c56331ea3 100644 --- a/assets/voxygen/voxel/object/campfire.vox +++ b/assets/voxygen/voxel/object/campfire.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:114109dbfb927d4506f9f4ef81947ddf5378ce1430caf1f736c2b6738aeff08c -size 4648 +oid sha256:3fd5bfdf68d884cf10c4fa4795672d5a821fc0f2fe7a60bad45dd1e28ddb6622 +size 4116 diff --git a/assets/voxygen/voxel/object/carpet1.vox b/assets/voxygen/voxel/object/carpet.vox similarity index 100% rename from assets/voxygen/voxel/object/carpet1.vox rename to assets/voxygen/voxel/object/carpet.vox diff --git a/assets/voxygen/voxel/object/carpet_human_round.vox b/assets/voxygen/voxel/object/carpet_human_round.vox new file mode 100644 index 0000000000..249c0a2bc8 --- /dev/null +++ b/assets/voxygen/voxel/object/carpet_human_round.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af96d5214eac82ac9ae1c155e97a5c1c2fd536c4dd1d4fdcaecb0686b8da9964 +size 3560 diff --git a/assets/voxygen/voxel/object/carpet_human_square.vox b/assets/voxygen/voxel/object/carpet_human_square.vox new file mode 100644 index 0000000000..3bc8359271 --- /dev/null +++ b/assets/voxygen/voxel/object/carpet_human_square.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ef6c94b556720e1a1b00e4154f17198abd3f27a21d4ab1f8993807a6f2721fb +size 3912 diff --git a/assets/voxygen/voxel/object/carpet_human_square_2.vox b/assets/voxygen/voxel/object/carpet_human_square_2.vox new file mode 100644 index 0000000000..dbf83c9fb9 --- /dev/null +++ b/assets/voxygen/voxel/object/carpet_human_square_2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:955a12247908a33402dd07eed27923a72d70f258e64a68be385252f23dfb395b +size 3912 diff --git a/assets/voxygen/voxel/object/carpet_human_squircle.vox b/assets/voxygen/voxel/object/carpet_human_squircle.vox new file mode 100644 index 0000000000..3b12249f45 --- /dev/null +++ b/assets/voxygen/voxel/object/carpet_human_squircle.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a052f89cff67908c0821cc7fd5662b5089adbc2672f497a1afe48287c9dee7d3 +size 6856 diff --git a/assets/voxygen/voxel/object/chair.vox b/assets/voxygen/voxel/object/chair.vox index c137e0c605..18347d428d 100644 --- a/assets/voxygen/voxel/object/chair.vox +++ b/assets/voxygen/voxel/object/chair.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:861f2aee863abe8b9b612abbd753ccf9a4c966ae392945624e903e8d79c8d7c7 -size 56093 +oid sha256:6a2173d07123c2443f5b7488aad2a87550130cffbe6c297c78aefe868e9ab6c9 +size 2128 diff --git a/assets/voxygen/voxel/object/chair_2.vox b/assets/voxygen/voxel/object/chair_2.vox new file mode 100644 index 0000000000..3fd27c90e7 --- /dev/null +++ b/assets/voxygen/voxel/object/chair_2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a3b56d7dcba8b2586a6ab7a838d35388b40a1094bd4bea6429b08835774bda65 +size 2176 diff --git a/assets/voxygen/voxel/object/chair_3.vox b/assets/voxygen/voxel/object/chair_3.vox new file mode 100644 index 0000000000..ef2f64b5ec --- /dev/null +++ b/assets/voxygen/voxel/object/chair_3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:49cf2a1e8d19b9fb2521f720c18bc59149e45d100bf17350c23baedac9f0d88d +size 2128 diff --git a/assets/voxygen/voxel/object/drawer.vox b/assets/voxygen/voxel/object/drawer.vox index f05829b7d7..39fbfa05b8 100644 --- a/assets/voxygen/voxel/object/drawer.vox +++ b/assets/voxygen/voxel/object/drawer.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d74477239c07cf089eca70397a099658dad7fff66d587b2d452f4eafed12d5b -size 58645 +oid sha256:dd678500a404438544affd2edee7c3c8a20d235badbd18df92d7316a08135f8c +size 11272 diff --git a/assets/voxygen/voxel/object/gravestone1.vox b/assets/voxygen/voxel/object/gravestone.vox similarity index 100% rename from assets/voxygen/voxel/object/gravestone1.vox rename to assets/voxygen/voxel/object/gravestone.vox diff --git a/assets/voxygen/voxel/object/gravestone2.vox b/assets/voxygen/voxel/object/gravestone_2.vox similarity index 100% rename from assets/voxygen/voxel/object/gravestone2.vox rename to assets/voxygen/voxel/object/gravestone_2.vox diff --git a/assets/voxygen/voxel/object/pumpkin1.vox b/assets/voxygen/voxel/object/pumpkin.vox similarity index 100% rename from assets/voxygen/voxel/object/pumpkin1.vox rename to assets/voxygen/voxel/object/pumpkin.vox diff --git a/assets/voxygen/voxel/object/pumpkin2.vox b/assets/voxygen/voxel/object/pumpkin_2.vox similarity index 100% rename from assets/voxygen/voxel/object/pumpkin2.vox rename to assets/voxygen/voxel/object/pumpkin_2.vox diff --git a/assets/voxygen/voxel/object/pumpkin3.vox b/assets/voxygen/voxel/object/pumpkin_3.vox similarity index 100% rename from assets/voxygen/voxel/object/pumpkin3.vox rename to assets/voxygen/voxel/object/pumpkin_3.vox diff --git a/assets/voxygen/voxel/object/pumpkin4.vox b/assets/voxygen/voxel/object/pumpkin_4.vox similarity index 100% rename from assets/voxygen/voxel/object/pumpkin4.vox rename to assets/voxygen/voxel/object/pumpkin_4.vox diff --git a/assets/voxygen/voxel/object/pumpkin5.vox b/assets/voxygen/voxel/object/pumpkin_5.vox similarity index 100% rename from assets/voxygen/voxel/object/pumpkin5.vox rename to assets/voxygen/voxel/object/pumpkin_5.vox diff --git a/assets/voxygen/voxel/object/table.vox b/assets/voxygen/voxel/object/table.vox index a2a003fa1c..7e3378a785 100644 --- a/assets/voxygen/voxel/object/table.vox +++ b/assets/voxygen/voxel/object/table.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f3ef4257a1c0d6ce67b8f7541097bf8cf5fa1689c94eaa7f2e127d13f112e024 -size 56853 +oid sha256:1a046944ddf53582786e3abfd4ce6f246f5d20fa1b361ff1fc0ef99658155cc8 +size 4488 diff --git a/assets/voxygen/voxel/object/table_2.vox b/assets/voxygen/voxel/object/table_2.vox new file mode 100644 index 0000000000..1d4d12f99d --- /dev/null +++ b/assets/voxygen/voxel/object/table_2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa3a44a04bf5d18316f6e5bc82223b9ff7d5bf28302d8fe0f58eabbaa838fce6 +size 3528 diff --git a/assets/voxygen/voxel/object/table_3.vox b/assets/voxygen/voxel/object/table_3.vox new file mode 100644 index 0000000000..27ef9ac178 --- /dev/null +++ b/assets/voxygen/voxel/object/table_3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff10aa7ffb9d4cfc76341292c649acc9e5a3a3e9433fe53b7fcb9e447ae484d9 +size 4040 diff --git a/common/src/comp/body/object.rs b/common/src/comp/body/object.rs index 9289c38607..f45cea9d2e 100644 --- a/common/src/comp/body/object.rs +++ b/common/src/comp/body/object.rs @@ -13,7 +13,7 @@ pub enum Body { ChestLight, ChestOpen, ChestSkull, - Pumpkin1, + Pumpkin, Pumpkin2, Pumpkin3, Pumpkin4, @@ -31,14 +31,23 @@ pub enum Body { WindowSpooky, DoorSpooky, Anvil, - Gravestone1, + Gravestone, Gravestone2, Bench, Chair, + Chair2, + Chair3, Table, + Table2, + Table3, Drawer, BedBlue, - Carpet1, + Carpet, + Bedroll, + CarpetHumanRound, + CarpetHumanSquare, + CarpetHumanSquare2, + CarpetHumanSquircle, } impl Body { @@ -48,7 +57,7 @@ impl Body { } } -const ALL_OBJECTS: [Body; 37] = [ +const ALL_OBJECTS: [Body; 46] = [ Body::Bomb, Body::Scarecrow, Body::Cauldron, @@ -60,7 +69,7 @@ const ALL_OBJECTS: [Body; 37] = [ Body::ChestLight, Body::ChestOpen, Body::ChestSkull, - Body::Pumpkin1, + Body::Pumpkin, Body::Pumpkin2, Body::Pumpkin3, Body::Pumpkin4, @@ -78,12 +87,21 @@ const ALL_OBJECTS: [Body; 37] = [ Body::WindowSpooky, Body::DoorSpooky, Body::Anvil, - Body::Gravestone1, + Body::Gravestone, Body::Gravestone2, Body::Bench, Body::Chair, + Body::Chair2, + Body::Chair3, Body::Table, + Body::Table2, + Body::Table3, Body::Drawer, Body::BedBlue, - Body::Carpet1, + Body::Carpet, + Body::Bedroll, + Body::CarpetHumanRound, + Body::CarpetHumanSquare, + Body::CarpetHumanSquare2, + Body::CarpetHumanSquircle, ]; diff --git a/server/src/cmd.rs b/server/src/cmd.rs index 15eeb6f1a4..569d86eff9 100644 --- a/server/src/cmd.rs +++ b/server/src/cmd.rs @@ -484,57 +484,91 @@ fn handle_killnpcs(server: &mut Server, entity: EcsEntity, _args: String, _actio fn handle_object(server: &mut Server, entity: EcsEntity, args: String, _action: &ChatCommand) { let obj_type = scan_fmt!(&args, _action.arg_fmt, String); + let pos = server .state .ecs() .read_storage::() .get(entity) .copied(); - if let Some(pos) = pos { + let ori = server + .state + .ecs() + .read_storage::() + .get(entity) + .copied(); + /*let builder = server + .create_object(pos, ori, obj_type) + .with(ori);*/ + if let (Some(pos), Some(ori)) = (pos, ori) { let obj_type = match obj_type.as_ref().map(String::as_str) { - Some("Scarecrow") => comp::object::Body::Scarecrow, - Some("Cauldron") => comp::object::Body::Cauldron, - Some("Chest_Vines") => comp::object::Body::ChestVines, - Some("Chest") => comp::object::Body::Chest, - Some("Chest_Dark") => comp::object::Body::ChestDark, - Some("Chest_Demon") => comp::object::Body::ChestDemon, - Some("Chest_Gold") => comp::object::Body::ChestGold, - Some("Chest_Light") => comp::object::Body::ChestLight, - Some("Chest_Open") => comp::object::Body::ChestOpen, - Some("Chest_Skull") => comp::object::Body::ChestSkull, - Some("Pumpkin_1") => comp::object::Body::Pumpkin1, - Some("Pumpkin_2") => comp::object::Body::Pumpkin2, - Some("Pumpkin_3") => comp::object::Body::Pumpkin3, - Some("Pumpkin_4") => comp::object::Body::Pumpkin4, - Some("Pumpkin_5") => comp::object::Body::Pumpkin5, - Some("Campfire") => comp::object::Body::Campfire, - Some("Lantern_Ground") => comp::object::Body::LanternGround, - Some("Lantern_Ground_Open") => comp::object::Body::LanternGroundOpen, - Some("Lantern_Standing_2") => comp::object::Body::LanternStanding2, - Some("Lantern_Standing") => comp::object::Body::LanternStanding, - Some("Potion_Blue") => comp::object::Body::PotionBlue, - Some("Potion_Green") => comp::object::Body::PotionGreen, - Some("Potion_Red") => comp::object::Body::PotionRed, - 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, + Some("scarecrow") => comp::object::Body::Scarecrow, + Some("cauldron") => comp::object::Body::Cauldron, + Some("chest_vines") => comp::object::Body::ChestVines, + Some("chest") => comp::object::Body::Chest, + Some("chest_dark") => comp::object::Body::ChestDark, + Some("chest_demon") => comp::object::Body::ChestDemon, + Some("chest_gold") => comp::object::Body::ChestGold, + Some("chest_light") => comp::object::Body::ChestLight, + Some("chest_open") => comp::object::Body::ChestOpen, + Some("chest_skull") => comp::object::Body::ChestSkull, + Some("pumpkin") => comp::object::Body::Pumpkin, + Some("pumpkin_2") => comp::object::Body::Pumpkin2, + Some("pumpkin_3") => comp::object::Body::Pumpkin3, + Some("pumpkin_4") => comp::object::Body::Pumpkin4, + Some("pumpkin_5") => comp::object::Body::Pumpkin5, + Some("campfire") => comp::object::Body::Campfire, + Some("lantern_ground") => comp::object::Body::LanternGround, + Some("lantern_ground_open") => comp::object::Body::LanternGroundOpen, + Some("lantern_2") => comp::object::Body::LanternStanding2, + Some("lantern") => comp::object::Body::LanternStanding, + Some("potion_blue") => comp::object::Body::PotionBlue, + Some("potion_green") => comp::object::Body::PotionGreen, + Some("potion_red") => comp::object::Body::PotionRed, + 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("door_spooky") => comp::object::Body::DoorSpooky, + Some("carpet") => comp::object::Body::Carpet, + Some("table_human") => comp::object::Body::Table, + Some("table_human_2") => comp::object::Body::Table2, + Some("table_human_3") => comp::object::Body::Table3, + Some("drawer") => comp::object::Body::Drawer, + Some("bed_human_blue") => comp::object::Body::BedBlue, + Some("anvil") => comp::object::Body::Anvil, + Some("gravestone") => comp::object::Body::Gravestone, + Some("gravestone_2") => comp::object::Body::Gravestone2, + Some("chair") => comp::object::Body::Chair, + Some("chair_2") => comp::object::Body::Chair2, + Some("chair_3") => comp::object::Body::Chair3, + Some("bench_human") => comp::object::Body::Bench, + Some("bedroll") => comp::object::Body::Bedroll, + Some("carpet_human_round") => comp::object::Body::CarpetHumanRound, + Some("carpet_human_square") => comp::object::Body::CarpetHumanSquare, + Some("carpet_human_square_2") => comp::object::Body::CarpetHumanSquare2, + Some("carpet_human_squircle") => comp::object::Body::CarpetHumanSquircle, _ => { return server .clients .notify(entity, ServerMsg::chat(String::from("Object not found!"))); } }; - server.create_object(pos, obj_type).build(); + server + .create_object(pos, ori, obj_type) + .with(comp::Ori( + // converts player orientation into a 90° rotation for the object by using the axis with the highest value + ori.0 + .map(|e| { + if e.abs() == ori.0.map(|e| e.abs()).reduce_partial_max() { + e + } else { + 0.0 + } + }) + .normalized(), + )) + .build(); server .clients .notify(entity, ServerMsg::chat(format!("Spawned object."))); @@ -668,9 +702,10 @@ fn handle_tell(server: &mut Server, entity: EcsEntity, args: String, action: &Ch ); } } else { - server - .clients - .notify(entity, ServerMsg::private(format!("Don't be crazy!"))); + server.clients.notify( + entity, + ServerMsg::private(format!("You can't /tell yourself.")), + ); } } None => { diff --git a/server/src/lib.rs b/server/src/lib.rs index 8cb4763bc4..902e86fc21 100644 --- a/server/src/lib.rs +++ b/server/src/lib.rs @@ -163,12 +163,14 @@ impl Server { pub fn create_object( &mut self, pos: comp::Pos, + ori: comp::Ori, object: comp::object::Body, ) -> EcsEntityBuilder { self.state .ecs_mut() .create_entity_synced() .with(pos) + .with(ori) .with(comp::Vel(Vec3::zero())) .with(comp::Ori(Vec3::unit_y())) .with(comp::Body::Object(object)) @@ -176,6 +178,7 @@ impl Server { offset: Vec3::unit_z(), ..comp::LightEmitter::default() }) + //.with(comp::LightEmitter::default()) .with(comp::ActionState::default()) .with(comp::ForceUpdate) } diff --git a/server/src/settings.rs b/server/src/settings.rs index e18b0db40d..a6d5cd5c45 100644 --- a/server/src/settings.rs +++ b/server/src/settings.rs @@ -19,10 +19,10 @@ impl Default for ServerSettings { Self { address: SocketAddr::from(([0; 4], 14004)), world_seed: 1337, - server_name: "Server name".to_owned(), + server_name: "Veloren Alpha".to_owned(), server_description: "This is the best Veloren server.".to_owned(), - max_players: 16, - start_time: 0.0, + max_players: 100, + start_time: 12.0 * 3600.0, } } } diff --git a/voxygen/src/scene/figure.rs b/voxygen/src/scene/figure.rs index 9152d33558..47ecbb8219 100644 --- a/voxygen/src/scene/figure.rs +++ b/voxygen/src/scene/figure.rs @@ -526,11 +526,11 @@ impl FigureModelCache { object::Body::ChestLight => ("object/chest_light.vox", Vec3::new(-7.5, -6.0, 0.0)), object::Body::ChestOpen => ("object/chest_open.vox", Vec3::new(-7.5, -6.0, 0.0)), object::Body::ChestSkull => ("object/chest_skull.vox", Vec3::new(-7.5, -6.0, 0.0)), - object::Body::Pumpkin1 => ("object/pumpkin1.vox", Vec3::new(-5.5, -4.0, 0.0)), - object::Body::Pumpkin2 => ("object/pumpkin2.vox", Vec3::new(-5.0, -4.0, 0.0)), - object::Body::Pumpkin3 => ("object/pumpkin3.vox", Vec3::new(-5.0, -4.0, 0.0)), - object::Body::Pumpkin4 => ("object/pumpkin4.vox", Vec3::new(-5.0, -4.0, 0.0)), - object::Body::Pumpkin5 => ("object/pumpkin5.vox", Vec3::new(-4.0, -5.0, 0.0)), + object::Body::Pumpkin => ("object/pumpkin.vox", Vec3::new(-5.5, -4.0, 0.0)), + object::Body::Pumpkin2 => ("object/pumpkin_2.vox", Vec3::new(-5.0, -4.0, 0.0)), + object::Body::Pumpkin3 => ("object/pumpkin_3.vox", Vec3::new(-5.0, -4.0, 0.0)), + object::Body::Pumpkin4 => ("object/pumpkin_4.vox", Vec3::new(-5.0, -4.0, 0.0)), + object::Body::Pumpkin5 => ("object/pumpkin_5.vox", Vec3::new(-4.0, -5.0, 0.0)), object::Body::Campfire => ("object/campfire.vox", Vec3::new(-9.0, -10.0, 0.0)), object::Body::LanternGround => { ("object/lantern_ground.vox", Vec3::new(-3.5, -3.5, 0.0)) @@ -553,15 +553,36 @@ impl FigureModelCache { ("object/window_spooky.vox", Vec3::new(-15.0, -1.5, -1.0)) } object::Body::DoorSpooky => ("object/door_spooky.vox", Vec3::new(-15.0, -4.5, 0.0)), - object::Body::Table => ("object/table.vox", Vec3::new(-12.0, -6.0, 0.0)), - object::Body::Drawer => ("object/drawer.vox", Vec3::new(-6.5, -6.5, 0.0)), - object::Body::BedBlue => ("object/bed_blue.vox", Vec3::new(-8.5, -5.0, 0.0)), + object::Body::Table => ("object/table.vox", Vec3::new(-12.0, -8.0, 0.0)), + object::Body::Table2 => ("object/table_2.vox", Vec3::new(-8.0, -8.0, 0.0)), + object::Body::Table3 => ("object/table_3.vox", Vec3::new(-10.0, -10.0, 0.0)), + object::Body::Drawer => ("object/drawer.vox", Vec3::new(-11.0, -7.5, 0.0)), + object::Body::BedBlue => ("object/bed_human_blue.vox", Vec3::new(-11.0, -15.0, 0.0)), object::Body::Anvil => ("object/anvil.vox", Vec3::new(-3.0, -7.0, 0.0)), - object::Body::Gravestone1 => ("object/gravestone1.vox", Vec3::new(-5.0, -2.0, 0.0)), - object::Body::Gravestone2 => ("object/gravestone2.vox", Vec3::new(-8.5, -3.0, 0.0)), - object::Body::Chair => ("object/chair.vox", Vec3::new(-3.5, -4.0, 0.0)), + object::Body::Gravestone => ("object/gravestone.vox", Vec3::new(-5.0, -2.0, 0.0)), + object::Body::Gravestone2 => ("object/gravestone_2.vox", Vec3::new(-8.5, -3.0, 0.0)), + object::Body::Chair => ("object/chair.vox", Vec3::new(-5.0, -4.5, 0.0)), + object::Body::Chair2 => ("object/chair_2.vox", Vec3::new(-5.0, -4.5, 0.0)), + object::Body::Chair3 => ("object/chair_3.vox", Vec3::new(-5.0, -4.5, 0.0)), object::Body::Bench => ("object/bench.vox", Vec3::new(-8.8, -5.0, 0.0)), - object::Body::Carpet1 => ("object/carpet1.vox", Vec3::new(-14.0, -14.0, -0.5)), + object::Body::Carpet => ("object/carpet.vox", Vec3::new(-14.0, -14.0, -0.5)), + object::Body::Bedroll => ("object/bedroll.vox", Vec3::new(-11.0, -19.5, -0.5)), + object::Body::CarpetHumanRound => ( + "object/carpet_human_round.vox", + Vec3::new(-14.0, -14.0, -0.5), + ), + object::Body::CarpetHumanSquare => ( + "object/carpet_human_square.vox", + Vec3::new(-13.5, -14.0, -0.5), + ), + object::Body::CarpetHumanSquare2 => ( + "object/carpet_human_square_2.vox", + Vec3::new(-13.5, -14.0, -0.5), + ), + object::Body::CarpetHumanSquircle => ( + "object/carpet_human_squircle.vox", + Vec3::new(-21.0, -21.0, -0.5), + ), }; Self::load_mesh(name, offset) }