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 airship dock and coast town LOD

See merge request veloren/veloren!4396
This commit is contained in:
Treeco 2024-03-27 22:29:10 +00:00
commit c2bf7c3fc1
6 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

3
common/src/lod.rs
View File

@ -37,6 +37,9 @@ pub enum ObjectKind {
TerracottaPalace, TerracottaPalace,
TerracottaHouse, TerracottaHouse,
TerracottaYard, TerracottaYard,
AirshipDock,
CoastalHouse,
CoastalWorkshop,
} }
#[derive(Clone, Debug, Serialize, Deserialize)] #[derive(Clone, Debug, Serialize, Deserialize)]

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

@ -126,6 +126,18 @@ impl Lod {
lod::ObjectKind::TerracottaYard, lod::ObjectKind::TerracottaYard,
make_lod_object("terracotta_yard", renderer), make_lod_object("terracotta_yard", renderer),
), ),
(
lod::ObjectKind::AirshipDock,
make_lod_object("airship_dock", renderer),
),
(
lod::ObjectKind::CoastalHouse,
make_lod_object("coastal_house", renderer),
),
(
lod::ObjectKind::CoastalWorkshop,
make_lod_object("coastal_workshop", renderer),
),
] ]
.into(), .into(),
} }

15
world/src/lib.rs
View File

@ -723,6 +723,21 @@ impl World {
Rgb::black(), Rgb::black(),
lod::ObjectKind::TerracottaYard, lod::ObjectKind::TerracottaYard,
)), )),
site2::plot::PlotKind::AirshipDock(_) => Some((
site.tile_wpos(plot.root_tile),
Rgb::black(),
lod::ObjectKind::AirshipDock,
)),
site2::plot::PlotKind::CoastalHouse(_) => Some((
site.tile_wpos(plot.root_tile),
Rgb::black(),
lod::ObjectKind::CoastalHouse,
)),
site2::plot::PlotKind::CoastalWorkshop(_) => Some((
site.tile_wpos(plot.root_tile),
Rgb::black(),
lod::ObjectKind::CoastalWorkshop,
)),
_ => None, _ => None,
}) })
}) })