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

Merge branch 'floppy_bird_medium_scale' into 'master'

Browse Source 
bird_medium_scale

See merge request veloren/veloren!3820
This commit is contained in:
Isse 2023-03-12 18:08:21 +00:00
commit fd34e48d15
8 changed files with 71 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/voxygen/voxel/npc/parrot/female/leg_r.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/parrot/male/leg_r.vox (Stored with Git LFS)
View File

Binary file not shown.

32
common/src/comp/body.rs
View File

@ -536,22 +536,22 @@ impl Body {
arthropod::Species::Sandcrawler => Vec3::new(3.2, 4.0, 1.4),
},
Body::BirdMedium(body) => match body.species {
bird_medium::Species::SnowyOwl => Vec3::new(1.8, 1.8, 1.8),
bird_medium::Species::HornedOwl => Vec3::new(1.8, 1.8, 1.8),
bird_medium::Species::Duck => Vec3::new(1.0, 1.5, 1.5),
bird_medium::Species::Cockatiel => Vec3::new(1.2, 1.0, 1.6),
bird_medium::Species::Chicken => Vec3::new(1.2, 1.5, 2.0),
bird_medium::Species::Bat => Vec3::new(2.0, 2.0, 1.5),
bird_medium::Species::Penguin => Vec3::new(1.5, 1.1, 2.5),
bird_medium::Species::Goose => Vec3::new(1.8, 1.8, 2.3),
bird_medium::Species::Peacock => Vec3::new(2.2, 2.5, 2.8),
bird_medium::Species::Eagle => Vec3::new(3.3, 2.5, 2.0),
bird_medium::Species::Parrot => Vec3::new(1.5, 1.5, 1.6),
bird_medium::Species::Crow => Vec3::new(2.0, 2.5, 1.5),
bird_medium::Species::Dodo => Vec3::new(2.5, 2.0, 2.0),
bird_medium::Species::Parakeet => Vec3::new(1.2, 1.0, 1.6),
bird_medium::Species::Puffin => Vec3::new(2.0, 2.0, 2.0),
bird_medium::Species::Toucan => Vec3::new(2.5, 2.0, 1.5),
bird_medium::Species::SnowyOwl => Vec3::new(1.2, 1.2, 0.9),
bird_medium::Species::HornedOwl => Vec3::new(1.2, 1.2, 0.9),
bird_medium::Species::Duck => Vec3::new(0.8, 1.3, 0.8),
bird_medium::Species::Cockatiel => Vec3::new(0.8, 1.0, 0.7),
bird_medium::Species::Chicken => Vec3::new(1.2, 1.5, 0.9),
bird_medium::Species::Bat => Vec3::new(2.0, 1.8, 1.3),
bird_medium::Species::Penguin => Vec3::new(1.0, 1.0, 1.2),
bird_medium::Species::Goose => Vec3::new(1.5, 1.5, 1.1),
bird_medium::Species::Peacock => Vec3::new(1.6, 1.8, 1.4),
bird_medium::Species::Eagle => Vec3::new(1.5, 2.2, 1.0),
bird_medium::Species::Parrot => Vec3::new(1.2, 1.5, 1.1),
bird_medium::Species::Crow => Vec3::new(1.0, 1.2, 0.8),
bird_medium::Species::Dodo => Vec3::new(1.2, 1.8, 1.1),
bird_medium::Species::Parakeet => Vec3::new(0.8, 0.9, 0.7),
bird_medium::Species::Puffin => Vec3::new(1.0, 1.0, 1.0),
bird_medium::Species::Toucan => Vec3::new(2.1, 1.1, 1.2),
},
}
}

8
voxygen/anim/src/bird_medium/fly.rs
View File

@ -59,8 +59,8 @@ impl Animation for FlyAnimation {
} * 1.3;
next.head.scale = Vec3::one() * 0.99;
next.leg_l.scale = Vec3::one();
next.leg_r.scale = Vec3::one();
next.leg_l.scale = Vec3::one() * s_a.scaler * 0.99;
next.leg_r.scale = Vec3::one() * s_a.scaler * 0.99;
next.chest.scale = Vec3::one() * s_a.scaler * 0.99;
next.tail.scale = Vec3::one() * 1.01;
@ -129,10 +129,10 @@ impl Animation for FlyAnimation {
next.tail.orientation =
Quaternion::rotation_x(0.04 - slow * 0.04) * Quaternion::rotation_z(tilt * 1.0);
next.leg_l.position = Vec3::new(-s_a.leg.0, s_a.leg.1, s_a.leg.2 + slow * 0.05);
next.leg_l.position = Vec3::new(-s_a.leg.0, s_a.leg.1, s_a.leg.2 + 1.0 + slow * 0.05);
next.leg_l.orientation = Quaternion::rotation_x(-1.2 + slow * -0.05)
* Quaternion::rotation_y(tilt * 1.6 + fast * 0.01);
next.leg_r.position = Vec3::new(s_a.leg.0, s_a.leg.1, s_a.leg.2 + slow * 0.05);
next.leg_r.position = Vec3::new(s_a.leg.0, s_a.leg.1, s_a.leg.2 + 1.0 + slow * 0.05);
next.leg_r.orientation = Quaternion::rotation_x(-1.2 + slow * -0.05)
* Quaternion::rotation_y(tilt * 1.6 + fast * 0.01);
}

4
voxygen/anim/src/bird_medium/idle.rs
View File

@ -37,8 +37,8 @@ impl Animation for IdleAnimation {
let wave_slow_cos = (anim_time * 4.5).cos();
next.head.scale = Vec3::one() * 0.99;
next.leg_l.scale = Vec3::one();
next.leg_r.scale = Vec3::one();
next.leg_l.scale = Vec3::one() * s_a.scaler * 0.99;
next.leg_r.scale = Vec3::one() * s_a.scaler * 0.99;
next.chest.scale = Vec3::one() * s_a.scaler * 0.99;
next.tail.scale = Vec3::one() * 1.01;

82
voxygen/anim/src/bird_medium/mod.rs
View File

@ -142,18 +142,18 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(HornedOwl, _) => (0.0, 4.5),
(Duck, _) => (0.0, 4.0),
(Cockatiel, _) => (0.0, 4.0),
(Chicken, Male) => (0.0, 6.5),
(Chicken, Female) => (0.0, 6.5),
(Bat, _) => (0.0, 8.0),
(Penguin, _) => (0.0, 8.0),
(Goose, _) => (0.0, 7.0),
(Peacock, _) => (0.0, 9.5),
(Chicken, Male) => (0.0, 5.5),
(Chicken, Female) => (0.0, 5.5),
(Bat, _) => (0.0, 7.0),
(Penguin, _) => (0.0, 7.0),
(Goose, _) => (0.0, 6.5),
(Peacock, _) => (0.0, 7.5),
(Eagle, _) => (0.0, 6.0),
(Parrot, _) => (0.0, 5.0),
(Crow, _) => (0.0, 4.0),
(Dodo, _) => (0.0, 6.0),
(Parakeet, _) => (0.0, 4.0),
(Puffin, _) => (0.0, 7.0),
(Parakeet, _) => (0.0, 3.5),
(Puffin, _) => (0.0, 6.0),
(Toucan, _) => (0.0, 5.0),
},
head: match (body.species, body.body_type) {
@ -233,41 +233,41 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Toucan, _) => (5.0, 3.0, 0.5),
},
leg: match (body.species, body.body_type) {
(SnowyOwl, _) => (1.5, -2.5, 7.0),
(HornedOwl, _) => (1.5, -2.5, 7.0),
(Duck, _) => (2.5, -2.0, 4.0),
(Cockatiel, _) => (1.5, -1.0, 4.0),
(Chicken, Male) => (2.0, 0.0, 6.0),
(Chicken, Female) => (2.0, 0.0, 6.0),
(Bat, _) => (5.0, -1.0, 8.0),
(Penguin, _) => (2.5, -2.0, 6.0),
(Goose, _) => (2.0, -3.5, 6.0),
(Peacock, _) => (1.0, -2.5, 9.5),
(Eagle, _) => (2.0, -4.0, 6.0),
(Parrot, _) => (1.5, -3.0, 3.0),
(Crow, _) => (2.0, -2.5, 3.0),
(Dodo, _) => (1.5, -3.0, 4.0),
(Parakeet, _) => (1.5, -2.0, 2.0),
(Puffin, _) => (2.0, -3.0, 3.5),
(Toucan, _) => (1.5, -3.0, 3.0),
(SnowyOwl, _) => (1.5, -2.5, 4.8),
(HornedOwl, _) => (1.5, -2.5, 4.8),
(Duck, _) => (1.5, 0.0, 3.0),
(Cockatiel, _) => (1.0, -1.0, 3.0),
(Chicken, Male) => (1.0, 0.0, 4.4),
(Chicken, Female) => (1.0, 0.0, 4.4),
(Bat, _) => (2.5, -1.0, 6.0),
(Penguin, _) => (1.5, -1.5, 4.5),
(Goose, _) => (2.0, -2.5, 4.4),
(Peacock, _) => (2.0, -2.0, 7.0),
(Eagle, _) => (1.5, -4.0, 4.4),
(Parrot, _) => (1.5, -1.0, 2.2),
(Crow, _) => (1.5, -2.5, 2.1),
(Dodo, _) => (1.5, -3.0, 3.0),
(Parakeet, _) => (1.0, -2.0, 1.3),
(Puffin, _) => (1.5, -2.2, 2.5),
(Toucan, _) => (1.5, -3.0, 2.3),
},
scaler: match (body.species, body.body_type) {
(SnowyOwl, _) => 1.0,
(HornedOwl, _) => 1.0,
(Duck, _) => 1.0,
(Cockatiel, _) => 1.0,
(Chicken, _) => 1.0,
(Bat, _) => 1.0,
(Penguin, _) => 1.0,
(Goose, _) => 1.0,
(Peacock, _) => 1.0,
(Eagle, _) => 1.0,
(Parrot, _) => 1.0,
(Crow, _) => 1.0,
(Dodo, _) => 1.0,
(Parakeet, _) => 1.0,
(Puffin, _) => 1.0,
(Toucan, _) => 1.0,
(SnowyOwl, _) => 0.75,
(HornedOwl, _) => 0.75,
(Duck, _) => 0.75,
(Cockatiel, _) => 0.75,
(Chicken, _) => 0.75,
(Bat, _) => 0.75,
(Penguin, _) => 0.75,
(Goose, _) => 0.75,
(Peacock, _) => 0.75,
(Eagle, _) => 0.75,
(Parrot, _) => 0.75,
(Crow, _) => 0.75,
(Dodo, _) => 0.75,
(Parakeet, _) => 0.75,
(Puffin, _) => 0.75,
(Toucan, _) => 0.75,
},
feed: match (body.species, body.body_type) {
(SnowyOwl, _) => -0.65,

8
voxygen/anim/src/bird_medium/run.rs
View File

@ -67,8 +67,8 @@ impl Animation for RunAnimation {
let x_tilt = avg_vel.z.atan2(avg_vel.xy().magnitude()) * speednorm;
next.head.scale = Vec3::one() * 0.99;
next.leg_l.scale = Vec3::one();
next.leg_r.scale = Vec3::one();
next.leg_l.scale = Vec3::one() * s_a.scaler * 0.99;
next.leg_r.scale = Vec3::one() * s_a.scaler * 0.99;
next.chest.scale = Vec3::one() * s_a.scaler * 0.99;
next.tail.scale = Vec3::one() * 1.01;
@ -106,11 +106,11 @@ impl Animation for RunAnimation {
next.wing_out_r.orientation =
Quaternion::rotation_y(0.2 + short * -0.05) * Quaternion::rotation_z(-0.2);
next.leg_l.position = Vec3::new(-s_a.leg.0, s_a.leg.1 + foot1b * -2.3, s_a.leg.2);
next.leg_l.position = Vec3::new(-s_a.leg.0, s_a.leg.1 + foot1b * -0.8, s_a.leg.2);
next.leg_l.orientation = Quaternion::rotation_x(-0.2 * speednorm + foot1a * 0.15)
* Quaternion::rotation_y(tilt * 0.5);
next.leg_r.position = Vec3::new(s_a.leg.0, s_a.leg.1 + foot2b * -2.3, s_a.leg.2);
next.leg_r.position = Vec3::new(s_a.leg.0, s_a.leg.1 + foot2b * -0.8, s_a.leg.2);
next.leg_r.orientation = Quaternion::rotation_x(-0.2 * speednorm + foot2a * 0.15)
* Quaternion::rotation_y(tilt * 0.5);
next

4
voxygen/anim/src/bird_medium/swim.rs
View File

@ -41,8 +41,8 @@ impl Animation for SwimAnimation {
let wave_fast_cos = (anim_time * 6.0).cos();
next.head.scale = Vec3::one() * 0.99;
next.leg_l.scale = Vec3::one();
next.leg_r.scale = Vec3::one();
next.leg_l.scale = Vec3::one() * s_a.scaler * 0.99;
next.leg_r.scale = Vec3::one() * s_a.scaler * 0.99;
next.chest.scale = Vec3::one() * s_a.scaler * 0.99;
next.tail.scale = Vec3::one() * 1.01;