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 savannah settlement lod

Browse Source
This commit is contained in:
Treeco 2024-03-26 21:32:48 +00:00
parent 5bd884df86
commit 9d83b046a6
5 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

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

Binary file not shown.

2
common/src/lod.rs
View File

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

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

@ -106,6 +106,14 @@ impl Lod {
), ),
(lod::ObjectKind::Palm, make_lod_object("palm", renderer)), (lod::ObjectKind::Palm, make_lod_object("palm", renderer)),
(lod::ObjectKind::Arena, make_lod_object("arena", 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(), .into(),
} }

11
world/src/lib.rs
View File

@ -697,6 +697,17 @@ impl World {
Rgb::black(), Rgb::black(),
lod::ObjectKind::Arena, 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, _ => None,
}) })
}) })