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

rebase

Browse Source
This commit is contained in:
jshipsey
2020-05-09 18:56:08 -04:00
parent cf392b5a66
commit 41ff0bde69
2 changed files with 121 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

228
voxygen/src/anim/biped_large/mod.rs
View File

@ -1,114 +1,100 @@
pub mod fly;
pub mod idle; pub mod idle;
pub mod jump;
pub mod run; pub mod run;
// Reexports // Reexports
pub use self::{fly::FlyAnimation, idle::IdleAnimation, run::RunAnimation}; pub use self::{idle::IdleAnimation, jump::JumpAnimation, run::RunAnimation};
use super::{Bone, Skeleton}; use super::{Bone, Skeleton};
use crate::render::FigureBoneData; use crate::render::FigureBoneData;
use common::comp::{self}; use common::comp::{self};
use vek::Vec3;
#[derive(Clone, Default)] #[derive(Clone, Default)]
pub struct DragonSkeleton { pub struct BipedLargeSkeleton {
head_upper: Bone, head: Bone,
head_lower: Bone, upper_torso: Bone,
jaw: Bone, lower_torso: Bone,
chest_front: Bone, shoulder_l: Bone,
chest_rear: Bone, shoulder_r: Bone,
tail_front: Bone, hand_l: Bone,
tail_rear: Bone, hand_r: Bone,
wing_in_l: Bone, leg_l: Bone,
wing_in_r: Bone, leg_r: Bone,
wing_out_l: Bone, foot_l: Bone,
wing_out_r: Bone, foot_r: Bone,
foot_fl: Bone, torso: Bone,
foot_fr: Bone,
foot_bl: Bone,
foot_br: Bone,
} }
impl DragonSkeleton { impl BipedLargeSkeleton {
pub fn new() -> Self { Self::default() } pub fn new() -> Self { Self::default() }
} }
impl Skeleton for DragonSkeleton { impl Skeleton for BipedLargeSkeleton {
type Attr = SkeletonAttr; type Attr = SkeletonAttr;
fn bone_count(&self) -> usize { 15 } fn bone_count(&self) -> usize { 11 }
fn compute_matrices(&self) -> [FigureBoneData; 16] { fn compute_matrices(&self) -> ([FigureBoneData; 16], Vec3<f32>) {
let head_upper_mat = self.head_upper.compute_base_matrix(); let upper_torso_mat = self.upper_torso.compute_base_matrix();
let head_lower_mat = self.head_lower.compute_base_matrix(); let shoulder_l_mat = self.shoulder_l.compute_base_matrix();
let chest_front_mat = self.chest_front.compute_base_matrix(); let shoulder_r_mat = self.shoulder_r.compute_base_matrix();
let chest_rear_mat = self.chest_rear.compute_base_matrix(); let leg_l_mat = self.leg_l.compute_base_matrix();
let wing_in_l_mat = self.wing_in_l.compute_base_matrix(); let leg_r_mat = self.leg_r.compute_base_matrix();
let wing_in_r_mat = self.wing_in_r.compute_base_matrix(); let torso_mat = self.torso.compute_base_matrix();
let tail_front_mat = self.tail_front.compute_base_matrix(); (
[
[ FigureBoneData::new(torso_mat * upper_torso_mat * self.head.compute_base_matrix()),
FigureBoneData::new(chest_front_mat * head_lower_mat * head_upper_mat), FigureBoneData::new(torso_mat * upper_torso_mat),
FigureBoneData::new(chest_front_mat * head_lower_mat), FigureBoneData::new(
FigureBoneData::new( torso_mat * upper_torso_mat * self.lower_torso.compute_base_matrix(),
chest_front_mat * head_lower_mat * head_upper_mat * self.jaw.compute_base_matrix(), ),
), FigureBoneData::new(torso_mat * upper_torso_mat * shoulder_l_mat),
FigureBoneData::new(chest_front_mat), FigureBoneData::new(torso_mat * upper_torso_mat * shoulder_r_mat),
FigureBoneData::new(chest_front_mat * self.chest_rear.compute_base_matrix()), FigureBoneData::new(
FigureBoneData::new(chest_front_mat * chest_rear_mat * tail_front_mat), torso_mat * upper_torso_mat * self.hand_l.compute_base_matrix(),
FigureBoneData::new( ),
chest_front_mat FigureBoneData::new(
* chest_rear_mat torso_mat * upper_torso_mat * self.hand_r.compute_base_matrix(),
* tail_front_mat ),
* self.tail_rear.compute_base_matrix(), FigureBoneData::new(torso_mat * upper_torso_mat * leg_l_mat),
), FigureBoneData::new(torso_mat * upper_torso_mat * leg_r_mat),
FigureBoneData::new(chest_front_mat * self.wing_in_l.compute_base_matrix()), FigureBoneData::new(self.foot_l.compute_base_matrix()),
FigureBoneData::new(chest_front_mat * self.wing_in_r.compute_base_matrix()), FigureBoneData::new(self.foot_r.compute_base_matrix()),
FigureBoneData::new( FigureBoneData::default(),
chest_front_mat * wing_in_l_mat * self.wing_out_l.compute_base_matrix(), FigureBoneData::default(),
), FigureBoneData::default(),
FigureBoneData::new( FigureBoneData::default(),
chest_front_mat * wing_in_r_mat * self.wing_out_r.compute_base_matrix(), FigureBoneData::default(),
), ],
FigureBoneData::new(self.foot_fl.compute_base_matrix()), Vec3::default(),
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::default(),
]
} }
fn interpolate(&mut self, target: &Self, dt: f32) { fn interpolate(&mut self, target: &Self, dt: f32) {
self.head_upper.interpolate(&target.head_upper, dt); self.head.interpolate(&target.head, dt);
self.head_lower.interpolate(&target.head_lower, dt); self.upper_torso.interpolate(&target.upper_torso, dt);
self.jaw.interpolate(&target.jaw, dt); self.lower_torso.interpolate(&target.lower_torso, dt);
self.chest_front.interpolate(&target.chest_front, dt); self.shoulder_l.interpolate(&target.shoulder_l, dt);
self.chest_rear.interpolate(&target.chest_rear, dt); self.shoulder_r.interpolate(&target.shoulder_r, dt);
self.tail_front.interpolate(&target.tail_front, dt); self.hand_l.interpolate(&target.hand_l, dt);
self.tail_rear.interpolate(&target.tail_rear, dt); self.hand_r.interpolate(&target.hand_r, dt);
self.wing_in_l.interpolate(&target.wing_in_l, dt); self.leg_l.interpolate(&target.leg_l, dt);
self.wing_in_r.interpolate(&target.wing_in_r, dt); self.leg_r.interpolate(&target.leg_r, dt);
self.wing_out_l.interpolate(&target.wing_out_l, dt); self.foot_l.interpolate(&target.foot_l, dt);
self.wing_out_r.interpolate(&target.wing_out_r, dt); self.foot_r.interpolate(&target.foot_r, dt);
self.foot_fl.interpolate(&target.foot_fl, dt); self.torso.interpolate(&target.torso, dt);
self.foot_fr.interpolate(&target.foot_fr, dt);
self.foot_bl.interpolate(&target.foot_bl, dt);
self.foot_br.interpolate(&target.foot_br, dt);
} }
} }
pub struct SkeletonAttr { pub struct SkeletonAttr {
head_upper: (f32, f32), head: (f32, f32),
head_lower: (f32, f32), upper_torso: (f32, f32),
jaw: (f32, f32), lower_torso: (f32, f32),
chest_front: (f32, f32), shoulder: (f32, f32, f32),
chest_rear: (f32, f32), hand: (f32, f32, f32),
tail_front: (f32, f32), leg: (f32, f32, f32),
tail_rear: (f32, f32), foot: (f32, f32, f32),
wing_in: (f32, f32, f32),
wing_out: (f32, f32, f32),
feet_f: (f32, f32, f32),
feet_b: (f32, f32, f32),
height: f32,
} }
impl<'a> std::convert::TryFrom<&'a comp::Body> for SkeletonAttr { impl<'a> std::convert::TryFrom<&'a comp::Body> for SkeletonAttr {
@ -116,7 +102,7 @@ impl<'a> std::convert::TryFrom<&'a comp::Body> for SkeletonAttr {
fn try_from(body: &'a comp::Body) -> Result<Self, Self::Error> { fn try_from(body: &'a comp::Body) -> Result<Self, Self::Error> {
match body { match body {
comp::Body::Dragon(body) => Ok(SkeletonAttr::from(body)), comp::Body::BipedLarge(body) => Ok(SkeletonAttr::from(body)),
_ => Err(()), _ => Err(()),
} }
} }
@ -125,61 +111,41 @@ impl<'a> std::convert::TryFrom<&'a comp::Body> for SkeletonAttr {
impl Default for SkeletonAttr { impl Default for SkeletonAttr {
fn default() -> Self { fn default() -> Self {
Self { Self {
head_upper: (0.0, 0.0), head: (0.0, 0.0),
head_lower: (0.0, 0.0), upper_torso: (0.0, 0.0),
jaw: (0.0, 0.0), lower_torso: (0.0, 0.0),
chest_front: (0.0, 0.0), shoulder: (0.0, 0.0, 0.0),
chest_rear: (0.0, 0.0), hand: (0.0, 0.0, 0.0),
tail_front: (0.0, 0.0), leg: (0.0, 0.0, 0.0),
tail_rear: (0.0, 0.0), foot: (0.0, 0.0, 0.0),
wing_in: (0.0, 0.0, 0.0),
wing_out: (0.0, 0.0, 0.0),
feet_f: (0.0, 0.0, 0.0),
feet_b: (0.0, 0.0, 0.0),
height: (0.0),
} }
} }
} }
impl<'a> From<&'a comp::dragon::Body> for SkeletonAttr { impl<'a> From<&'a comp::biped_large::Body> for SkeletonAttr {
fn from(body: &'a comp::dragon::Body) -> Self { fn from(body: &'a comp::biped_large::Body) -> Self {
use comp::dragon::Species::*; use comp::biped_large::Species::*;
Self { Self {
head_upper: match (body.species, body.body_type) { head: match (body.species, body.body_type) {
(Reddragon, _) => (2.5, 4.5), (Ogre, _) => (3.0, 6.0),
}, },
head_lower: match (body.species, body.body_type) { upper_torso: match (body.species, body.body_type) {
(Reddragon, _) => (7.5, 3.5), (Ogre, _) => (0.0, 19.0),
}, },
jaw: match (body.species, body.body_type) { lower_torso: match (body.species, body.body_type) {
(Reddragon, _) => (7.0, -5.0), (Ogre, _) => (1.0, -9.5),
}, },
chest_front: match (body.species, body.body_type) { shoulder: match (body.species, body.body_type) {
(Reddragon, _) => (0.0, 14.0), (Ogre, _) => (6.1, 0.5, 2.5),
}, },
chest_rear: match (body.species, body.body_type) { hand: match (body.species, body.body_type) {
(Reddragon, _) => (-12.5, 0.0), (Ogre, _) => (10.5, -1.0, -0.5),
}, },
tail_front: match (body.species, body.body_type) { leg: match (body.species, body.body_type) {
(Reddragon, _) => (-6.5, 1.5), (Ogre, _) => (0.0, 0.0, -6.0),
}, },
tail_rear: match (body.species, body.body_type) { foot: match (body.species, body.body_type) {
(Reddragon, _) => (-11.5, -1.0), (Ogre, _) => (4.0, 0.5, 2.5),
},
wing_in: match (body.species, body.body_type) {
(Reddragon, _) => (2.5, -16.5, 0.0),
},
wing_out: match (body.species, body.body_type) {
(Reddragon, _) => (23.0, 0.5, 4.0),
},
feet_f: match (body.species, body.body_type) {
(Reddragon, _) => (6.0, 0.0, 1.5),
},
feet_b: match (body.species, body.body_type) {
(Reddragon, _) => (6.0, -15.0, 3.0),
},
height: match (body.species, body.body_type) {
(Reddragon, _) => (1.0),
}, },
} }
} }

132
voxygen/src/anim/dragon/mod.rs
View File

@ -7,70 +7,9 @@ pub use self::{fly::FlyAnimation, idle::IdleAnimation, run::RunAnimation};
use super::{Bone, Skeleton}; use super::{Bone, Skeleton};
use crate::render::FigureBoneData; use crate::render::FigureBoneData;
<<<<<<< HEAD
<<<<<<< HEAD
use common::comp::{self}; use common::comp::{self};
use vek::Vec3; use vek::Vec3;
#[const_tweaker::tweak(min = -40.0, max = 40.0, step = 0.5)]
const HEAD_UPPER_X: f32 = 2.5;
#[const_tweaker::tweak(min = -40.0, max = 40.0, step = 0.5)]
const HEAD_UPPER_Z: f32 = 4.5;
#[const_tweaker::tweak(min = -40.0, max = 40.0, step = 0.5)]
const HEAD_LOWER_X: f32 = 7.5;
#[const_tweaker::tweak(min = -40.0, max = 40.0, step = 0.5)]
const HEAD_LOWER_Z: f32 = 3.5;
#[const_tweaker::tweak(min = -40.0, max = 40.0, step = 0.5)]
const JAW_X: f32 = 7.0;
#[const_tweaker::tweak(min = -40.0, max = 40.0, step = 0.5)]
const JAW_Z: f32 = -5.0;
#[const_tweaker::tweak(min = -40.0, max = 40.0, step = 0.5)]
const CHEST_F_X: f32 = 0.0;
#[const_tweaker::tweak(min = -40.0, max = 40.0, step = 0.5)]
const CHEST_F_Z: f32 = 14.0;
#[const_tweaker::tweak(min = -40.0, max = 40.0, step = 0.5)]
const CHEST_R_X: f32 = -12.5;
#[const_tweaker::tweak(min = -40.0, max = 40.0, step = 0.5)]
const CHEST_R_Z: f32 = 0.0;
#[const_tweaker::tweak(min = -40.0, max = 40.0, step = 0.5)]
const TAIL_F_X: f32 = -12.5;
#[const_tweaker::tweak(min = -40.0, max = 40.0, step = 0.5)]
const TAIL_F_Z: f32 = 1.5;
#[const_tweaker::tweak(min = -40.0, max = 40.0, step = 0.5)]
const TAIL_R_X: f32 = -14.0;
#[const_tweaker::tweak(min = -40.0, max = 40.0, step = 0.5)]
const TAIL_R_Z: f32 = 0.0;
#[const_tweaker::tweak(min = -40.0, max = 40.0, step = 0.5)]
const WING_IN_X: f32 = 2.5;
#[const_tweaker::tweak(min = -40.0, max = 40.0, step = 0.5)]
const WING_IN_Y: f32 = -16.5;
#[const_tweaker::tweak(min = -40.0, max = 40.0, step = 0.5)]
const WING_IN_Z: f32 = 0.0;
#[const_tweaker::tweak(min = -40.0, max = 40.0, step = 0.5)]
const WING_OUT_X: f32 = 23.0;
#[const_tweaker::tweak(min = -40.0, max = 40.0, step = 0.5)]
const WING_OUT_Y: f32 = 0.5;
#[const_tweaker::tweak(min = -40.0, max = 40.0, step = 0.5)]
const WING_OUT_Z: f32 = 4.0;
#[const_tweaker::tweak(min = -40.0, max = 40.0, step = 0.5)]
const FEET_F_X: f32 = 6.0;
#[const_tweaker::tweak(min = -40.0, max = 40.0, step = 0.5)]
const FEET_F_Y: f32 = 0.0;
#[const_tweaker::tweak(min = -40.0, max = 40.0, step = 0.5)]
const FEET_F_Z: f32 = 1.5;
#[const_tweaker::tweak(min = -40.0, max = 40.0, step = 0.5)]
const FEET_B_X: f32 = 6.0;
#[const_tweaker::tweak(min = -40.0, max = 40.0, step = 0.5)]
const FEET_B_Y: f32 = -15.0;
#[const_tweaker::tweak(min = -40.0, max = 40.0, step = 0.5)]
const FEET_B_Z: f32 = 3.0;
=======
use common::comp::{self};
>>>>>>> Cleanup
=======
use common::comp::{self};
>>>>>>> fmt
#[derive(Clone, Default)] #[derive(Clone, Default)]
pub struct DragonSkeleton { pub struct DragonSkeleton {
head_upper: Bone, head_upper: Bone,
@ -99,72 +38,49 @@ impl Skeleton for DragonSkeleton {
fn bone_count(&self) -> usize { 15 } fn bone_count(&self) -> usize { 15 }
<<<<<<< HEAD
fn compute_matrices(&self) -> ([FigureBoneData; 16], Vec3<f32>) { fn compute_matrices(&self) -> ([FigureBoneData; 16], Vec3<f32>) {
=======
fn compute_matrices(&self) -> [FigureBoneData; 16] {
let head_upper_mat = self.head_upper.compute_base_matrix(); let head_upper_mat = self.head_upper.compute_base_matrix();
let head_lower_mat = self.head_lower.compute_base_matrix(); let head_lower_mat = self.head_lower.compute_base_matrix();
>>>>>>> New dragon model, added jaw, splitted head into upper/lower
let chest_front_mat = self.chest_front.compute_base_matrix(); let chest_front_mat = self.chest_front.compute_base_matrix();
let chest_rear_mat = self.chest_rear.compute_base_matrix(); let chest_rear_mat = self.chest_rear.compute_base_matrix();
let wing_in_l_mat = self.wing_in_l.compute_base_matrix(); let wing_in_l_mat = self.wing_in_l.compute_base_matrix();
let wing_in_r_mat = self.wing_in_r.compute_base_matrix(); let wing_in_r_mat = self.wing_in_r.compute_base_matrix();
let tail_front_mat = self.tail_front.compute_base_matrix(); let tail_front_mat = self.tail_front.compute_base_matrix();
<<<<<<< HEAD
( (
[ [
FigureBoneData::new(self.head.compute_base_matrix() * chest_front_mat), FigureBoneData::new(chest_front_mat * head_lower_mat * head_upper_mat),
FigureBoneData::new(chest_front_mat * head_lower_mat),
FigureBoneData::new(
chest_front_mat
* head_lower_mat
* head_upper_mat
* self.jaw.compute_base_matrix(),
),
FigureBoneData::new(chest_front_mat), FigureBoneData::new(chest_front_mat),
FigureBoneData::new(self.chest_rear.compute_base_matrix() * chest_front_mat), FigureBoneData::new(chest_front_mat * self.chest_rear.compute_base_matrix()),
FigureBoneData::new(tail_front_mat), FigureBoneData::new(chest_front_mat * chest_rear_mat * tail_front_mat),
FigureBoneData::new(self.tail_rear.compute_base_matrix() * tail_front_mat), FigureBoneData::new(
FigureBoneData::new(wing_in_l_mat), chest_front_mat
FigureBoneData::new(wing_in_r_mat), * chest_rear_mat
FigureBoneData::new(self.wing_out_l.compute_base_matrix() * wing_in_l_mat), * tail_front_mat
FigureBoneData::new(self.wing_out_r.compute_base_matrix() * wing_in_r_mat), * self.tail_rear.compute_base_matrix(),
),
FigureBoneData::new(chest_front_mat * self.wing_in_l.compute_base_matrix()),
FigureBoneData::new(chest_front_mat * self.wing_in_r.compute_base_matrix()),
FigureBoneData::new(
chest_front_mat * wing_in_l_mat * self.wing_out_l.compute_base_matrix(),
),
FigureBoneData::new(
chest_front_mat * wing_in_r_mat * self.wing_out_r.compute_base_matrix(),
),
FigureBoneData::new(self.foot_fl.compute_base_matrix()), FigureBoneData::new(self.foot_fl.compute_base_matrix()),
FigureBoneData::new(self.foot_fr.compute_base_matrix()), FigureBoneData::new(self.foot_fr.compute_base_matrix()),
FigureBoneData::new(self.foot_bl.compute_base_matrix()), FigureBoneData::new(self.foot_bl.compute_base_matrix()),
FigureBoneData::new(self.foot_br.compute_base_matrix()), FigureBoneData::new(self.foot_br.compute_base_matrix()),
FigureBoneData::default(), FigureBoneData::default(),
FigureBoneData::default(),
FigureBoneData::default(),
], ],
Vec3::default(), Vec3::default(),
) )
=======
[
FigureBoneData::new(chest_front_mat * head_lower_mat * head_upper_mat),
FigureBoneData::new(chest_front_mat * head_lower_mat),
FigureBoneData::new(
chest_front_mat * head_lower_mat * head_upper_mat * self.jaw.compute_base_matrix(),
),
FigureBoneData::new(chest_front_mat),
FigureBoneData::new(chest_front_mat * self.chest_rear.compute_base_matrix()),
FigureBoneData::new(chest_front_mat * chest_rear_mat * tail_front_mat),
FigureBoneData::new(
chest_front_mat
* chest_rear_mat
* tail_front_mat
* self.tail_rear.compute_base_matrix(),
),
FigureBoneData::new(chest_front_mat * self.wing_in_l.compute_base_matrix()),
FigureBoneData::new(chest_front_mat * self.wing_in_r.compute_base_matrix()),
FigureBoneData::new(
chest_front_mat * wing_in_l_mat * self.wing_out_l.compute_base_matrix(),
),
FigureBoneData::new(
chest_front_mat * wing_in_r_mat * self.wing_out_r.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::default(),
]
>>>>>>> Symmetry of dragon skeleton
} }
fn interpolate(&mut self, target: &Self, dt: f32) { fn interpolate(&mut self, target: &Self, dt: f32) {