Merge branch 'treeco/lod-models' into 'master'

Add savaannah and terracottaa LOD models

See merge request veloren/veloren!4394

common/src/lod.rs

@@ -32,6 +32,11 @@ pub enum ObjectKind {
     Desert,
     Palm,
     Arena,
+    SavannahHut,
+    SavannahPit,
+    TerracottaPalace,
+    TerracottaHouse,
+    TerracottaYard,
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize)]

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(),
         }

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,
                         })
                     })