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

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

Browse Source 
Add savaannah and terracottaa LOD models

See merge request veloren/veloren!4394
This commit is contained in:
Marcel 2024-03-27 12:03:47 +00:00
commit 794af0207a
8 changed files with 66 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.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

5
common/src/lod.rs
View File

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

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

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

26
world/src/lib.rs
View File

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