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/common/src/lod.rs b/common/src/lod.rs index 6c420de168..a8e95efe2b 100644 --- a/common/src/lod.rs +++ b/common/src/lod.rs @@ -32,6 +32,8 @@ pub enum ObjectKind { Desert, Palm, Arena, + SavannahHut, + SavannahPit, } #[derive(Clone, Debug, Serialize, Deserialize)] diff --git a/voxygen/src/scene/lod.rs b/voxygen/src/scene/lod.rs index c895006829..a5e5fefaa1 100644 --- a/voxygen/src/scene/lod.rs +++ b/voxygen/src/scene/lod.rs @@ -106,6 +106,14 @@ 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), + ), ] .into(), } diff --git a/world/src/lib.rs b/world/src/lib.rs index f6d1ca23c2..8b096d1ff6 100644 --- a/world/src/lib.rs +++ b/world/src/lib.rs @@ -697,6 +697,17 @@ 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, + )), _ => None, }) })