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

post-quad rewrite fixup

Browse Source
This commit is contained in:
Snowram 2020-07-06 06:07:29 +00:00 committed by Justin Shipsey
parent 3c1fddfb0b
commit d6da1f0e75
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,44 +132,44 @@ impl Animation for RunAnimation {
next.foot_fl.offset = Vec3::new(
-skeleton_attr.feet_f.0,
skeleton_attr.feet_f.1 + foothoril * -1.0,
skeleton_attr.feet_f.2 + 1.0 + ((footvertl * -0.8).max(-0.0)),
skeleton_attr.feet_f.1 + foothoril * -2.0,
skeleton_attr.feet_f.2 + 1.0 + ((footvertl * -1.8).max(-0.0)),
);
next.foot_fl.ori = Quaternion::rotation_x(
-0.2 + footvertl * -0.35 * skeleton_attr.lean.1 - skeleton_attr.lean.0,
-0.2 + footvertl * -0.45 * skeleton_attr.lean.1 - skeleton_attr.lean.0,
) * Quaternion::rotation_y(tilt * -1.0)
* Quaternion::rotation_z(footvertl * 0.4 * skeleton_attr.lean.1);
* Quaternion::rotation_z(foothoril * 0.4 * skeleton_attr.lean.1 + tilt * -2.0);
next.foot_fl.scale = Vec3::one();
next.foot_fr.offset = Vec3::new(
skeleton_attr.feet_f.0,
skeleton_attr.feet_f.1 + foothorir * -1.0,
skeleton_attr.feet_f.2 + 1.0 + ((footvertr * -0.8).max(-0.0)),
skeleton_attr.feet_f.1 + foothorir * -2.0,
skeleton_attr.feet_f.2 + 1.0 + ((footvertr * -1.8).max(-0.0)),
);
next.foot_fr.ori = Quaternion::rotation_x(
-0.2 + footvertr * -0.25 * skeleton_attr.lean.1 - skeleton_attr.lean.0,
-0.2 + footvertr * -0.45 * skeleton_attr.lean.1 - skeleton_attr.lean.0,
) * Quaternion::rotation_y(tilt * -1.0)
* Quaternion::rotation_z(footvertr * -0.4 * skeleton_attr.lean.1 + tilt * 3.5);
* Quaternion::rotation_z(foothorir * -0.4 * skeleton_attr.lean.1 + tilt * -2.0);
next.foot_fr.scale = Vec3::one();
next.foot_bl.offset = Vec3::new(
-skeleton_attr.feet_b.0,
skeleton_attr.feet_b.1 + foothorilb * -1.0,
skeleton_attr.feet_b.2 + 1.0 + ((footvertlb * -0.6).max(-0.0)),
skeleton_attr.feet_b.2 + 1.0 + ((footvertlb * -1.2).max(-0.0)),
);
next.foot_bl.ori = Quaternion::rotation_x(-0.2 + footvertlb * -0.3 - skeleton_attr.lean.0)
next.foot_bl.ori = Quaternion::rotation_x(-0.2 + footvertlb * -0.5 - skeleton_attr.lean.0)
* Quaternion::rotation_y(tilt * -1.0)
* Quaternion::rotation_z(footvertlb * 0.4);
* Quaternion::rotation_z(foothorilb * 0.4 + tilt * -2.0);
next.foot_bl.scale = Vec3::one();
next.foot_br.offset = Vec3::new(
skeleton_attr.feet_b.0,
skeleton_attr.feet_b.1 + foothorirb * -1.0,
skeleton_attr.feet_b.2 + 1.0 + ((footvertrb * -0.6).max(-0.0)),
skeleton_attr.feet_b.2 + 1.0 + ((footvertrb * -1.2).max(-0.0)),
);
next.foot_br.ori = Quaternion::rotation_x(-0.2 + footvertrb * -0.3 - skeleton_attr.lean.0)
next.foot_br.ori = Quaternion::rotation_x(-0.2 + footvertrb * -0.5 - skeleton_attr.lean.0)
* Quaternion::rotation_y(tilt * -1.0)
* Quaternion::rotation_z(footvertrb * -0.4);
* Quaternion::rotation_z(foothorirb * -0.4 + tilt * -2.0);
next.foot_br.scale = Vec3::one();
next

2
world/src/lib.rs
View File

@ -197,7 +197,7 @@ impl World {
let entity = EntityInfo::at(gen_entity_pos())
.with_alignment(comp::Alignment::Wild)
.do_if(rng.gen_range(0, 8) == 0, |e| e.into_giant())
.with_body(match rng.gen_range(0, 4) {
.with_body(match rng.gen_range(0, 5) {
0 => comp::Body::QuadrupedMedium(quadruped_medium::Body::random()),
1 => comp::Body::BirdMedium(bird_medium::Body::random()),
2 => comp::Body::Critter(critter::Body::random()),