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

Tweaked lantern offsets

Browse Source
This commit is contained in:
Joshua Barretto 2022-01-19 13:31:55 +00:00 committed by Imbris
parent fcd25648fe
commit 53574bb6ec
2 changed files with 6 additions and 6 deletions
assets/voxygen/voxel
humanoid_lantern_manifest.ron
voxygen/anim/src/character
mod.rs

10
assets/voxygen/voxel/humanoid_lantern_manifest.ron

@ -5,7 +5,7 @@
), ),
map: { map: {
"Green0": ( "Green0": (
vox_spec: ("lantern.green-0", (-2.0, -2.0, -7.0)), vox_spec: ("lantern.green-0", (-2.5, -2.0, -9.0)),
color: None color: None
), ),
"Magic": ( "Magic": (
@ -13,7 +13,7 @@
color: None color: None
), ),
"Black0": ( "Black0": (
vox_spec: ("lantern.black-0", (-2.0, -2.0, -8.5)), vox_spec: ("lantern.black-0", (-2.5, -2.0, -8.5)),
color: None color: None
), ),
"Red0": ( "Red0": (
@ -21,7 +21,7 @@
color: None color: None
), ),
"Blue0": ( "Blue0": (
vox_spec: ("lantern.blue-0", (-2.0, -2.0, -7.0)), vox_spec: ("lantern.blue-0", (-2.5, -2.0, -8.0)),
color: None color: None
), ),
"GeodePurp": ( "GeodePurp": (
@ -29,11 +29,11 @@
color: None color: None
), ),
"PumpkinLantern": ( "PumpkinLantern": (
vox_spec: ("lantern.pumpkin", (-3.5, -4.0, -8.5)), vox_spec: ("lantern.pumpkin", (-4.0, -4.0, -8.5)),
color: None color: None
), ),
"PolarisLantern": ( "PolarisLantern": (
vox_spec: ("lantern.polaris", (-3.0, -4.0, -9.5)), vox_spec: ("lantern.polaris", (-3.5, -4.0, -8.5)),
color: None color: None
), ),
}, },

2
voxygen/anim/src/character/mod.rs

@ -145,7 +145,7 @@ impl Skeleton for CharacterSkeleton {
make_bone(control_mat * hand_l_mat * Mat4::<f32>::from(self.hold)), make_bone(control_mat * hand_l_mat * Mat4::<f32>::from(self.hold)),
]; ];
Offsets { Offsets {
lantern: Some((lantern_mat * Vec4::new(0.0, 0.0, -4.0, 1.0)).xyz()), lantern: Some((lantern_mat * Vec4::new(0.0, 0.5, -6.0, 1.0)).xyz()),
// TODO: see quadruped_medium for how to animate this // TODO: see quadruped_medium for how to animate this
mount_bone: Transform { mount_bone: Transform {
position: common::comp::Body::Humanoid(body) position: common::comp::Body::Humanoid(body)