Added LOD objects for new forest types

common/src/lod.rs

@@ -23,6 +23,9 @@ pub enum ObjectKind {
     Dead,
     House,
     GiantTree,
+    MapleTree,
+    Cherry,
+    AutumnTree,
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize)]

voxygen/src/scene/lod.rs

@@ -71,6 +71,12 @@ impl Lod {
                     lod::ObjectKind::GiantTree,
                     make_lod_object("giant_tree", renderer),
                 ),
+                (lod::ObjectKind::MapleTree, make_lod_object("oak", renderer)),
+                (lod::ObjectKind::Cherry, make_lod_object("oak", renderer)),
+                (
+                    lod::ObjectKind::AutumnTree,
+                    make_lod_object("oak", renderer),
+                ),
             ]
             .into_iter()
             .collect(),
@@ -128,6 +134,9 @@ impl Lod {
                         lod::ObjectKind::Dead => Rgb::new(20, 10, 2),
                         lod::ObjectKind::House => Rgb::new(20, 15, 0),
                         lod::ObjectKind::GiantTree => Rgb::new(8, 35, 5),
+                        lod::ObjectKind::MapleTree => Rgb::new(20, 0, 5),
+                        lod::ObjectKind::Cherry => Rgb::new(70, 40, 70),
+                        lod::ObjectKind::AutumnTree => Rgb::new(60, 25, 0),
                     };
                     objects
                         .entry(object.kind)

world/src/lib.rs

@@ -621,6 +621,9 @@ impl World {
                             all::ForestKind::Pine
                             | all::ForestKind::Frostpine
                             | all::ForestKind::Redwood => lod::ObjectKind::Pine,
+                            all::ForestKind::Mapletree => lod::ObjectKind::MapleTree,
+                            all::ForestKind::Cherry => lod::ObjectKind::Cherry,
+                            all::ForestKind::AutumnTree => lod::ObjectKind::AutumnTree,
                             _ => lod::ObjectKind::Oak,
                         },
                         pos: {