diff --git a/assets/voxygen/lod/savannah_hut.obj b/assets/voxygen/lod/savannah_hut.obj new file mode 100644 index 0000000000..ac156c14fd --- /dev/null +++ b/assets/voxygen/lod/savannah_hut.obj @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:304b5d994b1eb5b5597f76a4d8a7bdbb843bcb973e7fc44ebddcbf569ec890a7 +size 3574 diff --git a/assets/voxygen/lod/savannah_pit.obj b/assets/voxygen/lod/savannah_pit.obj new file mode 100644 index 0000000000..709407fd43 --- /dev/null +++ b/assets/voxygen/lod/savannah_pit.obj @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:084da79ada98a5d05120f064656c5c404088ade60e533f7945bf018cca5f30a4 +size 35025 diff --git a/assets/voxygen/lod/terracotta_house.obj b/assets/voxygen/lod/terracotta_house.obj new file mode 100644 index 0000000000..a72f4da388 --- /dev/null +++ b/assets/voxygen/lod/terracotta_house.obj @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34c7b2700278294876bee366a84f7549b691c9ab8e09a605eb2600ae8b7b5d51 +size 18789 diff --git a/assets/voxygen/lod/terracotta_palace.obj b/assets/voxygen/lod/terracotta_palace.obj new file mode 100644 index 0000000000..2104a415e6 --- /dev/null +++ b/assets/voxygen/lod/terracotta_palace.obj @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c4511e9fec7c624f9becc01fc8bb431123e95d3266e6dd92a9a0a01b406e02c +size 71096 diff --git a/assets/voxygen/lod/terracotta_yard.obj b/assets/voxygen/lod/terracotta_yard.obj new file mode 100644 index 0000000000..0787e97f62 --- /dev/null +++ b/assets/voxygen/lod/terracotta_yard.obj @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cc35d9cbfd104f6575afbc5c1fc34398bc84d478380cb6a9b66310f15b863e6e +size 15766 diff --git a/common/src/lod.rs b/common/src/lod.rs index 6c420de168..6b35d3d7f1 100644 --- a/common/src/lod.rs +++ b/common/src/lod.rs @@ -32,6 +32,11 @@ pub enum ObjectKind { Desert, Palm, Arena, + SavannahHut, + SavannahPit, + TerracottaPalace, + TerracottaHouse, + TerracottaYard, } #[derive(Clone, Debug, Serialize, Deserialize)] diff --git a/voxygen/src/scene/lod.rs b/voxygen/src/scene/lod.rs index c895006829..7fdb25f221 100644 --- a/voxygen/src/scene/lod.rs +++ b/voxygen/src/scene/lod.rs @@ -106,6 +106,26 @@ impl Lod { ), (lod::ObjectKind::Palm, make_lod_object("palm", renderer)), (lod::ObjectKind::Arena, make_lod_object("arena", renderer)), + ( + lod::ObjectKind::SavannahHut, + make_lod_object("savannah_hut", renderer), + ), + ( + lod::ObjectKind::SavannahPit, + make_lod_object("savannah_pit", renderer), + ), + ( + lod::ObjectKind::TerracottaPalace, + make_lod_object("terracotta_palace", renderer), + ), + ( + lod::ObjectKind::TerracottaHouse, + make_lod_object("terracotta_house", renderer), + ), + ( + lod::ObjectKind::TerracottaYard, + make_lod_object("terracotta_yard", renderer), + ), ] .into(), } diff --git a/world/src/lib.rs b/world/src/lib.rs index f6d1ca23c2..ac5ee0b4de 100644 --- a/world/src/lib.rs +++ b/world/src/lib.rs @@ -697,6 +697,32 @@ impl World { Rgb::black(), lod::ObjectKind::Arena, )), + site2::plot::PlotKind::SavannahHut(_) + | site2::plot::PlotKind::SavannahWorkshop(_) => Some(( + site.tile_wpos(plot.root_tile), + Rgb::black(), + lod::ObjectKind::SavannahHut, + )), + site2::plot::PlotKind::SavannahPit(_) => Some(( + site.tile_wpos(plot.root_tile), + Rgb::black(), + lod::ObjectKind::SavannahPit, + )), + site2::plot::PlotKind::TerracottaPalace(_) => Some(( + site.tile_wpos(plot.root_tile), + Rgb::black(), + lod::ObjectKind::TerracottaPalace, + )), + site2::plot::PlotKind::TerracottaHouse(_) => Some(( + site.tile_wpos(plot.root_tile), + Rgb::black(), + lod::ObjectKind::TerracottaHouse, + )), + site2::plot::PlotKind::TerracottaYard(_) => Some(( + site.tile_wpos(plot.root_tile), + Rgb::black(), + lod::ObjectKind::TerracottaYard, + )), _ => None, }) })