diff --git a/assets/voxygen/voxel/figure/headfemale.vox b/assets/voxygen/voxel/figure/head_female.vox
similarity index 100%
rename from assets/voxygen/voxel/figure/headfemale.vox
rename to assets/voxygen/voxel/figure/head_female.vox
diff --git a/assets/voxygen/voxel/npc/pig_purple/pigchest.vox b/assets/voxygen/voxel/npc/pig_purple/pig_chest.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/pig_purple/pigchest.vox
rename to assets/voxygen/voxel/npc/pig_purple/pig_chest.vox
diff --git a/assets/voxygen/voxel/npc/pig_purple/pighead.vox b/assets/voxygen/voxel/npc/pig_purple/pig_head.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/pig_purple/pighead.vox
rename to assets/voxygen/voxel/npc/pig_purple/pig_head.vox
diff --git a/assets/voxygen/voxel/npc/pig_purple/pigleg_l.vox b/assets/voxygen/voxel/npc/pig_purple/pig_leg_l.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/pig_purple/pigleg_l.vox
rename to assets/voxygen/voxel/npc/pig_purple/pig_leg_l.vox
diff --git a/assets/voxygen/voxel/npc/pig_purple/pigleg_r.vox b/assets/voxygen/voxel/npc/pig_purple/pig_leg_r.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/pig_purple/pigleg_r.vox
rename to assets/voxygen/voxel/npc/pig_purple/pig_leg_r.vox
diff --git a/assets/voxygen/voxel/npc/wolf/wolf_lb_foot.vox b/assets/voxygen/voxel/npc/wolf/wolf_foot_lb.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/wolf/wolf_lb_foot.vox
rename to assets/voxygen/voxel/npc/wolf/wolf_foot_lb.vox
diff --git a/assets/voxygen/voxel/npc/wolf/wolf_lf_foot.vox b/assets/voxygen/voxel/npc/wolf/wolf_foot_lf.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/wolf/wolf_lf_foot.vox
rename to assets/voxygen/voxel/npc/wolf/wolf_foot_lf.vox
diff --git a/assets/voxygen/voxel/npc/wolf/wolf_rb_foot.vox b/assets/voxygen/voxel/npc/wolf/wolf_foot_rb.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/wolf/wolf_rb_foot.vox
rename to assets/voxygen/voxel/npc/wolf/wolf_foot_rb.vox
diff --git a/assets/voxygen/voxel/npc/wolf/wolf_rf_foot.vox b/assets/voxygen/voxel/npc/wolf/wolf_foot_rf.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/wolf/wolf_rf_foot.vox
rename to assets/voxygen/voxel/npc/wolf/wolf_foot_rf.vox
diff --git a/assets/voxygen/voxel/npc/wolf/wolf_lower_head.vox b/assets/voxygen/voxel/npc/wolf/wolf_head_lower.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/wolf/wolf_lower_head.vox
rename to assets/voxygen/voxel/npc/wolf/wolf_head_lower.vox
diff --git a/assets/voxygen/voxel/npc/wolf/wolf_upper_head.vox b/assets/voxygen/voxel/npc/wolf/wolf_head_upper.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/wolf/wolf_upper_head.vox
rename to assets/voxygen/voxel/npc/wolf/wolf_head_upper.vox
diff --git a/voxygen/src/scene/figure.rs b/voxygen/src/scene/figure.rs
index a7e522dcb5..8d9c2893c7 100644
--- a/voxygen/src/scene/figure.rs
+++ b/voxygen/src/scene/figure.rs
@@ -299,7 +299,7 @@ impl FigureModelCache {
fn load_pig_head(pig_head: PigHead) -> Mesh<FigurePipeline> {
Self::load_mesh(
match pig_head {
- PigHead::Default => "npc/pig_purple/pighead.vox",
+ PigHead::Default => "npc/pig_purple/pig_head.vox",
},
Vec3::new(-6.0, 4.5, 3.0),
)
@@ -308,7 +308,7 @@ impl FigureModelCache {
fn load_pig_chest(pig_chest: PigChest) -> Mesh<FigurePipeline> {
Self::load_mesh(
match pig_chest {
- PigChest::Default => "npc/pig_purple/pigchest.vox",
+ PigChest::Default => "npc/pig_purple/pig_chest.vox",
},
Vec3::new(-5.0, 4.5, 0.0),
)
@@ -317,7 +317,7 @@ impl FigureModelCache {
fn load_pig_leg_lf(pig_leg_l: PigLegL) -> Mesh<FigurePipeline> {
Self::load_mesh(
match pig_leg_l {
- PigLegL::Default => "npc/pig_purple/pigleg_l.vox",
+ PigLegL::Default => "npc/pig_purple/pig_leg_l.vox",
},
Vec3::new(0.0, -1.0, -1.5),
)
@@ -326,7 +326,7 @@ impl FigureModelCache {
fn load_pig_leg_rf(pig_leg_r: PigLegR) -> Mesh<FigurePipeline> {
Self::load_mesh(
match pig_leg_r {
- PigLegR::Default => "npc/pig_purple/pigleg_r.vox",
+ PigLegR::Default => "npc/pig_purple/pig_leg_r.vox",
},
Vec3::new(0.0, -1.0, -1.5),
)
@@ -335,7 +335,7 @@ impl FigureModelCache {
fn load_pig_leg_lb(pig_leg_l: PigLegL) -> Mesh<FigurePipeline> {
Self::load_mesh(
match pig_leg_l {
- PigLegL::Default => "npc/pig_purple/pigleg_l.vox",
+ PigLegL::Default => "npc/pig_purple/pig_leg_l.vox",
},
Vec3::new(0.0, -1.0, -1.5),
)
@@ -344,7 +344,7 @@ impl FigureModelCache {
fn load_pig_leg_rb(pig_leg_r: PigLegR) -> Mesh<FigurePipeline> {
Self::load_mesh(
match pig_leg_r {
- PigLegR::Default => "npc/pig_purple/pigleg_r.vox",
+ PigLegR::Default => "npc/pig_purple/pig_leg_r.vox",
},
Vec3::new(0.0, -1.0, -1.5),
)
@@ -353,7 +353,7 @@ impl FigureModelCache {
fn load_wolf_head_upper(wolf_upper_head: WolfHeadUpper) -> Mesh<FigurePipeline> {
Self::load_mesh(
match wolf_upper_head {
- WolfHeadUpper::Default => "npc/wolf/wolf_upper_head.vox",
+ WolfHeadUpper::Default => "npc/wolf/wolf_head_upper.vox",
},
Vec3::new(-7.0, -6.0, -5.5),
)
@@ -371,7 +371,7 @@ impl FigureModelCache {
fn load_wolf_head_lower(wolf_head_lower: WolfHeadLower) -> Mesh<FigurePipeline> {
Self::load_mesh(
match wolf_head_lower {
- WolfHeadLower::Default => "npc/wolf/wolf_lower_head.vox",
+ WolfHeadLower::Default => "npc/wolf/wolf_head_lower.vox",
},
Vec3::new(-7.0, -6.0, -5.5),
)
@@ -416,7 +416,7 @@ impl FigureModelCache {
fn load_wolf_foot_lf(wolf_foot_lf: WolfFootLF) -> Mesh<FigurePipeline> {
Self::load_mesh(
match wolf_foot_lf {
- WolfFootLF::Default => "npc/wolf/wolf_lf_foot.vox",
+ WolfFootLF::Default => "npc/wolf/wolf_foot_lf.vox",
},
Vec3::new(-2.5, -4.0, -2.5),
)
@@ -425,7 +425,7 @@ impl FigureModelCache {
fn load_wolf_foot_rf(wolf_foot_rf: WolfFootRF) -> Mesh<FigurePipeline> {
Self::load_mesh(
match wolf_foot_rf {
- WolfFootRF::Default => "npc/wolf/wolf_rf_foot.vox",
+ WolfFootRF::Default => "npc/wolf/wolf_foot_rf.vox",
},
Vec3::new(-2.5, -4.0, -2.5),
)
@@ -434,7 +434,7 @@ impl FigureModelCache {
fn load_wolf_foot_lb(wolf_foot_lb: WolfFootLB) -> Mesh<FigurePipeline> {
Self::load_mesh(
match wolf_foot_lb {
- WolfFootLB::Default => "npc/wolf/wolf_lb_foot.vox",
+ WolfFootLB::Default => "npc/wolf/wolf_foot_lb.vox",
},
Vec3::new(-2.5, -4.0, -2.5),
)
@@ -443,7 +443,7 @@ impl FigureModelCache {
fn load_wolf_foot_rb(wolf_foot_rb: WolfFootRB) -> Mesh<FigurePipeline> {
Self::load_mesh(
match wolf_foot_rb {
- WolfFootRB::Default => "npc/wolf/wolf_rb_foot.vox",
+ WolfFootRB::Default => "npc/wolf/wolf_foot_rb.vox",
},
Vec3::new(-2.5, -4.0, -2.5),
)
diff --git a/voxygen/src/scene/figure/figurequad.rs b/voxygen/src/scene/figure/figurequad.rs
index 6e04ed16b7..d53056823f 100644
--- a/voxygen/src/scene/figure/figurequad.rs
+++ b/voxygen/src/scene/figure/figurequad.rs
@@ -108,7 +108,7 @@ impl FigureModelCache {
fn load_head(head: Head) -> Mesh<FigurePipeline> {
Self::load_mesh(
match head {
- Head::Default => "pig_purple/pighead.vox",
+ Head::Default => "pig_purple/pig_head.vox",
},
Vec3::new(0.0, 0.0, 0.0),
)
@@ -117,7 +117,7 @@ impl FigureModelCache {
fn load_chest(chest: Chest) -> Mesh<FigurePipeline> {
Self::load_mesh(
match chest {
- Chest::Default => "pig_purple/pigchest.vox",
+ Chest::Default => "pig_purple/pig_chest.vox",
},
Vec3::new(0.0, 0.0, 0.0),
)
@@ -126,7 +126,7 @@ impl FigureModelCache {
fn load_leg_lf(leg_l: Leg_l) -> Mesh<FigurePipeline> {
Self::load_mesh(
match belt {
- Belt::Default => "pig_purple/pigleg_l.vox",
+ Belt::Default => "pig_purple/pig_leg_l.vox",
},
Vec3::new(0.0, 0.0, 0.0),
)
@@ -135,7 +135,7 @@ impl FigureModelCache {
fn load_leg_rf(leg_r: Leg_r) -> Mesh<FigurePipeline> {
Self::load_mesh(
match pants {
- Pants::Default => "pig_purple/pigleg_r.vox",
+ Pants::Default => "pig_purple/pig_leg_r.vox",
},
Vec3::new(0.0, 0.0, 0.0),
)
@@ -144,7 +144,7 @@ impl FigureModelCache {
fn load_leg_lb(leg_l: Leg_l) -> Mesh<FigurePipeline> {
Self::load_mesh(
match hand {
- Hand::Default => "pig_purple/pigleg_l.vox",
+ Hand::Default => "pig_purple/pig_leg_l.vox",
},
Vec3::new(0.0, 0.0, 0.0),
)
@@ -153,7 +153,7 @@ impl FigureModelCache {
fn load_leg_rb(leg_r: Leg_r) -> Mesh<FigurePipeline> {
Self::load_mesh(
match hand {
- Hand::Default => "pig_purple/pigleg_r.vox",
+ Hand::Default => "pig_purple/pig_leg_r.vox",
},
Vec3::new(0.0, 0.0, 0.0),
)