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

Add new LOD trees and objects

Browse Source
This commit is contained in:
Treeco 2024-03-22 18:01:09 +00:00
parent 62a99f2466
commit 954cede352
13 changed files with 85 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

10
common/src/lod.rs
View File

@ -22,6 +22,16 @@ pub enum ObjectKind {
Dead,
House,
GiantTree,
Mangrove,
Acacia,
Birch,
Redwood,
Baobab,
Frostpine,
Haniwa,
Desert,
Palm,
Arena,
}
#[derive(Clone, Debug, Serialize, Deserialize)]

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

@ -84,6 +84,28 @@ impl Lod {
lod::ObjectKind::GiantTree,
make_lod_object("giant_tree", renderer),
),
(
lod::ObjectKind::Mangrove,
make_lod_object("mangrove", renderer),
),
(lod::ObjectKind::Acacia, make_lod_object("acacia", renderer)),
(lod::ObjectKind::Birch, make_lod_object("birch", renderer)),
(
lod::ObjectKind::Redwood,
make_lod_object("redwood", renderer),
),
(lod::ObjectKind::Baobab, make_lod_object("baobab", renderer)),
(
lod::ObjectKind::Frostpine,
make_lod_object("frostpine", renderer),
),
(lod::ObjectKind::Haniwa, make_lod_object("haniwa", renderer)),
(
lod::ObjectKind::Desert,
make_lod_object("desert_houses", renderer),
),
(lod::ObjectKind::Palm, make_lod_object("palm", renderer)),
(lod::ObjectKind::Arena, make_lod_object("arena", renderer)),
]
.into(),
}

26
world/src/lib.rs
View File

@ -622,9 +622,14 @@ impl World {
Some(lod::Object {
kind: match tree.forest_kind {
all::ForestKind::Dead => lod::ObjectKind::Dead,
all::ForestKind::Pine
| all::ForestKind::Frostpine
| all::ForestKind::Redwood => lod::ObjectKind::Pine,
all::ForestKind::Pine => lod::ObjectKind::Pine,
all::ForestKind::Mangrove => lod::ObjectKind::Mangrove,
all::ForestKind::Acacia => lod::ObjectKind::Acacia,
all::ForestKind::Birch => lod::ObjectKind::Birch,
all::ForestKind::Redwood => lod::ObjectKind::Redwood,
all::ForestKind::Baobab => lod::ObjectKind::Baobab,
all::ForestKind::Frostpine => lod::ObjectKind::Frostpine,
all::ForestKind::Palm => lod::ObjectKind::Palm,
_ => lod::ObjectKind::GenericTree,
},
pos: {
@ -677,6 +682,21 @@ impl World {
t.leaf_color(),
lod::ObjectKind::GiantTree,
)),
site2::plot::PlotKind::Haniwa(_) => Some((
site.tile_wpos(plot.root_tile),
Rgb::black(),
lod::ObjectKind::Haniwa,
)),
site2::plot::PlotKind::DesertCityMultiPlot(_) => Some((
site.tile_wpos(plot.root_tile),
Rgb::black(),
lod::ObjectKind::Desert,
)),
site2::plot::PlotKind::DesertCityArena(_) => Some((
site.tile_wpos(plot.root_tile),
Rgb::black(),
lod::ObjectKind::Arena,
)),
_ => None,
})
})