Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added dead trees to LoD

Browse Source
This commit is contained in:
Joshua Barretto 2022-12-31 15:32:56 +00:00
parent e6ed8805e4
commit 873d3fb7a4
4 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/voxygen/lod/dead.obj (Stored with Git LFS) Normal file
View File

Binary file not shown.

1
common/src/lod.rs
View File

@ -18,6 +18,7 @@ bitflags::bitflags! {
pub enum ObjectKind {
Oak,
Pine,
Dead,
House,
GiantTree,
}

2
voxygen/src/scene/lod.rs
View File

@ -65,6 +65,7 @@ impl Lod {
object_data: [
(lod::ObjectKind::Oak, make_lod_object("oak", renderer)),
(lod::ObjectKind::Pine, make_lod_object("pine", renderer)),
(lod::ObjectKind::Dead, make_lod_object("dead", renderer)),
(lod::ObjectKind::House, make_lod_object("house", renderer)),
(
lod::ObjectKind::GiantTree,
@ -124,6 +125,7 @@ impl Lod {
let color = match object.kind {
lod::ObjectKind::Pine => Rgb::new(0, 25, 12),
lod::ObjectKind::Oak => Rgb::new(10, 50, 5),
lod::ObjectKind::Dead => Rgb::new(20, 10, 2),
lod::ObjectKind::House => Rgb::new(20, 15, 0),
lod::ObjectKind::GiantTree => Rgb::new(8, 35, 5),
};

1
world/src/lib.rs
View File

@ -491,6 +491,7 @@ impl World {
Some(lod::Object {
kind: match tree.forest_kind {
all::ForestKind::Oak => lod::ObjectKind::Oak,
all::ForestKind::Dead => lod::ObjectKind::Dead,
all::ForestKind::Pine
| all::ForestKind::Frostpine
| all::ForestKind::Redwood => lod::ObjectKind::Pine,