diff --git a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron index b39172abea..393fd07bad 100644 --- a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron @@ -1,12 +1,10 @@ ({ Dark:( vox_spec: ("armor.belt.dark", (-4.0, -3.5, 2.0)), - recolor: false, color: None ), Cloth:( vox_spec: ("armor.belt.cloth_turq", (-4.0, -3.5, -6.0)), - recolor: false, color: None ) }) \ No newline at end of file diff --git a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron index 224df905d4..651e5364c3 100644 --- a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron @@ -1,37 +1,30 @@ ({ Blue: ( vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)), - recolor: true, color: Some((44, 74, 109)) ), Brown: ( vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)), - recolor: true, color: Some((90, 49, 43)) ), Dark: ( vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)), - recolor: true, color: Some((73, 63, 59)) ), Green: ( vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)), - recolor: true, color: Some((59, 95, 67)) ), Orange: ( vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)), - recolor: true, color: Some((109, 58, 58)) ), Midnight: ( vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)), - recolor: true, color: Some((29, 26, 33)) ), Kimono: ( vox_spec: ("armor.chest.cloth_red_kimono", (-7.0, -3.5, 2.0)), - recolor: false, color: None ) }) \ No newline at end of file diff --git a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron index 2cf5ab1c8b..3f22aabd81 100644 --- a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron @@ -2,22 +2,18 @@ //This shouldn't be bare, but what is? Bare: ( vox_spec: ("armor.foot.cloth_sandals", (-2.5, -3.5, -9.0)), - recolor: false, color: None ), Dark: ( vox_spec: ("armor.foot.dark-0", (-2.5, -3.5, -9.0)), - recolor: false, color: None ), Sandal: ( vox_spec: ("armor.foot.cloth_sandals", (-2.5, -3.5, -9.0)), - recolor: false, color: None ), Jester: ( vox_spec: ("armor.foot.dark_jester-elf_shoe", (-2.5, -3.5, -9.0)), - recolor: false, color: None ) }) \ No newline at end of file diff --git a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron index 012854aa92..897d6a8a66 100644 --- a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron @@ -2,24 +2,20 @@ Bare: ( left: ( vox_spec: ("armor.hand.bare_left", (-1.5, -1.5, -7.0)), - recolor: false, color: None ), right: ( vox_spec: ("armor.hand.bare_right", (-1.5, -1.5, -7.0)), - recolor: false, color: None ) ), Cloth: ( left: ( vox_spec: ("armor.hand.cloth_basic_left", (-1.5, -1.5, -7.0)), - recolor: false, color: None ), right: ( vox_spec: ("armor.hand.cloth_basic_right", (-1.5, -1.5, -7.0)), - recolor: false, color: None ) ) diff --git a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron index dc1b09267a..3e7810448f 100644 --- a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron @@ -1,32 +1,26 @@ ({ Blue: ( vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)), - recolor: true, color: Some((28, 66, 109)) ), Brown: ( vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)), - recolor: true, color: Some((54, 30, 26)) ), Dark: ( vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)), - recolor: true, color: Some((24, 19, 17)) ), Green: ( vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)), - recolor: true, color: Some((49, 95, 59)) ), Orange: ( vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)), - recolor: true, color: Some((148, 52, 33)) ), Kimono: ( vox_spec: ("armor.pants.cloth_red_kimono", (-5.0, -3.5, 1.0)), - recolor: false, color: None ) }) \ No newline at end of file diff --git a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron index 91f730f33f..81cc061c03 100644 --- a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron @@ -3,36 +3,30 @@ None: ( left: ( vox_spec: ("armor.shoulder.brown_left", (-3.0, -3.5, 0.1)), - recolor: false, color: None ), right: ( vox_spec: ("armor.shoulder.brown_right", (-2.0, -3.5, 0.1)), - recolor: false, color: None ) ), Brown1: ( left: ( vox_spec: ("armor.shoulder.brown_left", (-3.0, -3.5, 0.1)), - recolor: false, color: None ), right: ( vox_spec: ("armor.shoulder.brown_right", (-2.0, -3.5, 0.1)), - recolor: false, color: None ) ), Chain: ( left: ( vox_spec: ("armor.shoulder.chain_left", (-3.0, -3.5, 0.1)), - recolor: false, color: None ), right: ( vox_spec: ("armor.shoulder.chain_right", (-2.0, -3.5, 0.1)), - recolor: false, color: None ) ) diff --git a/voxygen/src/scene/figure/load.rs b/voxygen/src/scene/figure/load.rs index f0c0a70627..8cc51cee62 100644 --- a/voxygen/src/scene/figure/load.rs +++ b/voxygen/src/scene/figure/load.rs @@ -91,7 +91,6 @@ struct VoxSpec(String, [T; 3]); #[derive(Serialize, Deserialize)] struct ArmorVoxSpec { vox_spec: VoxSpec, - recolor: bool, color: Option<[u8; 3]>, } @@ -323,11 +322,6 @@ impl HumArmorChestSpec { } }; - let chest_color = Vec3::from(match spec.color { - Some(color_array) => color_array, - _ => [0, 0, 0], - }); - let color = |mat_segment| { color_segment( mat_segment, @@ -341,8 +335,9 @@ impl HumArmorChestSpec { let mut chest_armor = graceful_load_mat_segment(&spec.vox_spec.0); - if spec.recolor { - chest_armor = chest_armor.map_rgb(|rgb| recolor_grey(rgb, Rgb::from(chest_color))) + if let Some(color) = spec.color { + let chest_color = Vec3::from(color); + chest_armor = chest_armor.map_rgb(|rgb| recolor_grey(rgb, Rgb::from(chest_color))); } let chest = DynaUnionizer::new() @@ -441,11 +436,6 @@ impl HumArmorPantsSpec { } }; - let pants_color = Vec3::from(match spec.color { - Some(color_array) => color_array, - _ => [0, 0, 0], - }); - let color = |mat_segment| { color_segment( mat_segment, @@ -459,8 +449,9 @@ impl HumArmorPantsSpec { let mut pants_armor = graceful_load_mat_segment(&spec.vox_spec.0); - if spec.recolor { - pants_armor = pants_armor.map_rgb(|rgb| recolor_grey(rgb, Rgb::from(pants_color))) + if let Some(color) = spec.color { + let pants_color = Vec3::from(color); + pants_armor = pants_armor.map_rgb(|rgb| recolor_grey(rgb, Rgb::from(pants_color))); } let pants = DynaUnionizer::new()