diff --git a/assets/voxygen/voxel/humanoid_armor_lantern_manifest.ron b/assets/voxygen/voxel/humanoid_lantern_manifest.ron
similarity index 63%
rename from assets/voxygen/voxel/humanoid_armor_lantern_manifest.ron
rename to assets/voxygen/voxel/humanoid_lantern_manifest.ron
index 8f4a831912..2eab34212a 100644
--- a/assets/voxygen/voxel/humanoid_armor_lantern_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_lantern_manifest.ron
@@ -5,11 +5,11 @@
),
map: {
Green0: (
- vox_spec: ("armor.lantern.green-0", (0.0, 0.0, 0.0)),
+ vox_spec: ("lantern.green-0", (0.0, 0.0, 0.0)),
color: None
),
Black0: (
- vox_spec: ("armor.lantern.black-0", (0.0, 0.0, 0.0)),
+ vox_spec: ("lantern.black-0", (0.0, 0.0, 0.0)),
color: None
),
},
diff --git a/assets/voxygen/voxel/armor/lantern/lantern_black-0.vox b/assets/voxygen/voxel/lantern/black-0.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/lantern/lantern_black-0.vox
rename to assets/voxygen/voxel/lantern/black-0.vox
diff --git a/assets/voxygen/voxel/armor/lantern/lantern_green-0.vox b/assets/voxygen/voxel/lantern/green-0.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/lantern/lantern_green-0.vox
rename to assets/voxygen/voxel/lantern/green-0.vox
diff --git a/voxygen/src/anim/biped_large/mod.rs b/voxygen/src/anim/biped_large/mod.rs
index 0a066963a4..85611e944e 100644
--- a/voxygen/src/anim/biped_large/mod.rs
+++ b/voxygen/src/anim/biped_large/mod.rs
@@ -47,7 +47,7 @@ impl BipedLargeSkeleton {
impl Skeleton for BipedLargeSkeleton {
type Attr = SkeletonAttr;
- fn compute_matrices(&self) -> [FigureBoneData; 19] {
+ fn compute_matrices(&self) -> [FigureBoneData; 16] {
let upper_torso_mat = self.upper_torso.compute_base_matrix();
let shoulder_l_mat = self.shoulder_l.compute_base_matrix();
let shoulder_r_mat = self.shoulder_r.compute_base_matrix();
@@ -78,9 +78,6 @@ impl Skeleton for BipedLargeSkeleton {
FigureBoneData::default(),
FigureBoneData::default(),
FigureBoneData::default(),
- FigureBoneData::default(),
- FigureBoneData::default(),
- FigureBoneData::default(),
]
}
diff --git a/voxygen/src/anim/bird_medium/mod.rs b/voxygen/src/anim/bird_medium/mod.rs
index 0d134a31cb..64e2d400e3 100644
--- a/voxygen/src/anim/bird_medium/mod.rs
+++ b/voxygen/src/anim/bird_medium/mod.rs
@@ -27,7 +27,7 @@ impl BirdMediumSkeleton {
impl Skeleton for BirdMediumSkeleton {
type Attr = SkeletonAttr;
- fn compute_matrices(&self) -> [FigureBoneData; 19] {
+ fn compute_matrices(&self) -> [FigureBoneData; 16] {
let torso_mat = self.torso.compute_base_matrix();
[
@@ -47,9 +47,6 @@ impl Skeleton for BirdMediumSkeleton {
FigureBoneData::default(),
FigureBoneData::default(),
FigureBoneData::default(),
- FigureBoneData::default(),
- FigureBoneData::default(),
- FigureBoneData::default(),
]
}
diff --git a/voxygen/src/anim/bird_small/mod.rs b/voxygen/src/anim/bird_small/mod.rs
index b2989c9cee..610b63122a 100644
--- a/voxygen/src/anim/bird_small/mod.rs
+++ b/voxygen/src/anim/bird_small/mod.rs
@@ -31,7 +31,7 @@ impl BirdSmallSkeleton {
impl Skeleton for BirdSmallSkeleton {
type Attr = SkeletonAttr;
- fn compute_matrices(&self) -> [FigureBoneData; 19] {
+ fn compute_matrices(&self) -> [FigureBoneData; 16] {
let torso_mat = self.torso.compute_base_matrix();
[
@@ -51,9 +51,6 @@ impl Skeleton for BirdSmallSkeleton {
FigureBoneData::default(),
FigureBoneData::default(),
FigureBoneData::default(),
- FigureBoneData::default(),
- FigureBoneData::default(),
- FigureBoneData::default(),
]
}
diff --git a/voxygen/src/anim/character/mod.rs b/voxygen/src/anim/character/mod.rs
index 8dc6e083f3..5268345286 100644
--- a/voxygen/src/anim/character/mod.rs
+++ b/voxygen/src/anim/character/mod.rs
@@ -62,7 +62,7 @@ impl CharacterSkeleton {
impl Skeleton for CharacterSkeleton {
type Attr = SkeletonAttr;
- fn compute_matrices(&self) -> [FigureBoneData; 19] {
+ fn compute_matrices(&self) -> [FigureBoneData; 16] {
let chest_mat = self.chest.compute_base_matrix();
let torso_mat = self.torso.compute_base_matrix();
let l_hand_mat = self.l_hand.compute_base_matrix();
@@ -90,10 +90,7 @@ impl Skeleton for CharacterSkeleton {
FigureBoneData::new(torso_mat * chest_mat * control_mat * l_control_mat * main_mat),
FigureBoneData::new(torso_mat * chest_mat * control_mat * r_control_mat * second_mat),
FigureBoneData::new(torso_mat * chest_mat * self.lantern.compute_base_matrix()),
- FigureBoneData::new(torso_mat),
- FigureBoneData::new(control_mat),
- FigureBoneData::new(l_control_mat),
- FigureBoneData::new(r_control_mat),
+ FigureBoneData::default(),
]
}
diff --git a/voxygen/src/anim/character/stand.rs b/voxygen/src/anim/character/stand.rs
index 97baf7bba5..2159798342 100644
--- a/voxygen/src/anim/character/stand.rs
+++ b/voxygen/src/anim/character/stand.rs
@@ -105,7 +105,7 @@ impl Animation for StandAnimation {
next.lantern.offset = Vec3::new(0.0, 0.0, 0.0);
next.lantern.ori = Quaternion::rotation_x(0.0);
- next.lantern.scale = Vec3::one() * 50.0;
+ next.lantern.scale = Vec3::one() * 1.0;
next.torso.offset = Vec3::new(0.0, -0.1, 0.1) * skeleton_attr.scaler;
next.torso.ori = Quaternion::rotation_x(0.0);
diff --git a/voxygen/src/anim/critter/mod.rs b/voxygen/src/anim/critter/mod.rs
index 3c0538b5e4..9677461239 100644
--- a/voxygen/src/anim/critter/mod.rs
+++ b/voxygen/src/anim/critter/mod.rs
@@ -32,7 +32,7 @@ impl CritterSkeleton {
impl Skeleton for CritterSkeleton {
type Attr = CritterAttr;
- fn compute_matrices(&self) -> [FigureBoneData; 19] {
+ fn compute_matrices(&self) -> [FigureBoneData; 16] {
[
FigureBoneData::new(self.head.compute_base_matrix()),
FigureBoneData::new(self.chest.compute_base_matrix()),
@@ -50,9 +50,6 @@ impl Skeleton for CritterSkeleton {
FigureBoneData::default(),
FigureBoneData::default(),
FigureBoneData::default(),
- FigureBoneData::default(),
- FigureBoneData::default(),
- FigureBoneData::default(),
]
}
diff --git a/voxygen/src/anim/dragon/mod.rs b/voxygen/src/anim/dragon/mod.rs
index 5121b7f7c0..c3bfec7e61 100644
--- a/voxygen/src/anim/dragon/mod.rs
+++ b/voxygen/src/anim/dragon/mod.rs
@@ -49,7 +49,7 @@ impl DragonSkeleton {
impl Skeleton for DragonSkeleton {
type Attr = SkeletonAttr;
- fn compute_matrices(&self) -> [FigureBoneData; 19] {
+ fn compute_matrices(&self) -> [FigureBoneData; 16] {
let chest_front_mat = self.chest_front.compute_base_matrix();
let wing_in_l_mat = self.wing_in_l.compute_base_matrix();
let wing_in_r_mat = self.wing_in_r.compute_base_matrix();
@@ -72,9 +72,6 @@ impl Skeleton for DragonSkeleton {
FigureBoneData::default(),
FigureBoneData::default(),
FigureBoneData::default(),
- FigureBoneData::default(),
- FigureBoneData::default(),
- FigureBoneData::default(),
]
}
diff --git a/voxygen/src/anim/fish_medium/mod.rs b/voxygen/src/anim/fish_medium/mod.rs
index 919a08918c..b085ed7220 100644
--- a/voxygen/src/anim/fish_medium/mod.rs
+++ b/voxygen/src/anim/fish_medium/mod.rs
@@ -35,7 +35,7 @@ impl FishMediumSkeleton {
impl Skeleton for FishMediumSkeleton {
type Attr = SkeletonAttr;
- fn compute_matrices(&self) -> [FigureBoneData; 19] {
+ fn compute_matrices(&self) -> [FigureBoneData; 16] {
let torso_mat = self.torso.compute_base_matrix();
let rear_mat = self.rear.compute_base_matrix();
@@ -56,9 +56,6 @@ impl Skeleton for FishMediumSkeleton {
FigureBoneData::default(),
FigureBoneData::default(),
FigureBoneData::default(),
- FigureBoneData::default(),
- FigureBoneData::default(),
- FigureBoneData::default(),
]
}
diff --git a/voxygen/src/anim/fish_small/mod.rs b/voxygen/src/anim/fish_small/mod.rs
index 1b652c61c5..ed26ef0247 100644
--- a/voxygen/src/anim/fish_small/mod.rs
+++ b/voxygen/src/anim/fish_small/mod.rs
@@ -27,7 +27,7 @@ impl FishSmallSkeleton {
impl Skeleton for FishSmallSkeleton {
type Attr = SkeletonAttr;
- fn compute_matrices(&self) -> [FigureBoneData; 19] {
+ fn compute_matrices(&self) -> [FigureBoneData; 16] {
let torso_mat = self.torso.compute_base_matrix();
[
@@ -47,9 +47,6 @@ impl Skeleton for FishSmallSkeleton {
FigureBoneData::default(),
FigureBoneData::default(),
FigureBoneData::default(),
- FigureBoneData::default(),
- FigureBoneData::default(),
- FigureBoneData::default(),
]
}
diff --git a/voxygen/src/anim/fixture/mod.rs b/voxygen/src/anim/fixture/mod.rs
index 9b45c2fca8..92a68d0125 100644
--- a/voxygen/src/anim/fixture/mod.rs
+++ b/voxygen/src/anim/fixture/mod.rs
@@ -13,7 +13,7 @@ impl FixtureSkeleton {
impl Skeleton for FixtureSkeleton {
type Attr = SkeletonAttr;
- fn compute_matrices(&self) -> [FigureBoneData; 19] {
+ fn compute_matrices(&self) -> [FigureBoneData; 16] {
[
FigureBoneData::new(vek::Mat4::identity()),
FigureBoneData::new(vek::Mat4::identity()),
@@ -31,9 +31,6 @@ impl Skeleton for FixtureSkeleton {
FigureBoneData::new(vek::Mat4::identity()),
FigureBoneData::new(vek::Mat4::identity()),
FigureBoneData::new(vek::Mat4::identity()),
- FigureBoneData::new(vek::Mat4::identity()),
- FigureBoneData::new(vek::Mat4::identity()),
- FigureBoneData::new(vek::Mat4::identity()),
]
}
diff --git a/voxygen/src/anim/mod.rs b/voxygen/src/anim/mod.rs
index 82950e49da..7d6e5b2086 100644
--- a/voxygen/src/anim/mod.rs
+++ b/voxygen/src/anim/mod.rs
@@ -52,7 +52,7 @@ impl Bone {
pub trait Skeleton: Send + Sync + 'static {
type Attr;
- fn compute_matrices(&self) -> [FigureBoneData; 19];
+ fn compute_matrices(&self) -> [FigureBoneData; 16];
/// Change the current skeleton to be more like `target`.
fn interpolate(&mut self, target: &Self, dt: f32);
diff --git a/voxygen/src/anim/object/mod.rs b/voxygen/src/anim/object/mod.rs
index e2b587139e..d6f3ac510e 100644
--- a/voxygen/src/anim/object/mod.rs
+++ b/voxygen/src/anim/object/mod.rs
@@ -15,7 +15,7 @@ const SCALE: f32 = 1.0 / 11.0;
impl Skeleton for ObjectSkeleton {
type Attr = SkeletonAttr;
- fn compute_matrices(&self) -> [FigureBoneData; 19] {
+ fn compute_matrices(&self) -> [FigureBoneData; 16] {
[
FigureBoneData::new(Mat4::scaling_3d(Vec3::broadcast(SCALE))),
FigureBoneData::new(Mat4::scaling_3d(Vec3::broadcast(SCALE))),
@@ -33,9 +33,6 @@ impl Skeleton for ObjectSkeleton {
FigureBoneData::new(Mat4::scaling_3d(Vec3::broadcast(SCALE))),
FigureBoneData::new(Mat4::scaling_3d(Vec3::broadcast(SCALE))),
FigureBoneData::new(Mat4::scaling_3d(Vec3::broadcast(SCALE))),
- FigureBoneData::new(Mat4::scaling_3d(Vec3::broadcast(SCALE))),
- FigureBoneData::new(Mat4::scaling_3d(Vec3::broadcast(SCALE))),
- FigureBoneData::new(Mat4::scaling_3d(Vec3::broadcast(SCALE))),
]
}
diff --git a/voxygen/src/anim/quadruped_medium/mod.rs b/voxygen/src/anim/quadruped_medium/mod.rs
index 3be2ef9599..57f36c9c1f 100644
--- a/voxygen/src/anim/quadruped_medium/mod.rs
+++ b/voxygen/src/anim/quadruped_medium/mod.rs
@@ -31,7 +31,7 @@ impl QuadrupedMediumSkeleton {
impl Skeleton for QuadrupedMediumSkeleton {
type Attr = SkeletonAttr;
- fn compute_matrices(&self) -> [FigureBoneData; 19] {
+ fn compute_matrices(&self) -> [FigureBoneData; 16] {
let ears_mat = self.ears.compute_base_matrix();
let head_upper_mat = self.head_upper.compute_base_matrix();
let head_lower_mat = self.head_lower.compute_base_matrix();
@@ -53,9 +53,6 @@ impl Skeleton for QuadrupedMediumSkeleton {
FigureBoneData::default(),
FigureBoneData::default(),
FigureBoneData::default(),
- FigureBoneData::default(),
- FigureBoneData::default(),
- FigureBoneData::default(),
]
}
diff --git a/voxygen/src/anim/quadruped_small/mod.rs b/voxygen/src/anim/quadruped_small/mod.rs
index c76b1e6a92..fb4c559fbf 100644
--- a/voxygen/src/anim/quadruped_small/mod.rs
+++ b/voxygen/src/anim/quadruped_small/mod.rs
@@ -26,7 +26,7 @@ impl QuadrupedSmallSkeleton {
impl Skeleton for QuadrupedSmallSkeleton {
type Attr = SkeletonAttr;
- fn compute_matrices(&self) -> [FigureBoneData; 19] {
+ fn compute_matrices(&self) -> [FigureBoneData; 16] {
[
FigureBoneData::new(self.head.compute_base_matrix()),
FigureBoneData::new(self.chest.compute_base_matrix()),
@@ -44,9 +44,6 @@ impl Skeleton for QuadrupedSmallSkeleton {
FigureBoneData::default(),
FigureBoneData::default(),
FigureBoneData::default(),
- FigureBoneData::default(),
- FigureBoneData::default(),
- FigureBoneData::default(),
]
}
diff --git a/voxygen/src/scene/figure/cache.rs b/voxygen/src/scene/figure/cache.rs
index cd7d738fd2..7903b30d3c 100644
--- a/voxygen/src/scene/figure/cache.rs
+++ b/voxygen/src/scene/figure/cache.rs
@@ -238,8 +238,8 @@ impl<Skel: Skeleton> FigureModelCache<Skel> {
} else {
None
},
- Some(humanoid_armor_lantern_spec.mesh_lantern(&body, loadout)),
None,
+ Some(humanoid_armor_lantern_spec.mesh_lantern(&body, loadout)),
None,
]
},
diff --git a/voxygen/src/scene/figure/load.rs b/voxygen/src/scene/figure/load.rs
index 6c3d24a37a..5f9762bcf3 100644
--- a/voxygen/src/scene/figure/load.rs
+++ b/voxygen/src/scene/figure/load.rs
@@ -696,8 +696,7 @@ impl HumMainWeaponSpec {
// Lantern
impl HumArmorLanternSpec {
pub fn load_watched(indicator: &mut ReloadIndicator) -> Arc<Self> {
- assets::load_watched::<Self>("voxygen.voxel.humanoid_armor_lantern_manifest", indicator)
- .unwrap()
+ assets::load_watched::<Self>("voxygen.voxel.humanoid_lantern_manifest", indicator).unwrap()
}
pub fn mesh_lantern(&self, body: &Body, loadout: &Loadout) -> Mesh<FigurePipeline> {