From ccf939b4fd98248ab634eb51a73ea80f4330d07b Mon Sep 17 00:00:00 2001 From: jshipsey Date: Thu, 4 Jun 2020 22:04:07 -0400 Subject: [PATCH] manifests, skeleton, basic placement --- .../voxel/npc/monitor/female/chest.vox | 2 +- .../voxel/npc/monitor/female/foot_br.vox | 2 +- .../voxel/npc/monitor/female/foot_fr.vox | 2 +- .../voxel/npc/monitor/female/head_lower.vox | 2 +- .../voxygen/voxel/npc/monitor/female/jaw.vox | 4 +- .../voxel/npc/monitor/female/tail_front.vox | 2 +- .../voxygen/voxel/npc/monitor/male/chest.vox | 2 +- .../voxel/npc/monitor/male/foot_br.vox | 2 +- .../voxel/npc/monitor/male/foot_fr.vox | 2 +- .../voxel/npc/monitor/male/head_lower.vox | 2 +- assets/voxygen/voxel/npc/monitor/male/jaw.vox | 4 +- .../voxel/npc/monitor/male/tail_front.vox | 2 +- .../voxel/quadruped_low_central_manifest.ron | 97 +++++++++--------- .../voxel/quadruped_low_lateral_manifest.ron | 64 ++++++------ voxygen/src/anim/quadruped_low/idle.rs | 24 ++--- voxygen/src/anim/quadruped_low/mod.rs | 98 +++++++++---------- voxygen/src/anim/quadruped_low/run.rs | 10 +- voxygen/src/scene/figure/cache.rs | 10 +- 18 files changed, 165 insertions(+), 166 deletions(-) diff --git a/assets/voxygen/voxel/npc/monitor/female/chest.vox b/assets/voxygen/voxel/npc/monitor/female/chest.vox index 8d018372d7..850a2716ce 100644 --- a/assets/voxygen/voxel/npc/monitor/female/chest.vox +++ b/assets/voxygen/voxel/npc/monitor/female/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b1f35212645fddff778054e99dfabe2b5f5e21db7388c58aafb72df7eaf28171 +oid sha256:5e53d11579b65e2016855a9b8e119e26092ac9c191d0f923e7f578eff58ffbb9 size 3144 diff --git a/assets/voxygen/voxel/npc/monitor/female/foot_br.vox b/assets/voxygen/voxel/npc/monitor/female/foot_br.vox index 4c232a08e7..713ed0d4b5 100644 --- a/assets/voxygen/voxel/npc/monitor/female/foot_br.vox +++ b/assets/voxygen/voxel/npc/monitor/female/foot_br.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08aa48b32acf1a53df30bba3c91ae3e15b918f6e7819a4978c4dd89a4c56f2af +oid sha256:dacf8842023579e067302d75133e5baa952c5b662fac1008a219141a7d5f165e size 1260 diff --git a/assets/voxygen/voxel/npc/monitor/female/foot_fr.vox b/assets/voxygen/voxel/npc/monitor/female/foot_fr.vox index 444bc87dd5..1d4f60950c 100644 --- a/assets/voxygen/voxel/npc/monitor/female/foot_fr.vox +++ b/assets/voxygen/voxel/npc/monitor/female/foot_fr.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8b24fe7ac351d6e6550f30f7e539f302d3192703bcbc1d40bd10d29842db520a +oid sha256:0ee8c32f40d91a57807fe3851b8ae5171fb720e5a9abc376d5d6f50d09265c07 size 1292 diff --git a/assets/voxygen/voxel/npc/monitor/female/head_lower.vox b/assets/voxygen/voxel/npc/monitor/female/head_lower.vox index 6d398c4f13..90d9d64e4d 100644 --- a/assets/voxygen/voxel/npc/monitor/female/head_lower.vox +++ b/assets/voxygen/voxel/npc/monitor/female/head_lower.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:26884c11dc7f13243a4f4d26f209f55f3640feec5bf1958c180c10f37f9c50f8 +oid sha256:dd84a35329bd8db1847bc7dd377b84c53ff3a3db50c36c85668d6e896bb4b594 size 1656 diff --git a/assets/voxygen/voxel/npc/monitor/female/jaw.vox b/assets/voxygen/voxel/npc/monitor/female/jaw.vox index 8e59c855e5..55089525ae 100644 --- a/assets/voxygen/voxel/npc/monitor/female/jaw.vox +++ b/assets/voxygen/voxel/npc/monitor/female/jaw.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:468d00d0c4c7e802ec9222bc448a10c7f8adced53266a0ed23e2f9d5da7428d5 -size 1280 +oid sha256:da74647585fc3118e07f27198028fcaea131adf204e8219b1a0d11f8d21da7a8 +size 44387 diff --git a/assets/voxygen/voxel/npc/monitor/female/tail_front.vox b/assets/voxygen/voxel/npc/monitor/female/tail_front.vox index a6cd8b7c20..466c38760a 100644 --- a/assets/voxygen/voxel/npc/monitor/female/tail_front.vox +++ b/assets/voxygen/voxel/npc/monitor/female/tail_front.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:18c076456b400511d05dcfed238427a9545e7c73f18df622d7fbdd33977e7cd2 +oid sha256:532be383684f549e74aae9edaf8518bc58c150e368039a4dc2c49e221a596242 size 1592 diff --git a/assets/voxygen/voxel/npc/monitor/male/chest.vox b/assets/voxygen/voxel/npc/monitor/male/chest.vox index 8d018372d7..850a2716ce 100644 --- a/assets/voxygen/voxel/npc/monitor/male/chest.vox +++ b/assets/voxygen/voxel/npc/monitor/male/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b1f35212645fddff778054e99dfabe2b5f5e21db7388c58aafb72df7eaf28171 +oid sha256:5e53d11579b65e2016855a9b8e119e26092ac9c191d0f923e7f578eff58ffbb9 size 3144 diff --git a/assets/voxygen/voxel/npc/monitor/male/foot_br.vox b/assets/voxygen/voxel/npc/monitor/male/foot_br.vox index 4c232a08e7..713ed0d4b5 100644 --- a/assets/voxygen/voxel/npc/monitor/male/foot_br.vox +++ b/assets/voxygen/voxel/npc/monitor/male/foot_br.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08aa48b32acf1a53df30bba3c91ae3e15b918f6e7819a4978c4dd89a4c56f2af +oid sha256:dacf8842023579e067302d75133e5baa952c5b662fac1008a219141a7d5f165e size 1260 diff --git a/assets/voxygen/voxel/npc/monitor/male/foot_fr.vox b/assets/voxygen/voxel/npc/monitor/male/foot_fr.vox index 444bc87dd5..1d4f60950c 100644 --- a/assets/voxygen/voxel/npc/monitor/male/foot_fr.vox +++ b/assets/voxygen/voxel/npc/monitor/male/foot_fr.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8b24fe7ac351d6e6550f30f7e539f302d3192703bcbc1d40bd10d29842db520a +oid sha256:0ee8c32f40d91a57807fe3851b8ae5171fb720e5a9abc376d5d6f50d09265c07 size 1292 diff --git a/assets/voxygen/voxel/npc/monitor/male/head_lower.vox b/assets/voxygen/voxel/npc/monitor/male/head_lower.vox index 6d398c4f13..90d9d64e4d 100644 --- a/assets/voxygen/voxel/npc/monitor/male/head_lower.vox +++ b/assets/voxygen/voxel/npc/monitor/male/head_lower.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:26884c11dc7f13243a4f4d26f209f55f3640feec5bf1958c180c10f37f9c50f8 +oid sha256:dd84a35329bd8db1847bc7dd377b84c53ff3a3db50c36c85668d6e896bb4b594 size 1656 diff --git a/assets/voxygen/voxel/npc/monitor/male/jaw.vox b/assets/voxygen/voxel/npc/monitor/male/jaw.vox index 8e59c855e5..55089525ae 100644 --- a/assets/voxygen/voxel/npc/monitor/male/jaw.vox +++ b/assets/voxygen/voxel/npc/monitor/male/jaw.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:468d00d0c4c7e802ec9222bc448a10c7f8adced53266a0ed23e2f9d5da7428d5 -size 1280 +oid sha256:da74647585fc3118e07f27198028fcaea131adf204e8219b1a0d11f8d21da7a8 +size 44387 diff --git a/assets/voxygen/voxel/npc/monitor/male/tail_front.vox b/assets/voxygen/voxel/npc/monitor/male/tail_front.vox index a6cd8b7c20..466c38760a 100644 --- a/assets/voxygen/voxel/npc/monitor/male/tail_front.vox +++ b/assets/voxygen/voxel/npc/monitor/male/tail_front.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:18c076456b400511d05dcfed238427a9545e7c73f18df622d7fbdd33977e7cd2 +oid sha256:532be383684f549e74aae9edaf8518bc58c150e368039a4dc2c49e221a596242 size 1592 diff --git a/assets/voxygen/voxel/quadruped_low_central_manifest.ron b/assets/voxygen/voxel/quadruped_low_central_manifest.ron index 8860a70dca..1c43efdab1 100644 --- a/assets/voxygen/voxel/quadruped_low_central_manifest.ron +++ b/assets/voxygen/voxel/quadruped_low_central_manifest.ron @@ -1,209 +1,210 @@ ({ (Crocodile, Male): ( upper: ( - offset: (-7.0, -9.0, -5.5), + offset: (-4.0, -8.5, -3.0), central: ("npc.crocodile.male.head_upper"), ), lower: ( - offset: (-7.0, -4.5, -5.0), + offset: (-4.0, -4.0, -3.0), central: ("npc.crocodile.male.head_lower"), ), jaw: ( - offset: (-3.0, -3.0, -2.5), + offset: (-4.0, -7.0, -1.5), central: ("npc.crocodile.male.jaw"), ), chest: ( - offset: (-8.0, -5.5, -6.0), + offset: (-5.0, -7.5, -3.0), central: ("npc.crocodile.male.chest"), ), tail_rear: ( - offset: (-2.0, -9.5, -5.0), + offset: (-1.0, -4.5, -1.5), central: ("npc.crocodile.male.tail_rear"), ), tail_front: ( - offset: (-2.0, -9.5, -5.0), + offset: (-3.0, -13.0, -2.5), central: ("npc.crocodile.male.tail_front"), ), ), (Crocodile, Female): ( upper: ( - offset: (-7.0, -9.0, -5.5), + offset: (-4.0, -8.5, -3.0), central: ("npc.crocodile.female.head_upper"), ), lower: ( - offset: (-7.0, -4.5, -5.0), + offset: (-4.0, -4.0, -3.0), central: ("npc.crocodile.female.head_lower"), ), jaw: ( - offset: (-3.0, -3.0, -2.5), + offset: (-4.0, -7.0, -1.5), central: ("npc.crocodile.female.jaw"), ), chest: ( - offset: (-8.0, -5.5, -6.0), + offset: (-5.0, -7.5, -3.0), central: ("npc.crocodile.female.chest"), ), tail_rear: ( - offset: (-2.0, -9.5, -5.0), + offset: (-1.0, -4.5, -1.5), central: ("npc.crocodile.female.tail_rear"), ), tail_front: ( - offset: (-2.0, -9.5, -5.0), + offset: (-3.0, -13.0, -2.5), central: ("npc.crocodile.female.tail_front"), ), ), (Alligator, Male): ( upper: ( - offset: (-7.0, -9.0, -5.5), + offset: (-4.0, -8.5, -2.5), central: ("npc.alligator.male.head_upper"), ), lower: ( - offset: (-7.0, -4.5, -5.0), + offset: (-4.0, -4.0, -3.5), central: ("npc.alligator.male.head_lower"), ), jaw: ( - offset: (-3.0, -3.0, -2.5), + offset: (-4.0, -7.5, -2.5), central: ("npc.alligator.male.jaw"), ), chest: ( - offset: (-8.0, -5.5, -6.0), + offset: (-6.0, -7.5, -3.5), central: ("npc.alligator.male.chest"), ), tail_rear: ( - offset: (-2.0, -9.5, -5.0), + offset: (-2.0, -9.0, -1.5), central: ("npc.alligator.male.tail_rear"), ), tail_front: ( - offset: (-2.0, -9.5, -5.0), + offset: (-4.0, -13.0, -2.5), central: ("npc.alligator.male.tail_front"), ), ), (Alligator, Female): ( upper: ( - offset: (-7.0, -9.0, -5.5), + offset: (-4.0, -8.5, -2.5), central: ("npc.alligator.female.head_upper"), ), lower: ( - offset: (-7.0, -4.5, -5.0), + offset: (-4.0, -4.0, -3.5), central: ("npc.alligator.female.head_lower"), ), jaw: ( - offset: (-3.0, -3.0, -2.5), + offset: (-4.0, -7.5, -2.5), central: ("npc.alligator.female.jaw"), ), chest: ( - offset: (-8.0, -5.5, -6.0), + offset: (-6.0, -7.5, -3.5), central: ("npc.alligator.female.chest"), ), tail_rear: ( - offset: (-2.0, -9.5, -5.0), + offset: (-2.0, -9.0, -1.5), central: ("npc.alligator.female.tail_rear"), ), tail_front: ( - offset: (-2.0, -9.5, -5.0), + offset: (-4.0, -13.0, -2.5), central: ("npc.alligator.female.tail_front"), ), ), (Salamander, Male): ( upper: ( - offset: (-7.0, -9.0, -5.5), + offset: (-6.5, -6.0, -2.0), central: ("npc.salamander.male.head_upper"), ), lower: ( - offset: (-7.0, -4.5, -5.0), + offset: (-6.5, -3.5, -2.0), central: ("npc.salamander.male.head_lower"), ), jaw: ( - offset: (-3.0, -3.0, -2.5), + offset: (-5.5, -4.0, -2.0), central: ("npc.salamander.male.jaw"), ), chest: ( - offset: (-8.0, -5.5, -6.0), + offset: (-6.5, -8.5, -3.0), central: ("npc.salamander.male.chest"), ), tail_rear: ( - offset: (-2.0, -9.5, -5.0), + offset: (-3.0, -13.0, -3.0), central: ("npc.salamander.male.tail_rear"), ), tail_front: ( - offset: (-2.0, -9.5, -5.0), + offset: (-4.5, -9.0, -3.0), central: ("npc.salamander.male.tail_front"), ), ), (Salamander, Female): ( upper: ( - offset: (-7.0, -9.0, -5.5), + offset: (-6.5, -6.0, -2.0), central: ("npc.salamander.female.head_upper"), ), lower: ( - offset: (-7.0, -4.5, -5.0), + offset: (-6.5, -3.5, -2.0), central: ("npc.salamander.female.head_lower"), ), jaw: ( - offset: (-3.0, -3.0, -2.5), + offset: (-5.5, -4.0, -2.0), central: ("npc.salamander.female.jaw"), ), chest: ( - offset: (-8.0, -5.5, -6.0), + offset: (-6.5, -8.5, -3.0), central: ("npc.salamander.female.chest"), ), tail_rear: ( - offset: (-2.0, -9.5, -5.0), + offset: (-3.0, -13.0, -3.0), central: ("npc.salamander.female.tail_rear"), ), tail_front: ( - offset: (-2.0, -9.5, -5.0), + offset: (-4.5, -9.0, -3.0), central: ("npc.salamander.female.tail_front"), ), ), (Monitor, Male): ( upper: ( - offset: (-7.0, -9.0, -5.5), + offset: (-3.0, -5.5, -3.0), central: ("npc.monitor.male.head_upper"), ), lower: ( - offset: (-7.0, -4.5, -5.0), + offset: (-3.0, -3.5, -3.5), central: ("npc.monitor.male.head_lower"), ), jaw: ( - offset: (-3.0, -3.0, -2.5), + offset: (-3.0, -3.5, -1.0), central: ("npc.monitor.male.jaw"), ), chest: ( - offset: (-8.0, -5.5, -6.0), + offset: (-4.0, -7.0, -3.0), central: ("npc.monitor.male.chest"), ), tail_rear: ( - offset: (-2.0, -9.5, -5.0), + offset: (-1.0, -11.0, -2.0), central: ("npc.monitor.male.tail_rear"), ), + tail_front: ( - offset: (-2.0, -9.5, -5.0), + offset: (-2.0, -13.0, -2.0), central: ("npc.monitor.male.tail_front"), ), ), (Monitor, Female): ( upper: ( - offset: (-7.0, -9.0, -5.5), + offset: (-3.0, -5.5, -3.0), central: ("npc.monitor.female.head_upper"), ), lower: ( - offset: (-7.0, -4.5, -5.0), + offset: (-3.0, -3.5, -3.5), central: ("npc.monitor.female.head_lower"), ), jaw: ( - offset: (-3.0, -3.0, -2.5), + offset: (-3.0, -3.5, -1.0), central: ("npc.monitor.female.jaw"), ), chest: ( - offset: (-8.0, -5.5, -6.0), + offset: (-4.0, -7.0, -3.0), central: ("npc.monitor.female.chest"), ), tail_rear: ( - offset: (-2.0, -9.5, -5.0), + offset: (-1.0, -11.0, -2.0), central: ("npc.monitor.female.tail_rear"), ), tail_front: ( - offset: (-2.0, -9.5, -5.0), + offset: (-2.0, -13.0, -2.0), central: ("npc.monitor.female.tail_front"), ), ), diff --git a/assets/voxygen/voxel/quadruped_low_lateral_manifest.ron b/assets/voxygen/voxel/quadruped_low_lateral_manifest.ron index 6cc5a0cb0f..e4749253f8 100644 --- a/assets/voxygen/voxel/quadruped_low_lateral_manifest.ron +++ b/assets/voxygen/voxel/quadruped_low_lateral_manifest.ron @@ -1,145 +1,145 @@ ({ (Crocodile, Male): ( front_left: ( - offset: (-2.5, -4.0, -1.5), + offset: (-3.5, -3.5, -4.0), lateral: ("npc.crocodile.male.foot_fl"), ), front_right: ( - offset: (-2.5, -4.0, -1.5), + offset: (-3.5, -3.5, -4.0), lateral: ("npc.crocodile.male.foot_fr"), ), back_left: ( - offset: (-2.5, -4.0, -3.0), + offset: (-4.0, -2.5, -4.0), lateral: ("npc.crocodile.male.foot_bl"), ), back_right: ( - offset: (-2.5, -4.0, -3.0), + offset: (-4.0, -2.5, -4.0), lateral: ("npc.crocodile.male.foot_br"), ), ), (Crocodile, Female): ( front_left: ( - offset: (-2.5, -4.0, -1.5), + offset: (-3.5, -3.5, -4.0), lateral: ("npc.crocodile.female.foot_fl"), ), front_right: ( - offset: (-2.5, -4.0, -1.5), + offset: (-3.5, -3.5, -4.0), lateral: ("npc.crocodile.female.foot_fr"), ), back_left: ( - offset: (-2.5, -4.0, -3.0), + offset: (-4.0, -2.5, -4.0), lateral: ("npc.crocodile.female.foot_bl"), ), back_right: ( - offset: (-2.5, -4.0, -3.0), + offset: (-4.0, -2.5, -4.0), lateral: ("npc.crocodile.female.foot_br"), ), ), (Alligator, Male): ( front_left: ( - offset: (-2.5, -4.0, -1.5), + offset: (-3.5, -3.5, -4.0), lateral: ("npc.alligator.male.foot_fl"), ), front_right: ( - offset: (-2.5, -4.0, -1.5), + offset: (-3.5, -3.5, -4.0), lateral: ("npc.alligator.male.foot_fr"), ), back_left: ( - offset: (-2.5, -4.0, -3.0), + offset: (-4.0, -2.5, -4.0), lateral: ("npc.alligator.male.foot_bl"), ), back_right: ( - offset: (-2.5, -4.0, -3.0), + offset: (-4.0, -2.5, -4.0), lateral: ("npc.alligator.male.foot_br"), ), ), (Alligator, Female): ( front_left: ( - offset: (-2.5, -4.0, -1.5), + offset: (-3.5, -3.5, -4.0), lateral: ("npc.alligator.female.foot_fl"), ), front_right: ( - offset: (-2.5, -4.0, -1.5), + offset: (-3.5, -3.5, -4.0), lateral: ("npc.alligator.female.foot_fr"), ), back_left: ( - offset: (-2.5, -4.0, -3.0), + offset: (-4.0, -2.5, -4.0), lateral: ("npc.alligator.female.foot_bl"), ), back_right: ( - offset: (-2.5, -4.0, -3.0), + offset: (-4.0, -2.5, -4.0), lateral: ("npc.alligator.female.foot_br"), ), ), (Salamander, Male): ( front_left: ( - offset: (-2.5, -4.0, -1.5), + offset: (-3.0, -3.5, -3.0), lateral: ("npc.salamander.male.foot_fl"), ), front_right: ( - offset: (-2.5, -4.0, -1.5), + offset: (-3.0, -3.5, -3.0), lateral: ("npc.salamander.male.foot_fr"), ), back_left: ( - offset: (-2.5, -4.0, -3.0), + offset: (-3.5, -2.5, -3.0), lateral: ("npc.salamander.male.foot_bl"), ), back_right: ( - offset: (-2.5, -4.0, -3.0), + offset: (-3.5, -2.5, -3.0), lateral: ("npc.salamander.male.foot_br"), ), ), (Salamander, Female): ( front_left: ( - offset: (-2.5, -4.0, -1.5), + offset: (-3.0, -3.5, -3.0), lateral: ("npc.salamander.female.foot_fl"), ), front_right: ( - offset: (-2.5, -4.0, -1.5), + offset: (-3.0, -3.5, -3.0), lateral: ("npc.salamander.female.foot_fr"), ), back_left: ( - offset: (-2.5, -4.0, -3.0), + offset: (-3.5, -2.5, -3.0), lateral: ("npc.salamander.female.foot_bl"), ), back_right: ( - offset: (-2.5, -4.0, -3.0), + offset: (-3.5, -2.5, -3.0), lateral: ("npc.salamander.female.foot_br"), ), ), (Monitor, Male): ( front_left: ( - offset: (-2.5, -4.0, -1.5), + offset: (-4.0, -3.5, -5.0), lateral: ("npc.monitor.male.foot_fl"), ), front_right: ( - offset: (-2.5, -4.0, -1.5), + offset: (-4.0, -3.5, -5.0), lateral: ("npc.monitor.male.foot_fr"), ), back_left: ( - offset: (-2.5, -4.0, -3.0), + offset: (-3.5, -2.5, -5.0), lateral: ("npc.monitor.male.foot_bl"), ), back_right: ( - offset: (-2.5, -4.0, -3.0), + offset: (-3.5, -2.5, -5.0), lateral: ("npc.monitor.male.foot_br"), ), ), (Monitor, Female): ( front_left: ( - offset: (-2.5, -4.0, -1.5), + offset: (-4.0, -3.5, -5.0), lateral: ("npc.monitor.female.foot_fl"), ), front_right: ( - offset: (-2.5, -4.0, -1.5), + offset: (-4.0, -3.5, -5.0), lateral: ("npc.monitor.female.foot_fr"), ), back_left: ( - offset: (-2.5, -4.0, -3.0), + offset: (-3.5, -2.5, -5.0), lateral: ("npc.monitor.female.foot_bl"), ), back_right: ( - offset: (-2.5, -4.0, -3.0), + offset: (-3.5, -2.5, -5.0), lateral: ("npc.monitor.female.foot_br"), ), ), diff --git a/voxygen/src/anim/quadruped_low/idle.rs b/voxygen/src/anim/quadruped_low/idle.rs index 380eb268b1..446ef9fd49 100644 --- a/voxygen/src/anim/quadruped_low/idle.rs +++ b/voxygen/src/anim/quadruped_low/idle.rs @@ -17,9 +17,9 @@ impl Animation for IdleAnimation { ) -> Self::Skeleton { let mut next = (*skeleton).clone(); - let ultra_slow = (anim_time as f32 * 1.0).sin(); - let slow = (anim_time as f32 * 2.5).sin(); - let slowalt = (anim_time as f32 * 2.5 + PI / 2.0).sin(); + let ultra_slow = 0.0*(anim_time as f32 * 1.0).sin(); + let slow = 0.0*(anim_time as f32 * 2.5).sin(); + let slowalt = 0.0*(anim_time as f32 * 2.5 + PI / 2.0).sin(); let dragon_look = Vec2::new( ((global_time + anim_time) as f32 / 8.0) @@ -49,30 +49,30 @@ impl Animation for IdleAnimation { skeleton_attr.head_lower.1 + ultra_slow * 0.20, ); next.head_lower.ori = Quaternion::rotation_z(0.8 * dragon_look.x) - * Quaternion::rotation_x(-0.2 + 0.8 * dragon_look.y); - next.head_lower.scale = Vec3::one() * 1.05; + * Quaternion::rotation_x( 0.8 * dragon_look.y); + next.head_lower.scale = Vec3::one(); next.jaw.offset = Vec3::new(0.0, skeleton_attr.jaw.0, skeleton_attr.jaw.1); next.jaw.ori = Quaternion::rotation_x(slow * 0.04); - next.jaw.scale = Vec3::one() * 1.05; + next.jaw.scale = Vec3::one()*0.98; next.chest.offset = Vec3::new( 0.0, skeleton_attr.chest.0, skeleton_attr.chest.1, - ); + )/6.0; next.chest.ori = Quaternion::rotation_y(slow * 0.01); - next.chest.scale = Vec3::one() * 1.05; + next.chest.scale = Vec3::one() /6.0; next.tail_front.offset = Vec3::new(0.0, skeleton_attr.tail_front.0, skeleton_attr.tail_front.1); - next.tail_front.ori = Quaternion::rotation_z(slowalt * 0.10) * Quaternion::rotation_x(0.1); - next.tail_front.scale = Vec3::one() * 0.98; + next.tail_front.ori = Quaternion::rotation_z(0.0); + next.tail_front.scale = Vec3::one()*0.98; next.tail_rear.offset = Vec3::new(0.0, skeleton_attr.tail_rear.0, skeleton_attr.tail_rear.1); - next.tail_rear.ori = Quaternion::rotation_z(slowalt * 0.12) * Quaternion::rotation_x(0.05); - next.tail_rear.scale = Vec3::one() * 0.98; + next.tail_rear.ori = Quaternion::rotation_z(slowalt * 0.12); + next.tail_rear.scale = Vec3::one()*0.98; next.foot_fl.offset = Vec3::new( -skeleton_attr.feet_f.0, diff --git a/voxygen/src/anim/quadruped_low/mod.rs b/voxygen/src/anim/quadruped_low/mod.rs index 30305eb20e..5211dae55f 100644 --- a/voxygen/src/anim/quadruped_low/mod.rs +++ b/voxygen/src/anim/quadruped_low/mod.rs @@ -15,9 +15,9 @@ pub struct QuadrupedLowSkeleton { head_upper: Bone, head_lower: Bone, jaw: Bone, + chest: Bone, tail_front: Bone, tail_rear: Bone, - chest: Bone, foot_fl: Bone, foot_fr: Bone, foot_bl: Bone, @@ -37,7 +37,6 @@ impl Skeleton for QuadrupedLowSkeleton { let head_upper_mat = self.head_upper.compute_base_matrix(); let head_lower_mat = self.head_lower.compute_base_matrix(); let chest_mat = self.chest.compute_base_matrix(); - let chest_mat = self.chest.compute_base_matrix(); ( [ FigureBoneData::new(chest_mat * head_lower_mat * head_upper_mat), @@ -52,14 +51,13 @@ impl Skeleton for QuadrupedLowSkeleton { FigureBoneData::new(chest_mat * self.tail_front.compute_base_matrix()), FigureBoneData::new( chest_mat - * chest_mat * self.tail_front.compute_base_matrix() * self.tail_rear.compute_base_matrix(), ), - FigureBoneData::new(self.foot_fl.compute_base_matrix()), - FigureBoneData::new(self.foot_fr.compute_base_matrix()), - FigureBoneData::new(self.foot_bl.compute_base_matrix()), - FigureBoneData::new(self.foot_br.compute_base_matrix()), + FigureBoneData::new(chest_mat*self.foot_fl.compute_base_matrix()), + FigureBoneData::new(chest_mat*self.foot_fr.compute_base_matrix()), + FigureBoneData::new(chest_mat*self.foot_bl.compute_base_matrix()), + FigureBoneData::new(chest_mat*self.foot_br.compute_base_matrix()), FigureBoneData::default(), FigureBoneData::default(), FigureBoneData::default(), @@ -75,9 +73,9 @@ impl Skeleton for QuadrupedLowSkeleton { self.head_upper.interpolate(&target.head_upper, dt); self.head_lower.interpolate(&target.head_lower, dt); self.jaw.interpolate(&target.jaw, dt); + self.chest.interpolate(&target.chest, dt); self.tail_front.interpolate(&target.tail_front, dt); self.tail_rear.interpolate(&target.tail_rear, dt); - self.chest.interpolate(&target.chest, dt); self.foot_fl.interpolate(&target.foot_fl, dt); self.foot_fr.interpolate(&target.foot_fr, dt); self.foot_bl.interpolate(&target.foot_bl, dt); @@ -89,9 +87,9 @@ pub struct SkeletonAttr { head_upper: (f32, f32), head_lower: (f32, f32), jaw: (f32, f32), + chest: (f32, f32), tail_front: (f32, f32), tail_rear: (f32, f32), - chest: (f32, f32), feet_f: (f32, f32, f32), feet_b: (f32, f32, f32), height: f32, @@ -114,9 +112,9 @@ impl Default for SkeletonAttr { head_upper: (0.0, 0.0), head_lower: (0.0, 0.0), jaw: (0.0, 0.0), + chest: (0.0, 0.0), tail_front: (0.0, 0.0), tail_rear: (0.0, 0.0), - chest: (0.0, 0.0), feet_f: (0.0, 0.0, 0.0), feet_b: (0.0, 0.0, 0.0), height: (0.0), @@ -129,58 +127,58 @@ 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, _) => (12.0, 16.0), - (Alligator, _) => (12.0, 16.0), - (Salamander, _) => (12.0, 16.0), - (Monitor, _) => (12.0, 16.0), + (Crocodile, _) => (8.0, 4.0), + (Alligator, _) => (7.0, 4.0), + (Salamander, _) => (3.0, 3.0), + (Monitor, _) => (4.0, 2.0), }, head_lower: match (body.species, body.body_type) { - (Crocodile, _) => (-4.0, -7.0), - (Alligator, _) => (-4.0, -7.0), - (Salamander, _) => (-4.0, -7.0), - (Monitor, _) => (-4.0, -7.0), + (Crocodile, _) => (8.0, 0.0), + (Alligator, _) => (7.0, 0.0), + (Salamander, _) => (10.0, 2.0), + (Monitor, _) => (10.0, 3.0), }, jaw: match (body.species, body.body_type) { - (Crocodile, _) => (3.0, -5.0), - (Alligator, _) => (3.0, -5.0), - (Salamander, _) => (3.0, -5.0), - (Monitor, _) => (3.0, -5.0), - }, - tail_rear: match (body.species, body.body_type) { - (Crocodile, _) => (-6.0, -2.0), - (Alligator, _) => (-6.0, -2.0), - (Salamander, _) => (-6.0, -2.0), - (Monitor, _) => (-6.0, -2.0), - }, - tail_front: match (body.species, body.body_type) { - (Crocodile, _) => (-6.0, -2.0), - (Alligator, _) => (-6.0, -2.0), - (Salamander, _) => (-6.0, -2.0), - (Monitor, _) => (-6.0, -2.0), + (Crocodile, _) => (0.0, -3.0), + (Alligator, _) => (0.0, -2.0), + (Salamander, _) => (2.0, -3.0), + (Monitor, _) => (0.0, -1.0), }, chest: match (body.species, body.body_type) { - (Crocodile, _) => (4.0, 11.0), - (Alligator, _) => (4.0, 11.0), - (Salamander, _) => (4.0, 11.0), - (Monitor, _) => (4.0, 11.0), + (Crocodile, _) => (0.0, 5.0), + (Alligator, _) => (0.0, 5.0), + (Salamander, _) => (0.0, 5.0), + (Monitor, _) => (0.0, 5.0), + }, + tail_rear: match (body.species, body.body_type) { + (Crocodile, _) => (-14.0, -1.0), + (Alligator, _) => (-13.0, -1.0), + (Salamander, _) => (-7.0, 0.0), + (Monitor, _) => (-5.0, 0.0), + }, + tail_front: match (body.species, body.body_type) { + (Crocodile, _) => (-6.0, 0.0), + (Alligator, _) => (-5.0, 0.0), + (Salamander, _) => (-5.0, 0.0), + (Monitor, _) => (-5.0, 0.0), }, feet_f: match (body.species, body.body_type) { - (Crocodile, _) => (5.0, 6.0, 2.0), - (Alligator, _) => (5.0, 6.0, 2.0), - (Salamander, _) => (5.0, 6.0, 2.0), - (Monitor, _) => (5.0, 6.0, 2.0), + (Crocodile, _) => (6.0, 6.0, 0.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, _) => (5.0, -4.0, 3.0), - (Alligator, _) => (5.0, -4.0, 3.0), - (Salamander, _) => (5.0, -4.0, 3.0), - (Monitor, _) => (5.0, -4.0, 3.0), + (Crocodile, _) => (6.0, -6.0, 0.0), + (Alligator, _) => (6.0, -6.0, 0.0), + (Salamander, _) => (6.0, -6.0, -2.0), + (Monitor, _) => (6.0, -6.0, 0.0), }, height: match (body.species, body.body_type) { - (Crocodile, _) => (1.2), - (Alligator, _) => (1.2), - (Salamander, _) => (1.2), - (Monitor, _) => (1.2), + (Crocodile, _) => (1.0), + (Alligator, _) => (1.0), + (Salamander, _) => (1.0), + (Monitor, _) => (1.0), }, } } diff --git a/voxygen/src/anim/quadruped_low/run.rs b/voxygen/src/anim/quadruped_low/run.rs index bc842b3edf..72aba02ba0 100644 --- a/voxygen/src/anim/quadruped_low/run.rs +++ b/voxygen/src/anim/quadruped_low/run.rs @@ -68,7 +68,7 @@ impl Animation for RunAnimation { skeleton_attr.jaw.1 + wave_slow * 0.2, ); next.jaw.ori = Quaternion::rotation_x(wave_slow * 0.03); - next.jaw.scale = Vec3::one() * 1.05; + next.jaw.scale = Vec3::one(); next.tail_front.offset = Vec3::new( 0.0, @@ -76,7 +76,7 @@ impl Animation for RunAnimation { skeleton_attr.tail_front.1 + centeroffset * 0.6, ); next.tail_front.ori = Quaternion::rotation_x(center * 0.03); - next.tail_front.scale = Vec3::one() * 0.98; + next.tail_front.scale = Vec3::one(); next.tail_rear.offset = Vec3::new( 0.0, @@ -84,12 +84,12 @@ impl Animation for RunAnimation { skeleton_attr.tail_rear.1 + centeroffset * 0.6, ); next.tail_rear.ori = Quaternion::rotation_x(center * 0.03); - next.tail_rear.scale = Vec3::one() * 0.98; + next.tail_rear.scale = Vec3::one(); next.chest.offset = - Vec3::new(0.0, skeleton_attr.chest.0, skeleton_attr.chest.1); + Vec3::new(0.0, skeleton_attr.chest.0, skeleton_attr.chest.1)/6.0; next.chest.ori = Quaternion::rotation_y(horichest * -0.09); - next.chest.scale = Vec3::one(); + next.chest.scale = Vec3::one()/6.0; next.foot_fl.offset = Vec3::new( -skeleton_attr.feet_f.0, diff --git a/voxygen/src/scene/figure/cache.rs b/voxygen/src/scene/figure/cache.rs index cf5c55278c..bf96ae1269 100644 --- a/voxygen/src/scene/figure/cache.rs +++ b/voxygen/src/scene/figure/cache.rs @@ -716,6 +716,11 @@ impl FigureModelCache { body.body_type, generate_mesh, )), + Some(quadruped_low_central_spec.mesh_chest( + body.species, + body.body_type, + generate_mesh, + )), Some(quadruped_low_central_spec.mesh_tail_front( body.species, body.body_type, @@ -726,11 +731,6 @@ impl FigureModelCache { body.body_type, generate_mesh, )), - Some(quadruped_low_central_spec.mesh_chest( - body.species, - body.body_type, - generate_mesh, - )), Some(quadruped_low_lateral_spec.mesh_foot_fl( body.species, body.body_type,