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

Glider dist based on char height

Browse Source
This commit is contained in:
Ludvig Böklin 2021-06-06 19:41:31 +02:00
parent b62177e091
commit 56dfd5a4ff
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/systems/src/phys.rs
View File

@ -45,6 +45,7 @@ fn integrate_glider_forces(
vel: &mut Vel, vel: &mut Vel,
ori: &mut Ori, ori: &mut Ori,
mass: &Mass, mass: &Mass,
body: &Body,
character_state: &CharacterState, character_state: &CharacterState,
rel_wind: &Vel, rel_wind: &Vel,
) -> Option<()> { ) -> Option<()> {
@ -62,14 +63,15 @@ fn integrate_glider_forces(
{ {
let char_up = ori.up(); let char_up = ori.up();
let glider_dist = tweak!(1.0); // dist from centre of gravity
let glider_dist = tweak!(0.6) * body.height();
let glider_pos = *char_up * glider_dist; let glider_pos = *char_up * glider_dist;
let glider_up = glider.ori.up(); let glider_up = glider.ori.up();
let mut dr = glider_rel_dv; let mut dr = glider_rel_dv;
// remove negative lift (for aesthetic reasons and because greater values of dv // remove some negative lift (for aesthetic reasons and because greater values
// rotates too much) // of dv rotates too much)
let dn = glider_rel_dv.dot(*glider_up); let dn = glider_rel_dv.dot(*glider_up);
if dn.is_sign_negative() { if dn.is_sign_negative() {
dr -= tweak!(0.7) * dn * *glider_up / glider_up.magnitude_squared() dr -= tweak!(0.7) * dn * *glider_up / glider_up.magnitude_squared()
@ -123,7 +125,7 @@ fn integrate_forces(
vel.0 = new_v; vel.0 = new_v;
} }
character_state.and_then(|cs| { character_state.and_then(|cs| {
integrate_glider_forces(dt, new_v - vel.0, vel, ori, mass, cs, &rel_flow) integrate_glider_forces(dt, new_v - vel.0, vel, ori, mass, body, cs, &rel_flow)
}); });
}; };
debug_assert!(!vel.0.map(|a| a.is_nan()).reduce_or()); debug_assert!(!vel.0.map(|a| a.is_nan()).reduce_or());