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

cargo fmt

Browse Source
This commit is contained in:
Christof Petig 2023-03-25 23:40:31 +01:00
parent 76baf491ec
commit 5cb974f770
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
voxygen/src/scene/figure/load.rs
View File

@ -307,8 +307,7 @@ impl HumHeadSpec {
}; };
let hair = match spec.hair.get(body.hair_style as usize) { let hair = match spec.hair.get(body.hair_style as usize) {
Some(Some(spec)) => Some(( Some(Some(spec)) => Some((
graceful_load_segment(&spec.0, spec.2) graceful_load_segment(&spec.0, spec.2).map_rgb(|rgb| recolor_grey(rgb, hair_rgb)),
.map_rgb(|rgb| recolor_grey(rgb, hair_rgb)),
Vec3::from(spec.1), Vec3::from(spec.1),
)), )),
Some(None) => None, Some(None) => None,
@ -319,8 +318,7 @@ impl HumHeadSpec {
}; };
let beard = match spec.beard.get(body.beard as usize) { let beard = match spec.beard.get(body.beard as usize) {
Some(Some(spec)) => Some(( Some(Some(spec)) => Some((
graceful_load_segment(&spec.0, spec.2) graceful_load_segment(&spec.0, spec.2).map_rgb(|rgb| recolor_grey(rgb, hair_rgb)),
.map_rgb(|rgb| recolor_grey(rgb, hair_rgb)),
Vec3::from(spec.1), Vec3::from(spec.1),
)), )),
Some(None) => None, Some(None) => None,
@ -330,10 +328,7 @@ impl HumHeadSpec {
}, },
}; };
let accessory = match spec.accessory.get(body.accessory as usize) { let accessory = match spec.accessory.get(body.accessory as usize) {
Some(Some(spec)) => Some(( Some(Some(spec)) => Some((graceful_load_segment(&spec.0, spec.2), Vec3::from(spec.1))),
graceful_load_segment(&spec.0, spec.2),
Vec3::from(spec.1),
)),
Some(None) => None, Some(None) => None,
None => { None => {
warn!("No specification for this accessory: {:?}", body.accessory); warn!("No specification for this accessory: {:?}", body.accessory);