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

finish odonto

Browse Source
This commit is contained in:
jshipsey 2020-09-17 22:18:29 -04:00
parent b0767cb7a5
commit fff6a6fb0a
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/voxygen/voxel/npc/odonto/male/neck.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

8
assets/voxygen/voxel/theropod_central_manifest.ron
View File

@ -69,8 +69,8 @@
central: ("npc.odonto.male.jaw"),
),
neck: (
offset: (0.0, 0.0, 0.0),
central: ("armor.empty"),
offset: (-5.5, 0.0, -6.5),
central: ("npc.odonto.male.neck"),
),
chest_front: (
offset: (-5.5, -5.0, -6.0),
@ -99,8 +99,8 @@
central: ("npc.odonto.male.jaw"),
),
neck: (
offset: (0.0, 0.0, 0.0),
central: ("armor.empty"),
offset: (-5.5, 0.0, -6.5),
central: ("npc.odonto.male.neck"),
),
chest_front: (
offset: (-5.5, -5.0, -6.0),

4
voxygen/src/anim/src/quadruped_medium/run.rs
View File

@ -67,14 +67,14 @@ impl Animation for RunAnimation {
(anim_time as f32 * (16.0) * lab as f32 * speedmult + 0.0 + canceler * 0.05 + shift1)
.sin(); //1.5
let foot1b =
(anim_time as f32 * (16.0) * lab as f32 * speedmult + 1.57 + canceler * 0.05 + shift1)
(anim_time as f32 * (16.0) * lab as f32 * speedmult + 1.1 + canceler * 0.05 + shift1)
.sin(); //1.9
//FR
let foot2a = (anim_time as f32 * (16.0) * lab as f32 * speedmult + shift2).sin(); //1.2
let foot2b = (anim_time as f32 * (16.0) * lab as f32 * speedmult + 1.1 + shift2).sin(); //1.6
//BL
let foot3a = (anim_time as f32 * (16.0) * lab as f32 * speedmult + shift3).sin(); //0.0
let foot3b = (anim_time as f32 * (16.0) * lab as f32 * speedmult + 1.1 + shift3).sin(); //0.4
let foot3b = (anim_time as f32 * (16.0) * lab as f32 * speedmult + 1.57 + shift3).sin(); //0.4
//BR
let foot4a =
(anim_time as f32 * (16.0) * lab as f32 * speedmult + 0.0 + canceler * 0.05 + shift4)

4
voxygen/src/anim/src/theropod/mod.rs
View File

@ -116,7 +116,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
Self {
head: match (body.species, body.body_type) {
(Archaeos, _) => (8.0, 4.0),
(Odonto, _) => (-1.0, 5.0),
(Odonto, _) => (6.0, 5.0),
},
jaw: match (body.species, body.body_type) {
(Archaeos, _) => (1.0, -7.0),
@ -124,7 +124,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
},
neck: match (body.species, body.body_type) {
(Archaeos, _) => (4.5, -2.0),
(Odonto, _) => (4.5, -2.0),
(Odonto, _) => (3.0, -3.0),
},
chest_front: match (body.species, body.body_type) {
(Archaeos, _) => (0.0, 20.0),