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

small placement tweaks

Browse Source
This commit is contained in:
jshipsey 2020-06-06 02:16:24 -04:00
parent 6d9356d269
commit 76354aa3cf
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
voxygen/src/anim/quadruped_low/mod.rs
View File

@ -127,10 +127,10 @@ impl<'a> From<&'a comp::quadruped_low::Body> for SkeletonAttr {
use comp::quadruped_low::Species::*;
Self {
head_upper: match (body.species, body.body_type) {
(Crocodile, _) => (8.0, 4.0),
(Alligator, _) => (-0.5, 3.0),
(Salamander, _) => (3.0, 3.0),
(Monitor, _) => (4.0, 2.0),
(Crocodile, _) => (10.0, 2.0),
(Alligator, _) => (0.5, 3.0),
(Salamander, _) => (3.0, 1.0),
(Monitor, _) => (3.5, 2.0),
},
head_lower: match (body.species, body.body_type) {
(Crocodile, _) => (8.0, 0.0),
@ -153,23 +153,23 @@ impl<'a> From<&'a comp::quadruped_low::Body> for SkeletonAttr {
tail_rear: match (body.species, body.body_type) {
(Crocodile, _) => (-12.5, -1.0),
(Alligator, _) => (-13.0, -1.0),
(Salamander, _) => (-7.0, 0.0),
(Monitor, _) => (-10.0, 0.0),
(Salamander, _) => (-9.0, 0.0),
(Monitor, _) => (-12.0, 0.0),
},
tail_front: match (body.species, body.body_type) {
(Crocodile, _) => (-6.0, 0.0),
(Alligator, _) => (-5.0, 0.0),
(Salamander, _) => (-6.5, 0.0),
(Salamander, _) => (-7.5, 0.0),
(Monitor, _) => (-6.5, 0.0),
},
feet_f: match (body.species, body.body_type) {
(Crocodile, _) => (6.0, 6.0, 0.0),
(Crocodile, _) => (6.0, 6.0, -1.0),
(Alligator, _) => (6.0, 6.0, 0.0),
(Salamander, _) => (6.0, 6.0, -2.0),
(Monitor, _) => (6.0, 6.0, 0.0),
},
feet_b: match (body.species, body.body_type) {
(Crocodile, _) => (6.0, -6.0, 0.0),
(Crocodile, _) => (6.0, -6.0, -1.0),
(Alligator, _) => (6.0, -6.0, 0.0),
(Salamander, _) => (6.0, -6.0, -2.0),
(Monitor, _) => (6.0, -6.0, 0.0),

12
voxygen/src/anim/quadruped_low/run.rs
View File

@ -69,8 +69,8 @@ impl Animation for RunAnimation {
.sqrt())
* ((anim_time as f32 * 16.0 * lab as f32 + PI * 0.4).sin());
///
let foothorilb = (anim_time as f32 * 16.0 * lab as f32 + PI * 1.25).sin();
let foothorirb = (anim_time as f32 * 16.0 * lab as f32 + PI * (0.25)).sin();
let foothorilb = (anim_time as f32 * 16.0 * lab as f32 + PI * 1.45).sin();
let foothorirb = (anim_time as f32 * 16.0 * lab as f32 + PI * (0.45)).sin();
let footvertlb = (anim_time as f32 * 16.0 * lab as f32).sin();
let footvertrb = (anim_time as f32 * 16.0 * lab as f32 + PI*1.0).sin();
@ -78,10 +78,10 @@ impl Animation for RunAnimation {
let footrotlb = (((5.0)
/ (2.5
+ (2.5)
* ((anim_time as f32 * 16.0 * lab as f32 + PI * 1.6).sin())
* ((anim_time as f32 * 16.0 * lab as f32 + PI * 1.4).sin())
.powf(2.0 as f32)))
.sqrt())
* ((anim_time as f32 * 16.0 * lab as f32 + PI * 1.6).sin());
* ((anim_time as f32 * 16.0 * lab as f32 + PI * 1.4).sin());
let footrotrb = (((5.0)
/ (1.0
@ -135,7 +135,7 @@ impl Animation for RunAnimation {
skeleton_attr.tail_front.0,
skeleton_attr.tail_front.1,
);
next.tail_front.ori = Quaternion::rotation_z(short*0.2)*Quaternion::rotation_y(short*0.15);
next.tail_front.ori = Quaternion::rotation_z(short*0.2)*Quaternion::rotation_y(short*0.15)*Quaternion::rotation_x(0.06);
next.tail_front.scale = Vec3::one();
next.tail_rear.offset = Vec3::new(
@ -143,7 +143,7 @@ impl Animation for RunAnimation {
skeleton_attr.tail_rear.0,
skeleton_attr.tail_rear.1 + centeroffset * 0.6,
);
next.tail_rear.ori = Quaternion::rotation_z(short*0.3)*Quaternion::rotation_y(short*0.1);
next.tail_rear.ori = Quaternion::rotation_z(short*0.3)*Quaternion::rotation_y(short*0.1)*Quaternion::rotation_x(-0.04);
next.tail_rear.scale = Vec3::one();
next.chest.offset =

2
voxygen/src/anim/src/character/idle.rs
View File

@ -105,7 +105,7 @@ impl Animation for IdleAnimation {
next.glider.scale = Vec3::one() * 0.0;
next.main.offset = Vec3::new(-7.0, -5.0, 18.0);
next.main.offset = Vec3::new(-7.0, -5.0, 15.0);
next.main.ori = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
next.main.scale = Vec3::one() + head_abs * -0.05;