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

Set GRAVITY to 25.0 as in master and adjust drag reference area scale to compensate

Browse Source
This commit is contained in:
Ludvig Böklin 2021-06-07 12:26:18 +02:00
parent ddcc86ee08
commit 27c4afbf1b
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -762,15 +762,19 @@ impl Drag for Body {
/// ///
/// This coefficient includes the reference area. /// This coefficient includes the reference area.
fn parasite_drag_coefficient(&self) -> f32 { fn parasite_drag_coefficient(&self) -> f32 {
// Scale modifier to reduce or increase drag as needed to give bodies reasonable
// terminal velocities for the gravitational acceleration of this world
// const SCALE_MODIFIER: f32 = 0.6; // if we can eventually have 1G
const SCALE_MODIFIER: f32 = 1.1; // for 2.5G
// Reference area and drag coefficient assumes best-case scenario of the // Reference area and drag coefficient assumes best-case scenario of the
// orientation producing least amount of drag // orientation producing least amount of drag
match self { match self {
// Cross-section, head/feet first // Cross-section, head/feet first
Body::BipedLarge(_) | Body::BipedSmall(_) | Body::Golem(_) | Body::Humanoid(_) => { Body::BipedLarge(_) | Body::BipedSmall(_) | Body::Golem(_) | Body::Humanoid(_) => {
// const SCALE: f32 = 0.7; let radii = self.dimensions().xy().map(|a| SCALE_MODIFIER * a * 0.5);
let radius = self.dimensions().xy().map(|a| inline_tweak::tweak!(0.6) * a * 0.5);
const CD: f32 = 0.7; const CD: f32 = 0.7;
CD * PI * radius.x * radius.y CD * PI * radii.x * radii.y
}, },
// Cross-section, nose/tail first // Cross-section, nose/tail first
@ -778,13 +782,13 @@ impl Drag for Body {
| Body::QuadrupedMedium(_) | Body::QuadrupedMedium(_)
| Body::QuadrupedSmall(_) | Body::QuadrupedSmall(_)
| Body::QuadrupedLow(_) => { | Body::QuadrupedLow(_) => {
let radius = self.dimensions().map(|a| a * 0.5); let radii = self.dimensions().map(|a| SCALE_MODIFIER * a * 0.5);
let cd: f32 = if matches!(self, Body::QuadrupedLow(_)) { let cd: f32 = if matches!(self, Body::QuadrupedLow(_)) {
0.7 0.7
} else { } else {
1.0 1.0
}; };
cd * PI * radius.x * radius.z cd * PI * radii.x * radii.z
}, },
Body::BirdMedium(bird) => bird.parasite_drag_coefficient(), Body::BirdMedium(bird) => bird.parasite_drag_coefficient(),
@ -793,11 +797,11 @@ impl Drag for Body {
// Cross-section, zero-lift angle; exclude the fins // Cross-section, zero-lift angle; exclude the fins
Body::FishMedium(_) | Body::FishSmall(_) => { Body::FishMedium(_) | Body::FishSmall(_) => {
let radius = self.dimensions().map(|a| a * 0.5); let radii = self.dimensions().map(|a| SCALE_MODIFIER * a * 0.5);
// "A Simple Method to Determine Drag Coefficients in Aquatic Animals", // "A Simple Method to Determine Drag Coefficients in Aquatic Animals",
// D. Bilo and W. Nachtigall, 1980 // D. Bilo and W. Nachtigall, 1980
const CD: f32 = 0.031; const CD: f32 = 0.031;
CD * PI * radius.x * radius.z CD * PI * radii.x * radii.z
}, },
Body::Object(object) => match object { Body::Object(object) => match object {
@ -812,9 +816,9 @@ impl Drag for Body {
| object::Body::FireworkWhite | object::Body::FireworkWhite
| object::Body::FireworkYellow | object::Body::FireworkYellow
| object::Body::MultiArrow => { | object::Body::MultiArrow => {
let radius = self.dimensions().map(|a| a * 0.5); let radii = self.dimensions().map(|a| SCALE_MODIFIER * a * 0.5);
const CD: f32 = 0.02; const CD: f32 = 0.02;
CD * PI * radius.x * radius.z CD * PI * radii.x * radii.z
}, },
// spherical-ish objects // spherical-ish objects
@ -831,13 +835,13 @@ impl Drag for Body {
| object::Body::Pumpkin3 | object::Body::Pumpkin3
| object::Body::Pumpkin4 | object::Body::Pumpkin4
| object::Body::Pumpkin5 => { | object::Body::Pumpkin5 => {
let radius = self.dimensions().xy().map(|a| a * 0.5); let radii = self.dimensions().xy().map(|a| SCALE_MODIFIER * a * 0.5);
const CD: f32 = 0.5; const CD: f32 = 0.5;
CD * PI * radius.product() CD * PI * radii.product()
}, },
_ => { _ => {
let dim = self.dimensions(); let dim = self.dimensions().map(|a| SCALE_MODIFIER * a);
const CD: f32 = 2.0; const CD: f32 = 2.0;
CD * (PI / 6.0 * dim.x * dim.y * dim.z).powf(2.0 / 3.0) CD * (PI / 6.0 * dim.x * dim.y * dim.z).powf(2.0 / 3.0)
}, },
@ -846,7 +850,7 @@ impl Drag for Body {
Body::Ship(_) => { Body::Ship(_) => {
// Airships tend to use the square of the cube root of its volume for // Airships tend to use the square of the cube root of its volume for
// reference area // reference area
let dim = self.dimensions(); let dim = self.dimensions().map(|a| SCALE_MODIFIER * a);
(PI / 6.0 * dim.x * dim.y * dim.z).powf(2.0 / 3.0) (PI / 6.0 * dim.x * dim.y * dim.z).powf(2.0 / 3.0)
}, },
} }

2
common/src/consts.rs
View File

@ -2,7 +2,7 @@
pub const MAX_PICKUP_RANGE: f32 = 8.0; pub const MAX_PICKUP_RANGE: f32 = 8.0;
pub const MAX_MOUNT_RANGE: f32 = 14.0; pub const MAX_MOUNT_RANGE: f32 = 14.0;
pub const GRAVITY: f32 = 9.81; pub const GRAVITY: f32 = 25.0;
pub const FRIC_GROUND: f32 = 0.15; pub const FRIC_GROUND: f32 = 0.15;
// Values for air taken from http://www-mdp.eng.cam.ac.uk/web/library/enginfo/aerothermal_dvd_only/aero/atmos/atmos.html // Values for air taken from http://www-mdp.eng.cam.ac.uk/web/library/enginfo/aerothermal_dvd_only/aero/atmos/atmos.html