Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix aerodynamic torque simulations #22

Merged
merged 25 commits into from
May 15, 2019
Merged

Fix aerodynamic torque simulations #22

Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
1f60027
Added a new AerodynamicForce API endpoint
Oct 1, 2018
c82b439
Recompute simulated force for each part, not just the last one
Oct 2, 2018
1827b23
Refactored *CalculateAeroForces and fixed transforms in PredictionCal…
Jan 20, 2019
753115f
Add total vessel torque tracking
Jan 20, 2019
32f0dfb
Fixed CenterQuery's torque calculation and removed dead code
Jan 20, 2019
63efe75
Add torque tracking in flight info
Jan 20, 2019
790a1e8
Add new API endpoint to fetch torque on vehicle
Jan 20, 2019
e695362
Merge branch 'master' into fixed-simulation-base
BenChung Jan 20, 2019
985caee
CenterQuery was actually working correctly.
Apr 2, 2019
18fbb9d
Apply legacy wing model force in the right position.
Apr 8, 2019
a7852c6
Apply force scalars (based on MFI code & code in AeroPartModule) to s…
Apr 8, 2019
716f032
Use a CenterQuery to accumulate forces
May 1, 2019
0bba13a
Merge with upstream
May 1, 2019
03c4cf7
Fix use of FARCenterQuery to determine in-flight aerodynamic forces
May 4, 2019
405b517
Fix usage of dynamicPressurekPA for situations other than correctness…
May 4, 2019
d5d01ac
Make new FARAPI calls null VesselFlightInfo tolerant
May 4, 2019
f790f0c
Whoops, got the nullable monad use wrong
May 4, 2019
3459b30
Interfaceified the lambdas in FARAeroSection to reduce garbage
May 4, 2019
ec14134
Added active vessel aerodynamic force call sites
May 9, 2019
5e5d71e
used inline initalizer for center query
May 9, 2019
82c6f3d
Whoops, eliminated needless argument
May 10, 2019
7c52df1
Inline initalizers for force contexts
May 10, 2019
593cf15
Added null checks, cached local velocity
May 11, 2019
3163f0e
Prevent NREs from crashes
May 15, 2019
75368f6
Remove redundant null check
May 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions FerramAerospaceResearch/FARAeroComponents/FARAeroSection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,9 +298,10 @@ private interface IForceContext
/// Apply a calculated force to a part.
/// </summary>
/// <param name="pd">The part data of the part that the force should be applied to</param>
/// <param name="localVel">The local velocity of the part</param>
/// <param name="forceVector">The calculated force vector to be applied to the part</param>
/// <param name="torqueVector">The calculated torque vector to be applied to the part</param>
void ApplyForce(PartData pd, Vector3 forceVector, Vector3 torqueVector);
void ApplyForce(PartData pd, Vector3 localVel, Vector3 forceVector, Vector3 torqueVector);
}

private class SimulatedForceContext : IForceContext
Expand Down Expand Up @@ -336,12 +337,15 @@ public void UpdateSimulationContext(Vector4 worldVel, FARCenterQuery center, flo

public Vector3 LocalVelocity(PartData pd)
{
if (pd.aeroModule.part == null || pd.aeroModule.part.partTransform == null)
return Vector3.zero;
BenChung marked this conversation as resolved.
Show resolved Hide resolved
return pd.aeroModule.part.partTransform.InverseTransformVector(worldVel);
BenChung marked this conversation as resolved.
Show resolved Hide resolved
}

public void ApplyForce(PartData pd, Vector3 forceVector, Vector3 torqueVector)
public void ApplyForce(PartData pd, Vector3 localVel, Vector3 forceVector, Vector3 torqueVector)
{
var localVel = pd.aeroModule.part.partTransform.InverseTransformVector(worldVel);
if (pd.aeroModule.part == null || pd.aeroModule.part.partTransform == null)
return;
BenChung marked this conversation as resolved.
Show resolved Hide resolved
var tmp = 0.0005 * Vector3.SqrMagnitude(localVel);
var dynamicPressurekPa = tmp * atmDensity;
var dragFactor = dynamicPressurekPa * Mathf.Max(PhysicsGlobals.DragCurvePseudoReynolds.Evaluate(atmDensity * Vector3.Magnitude(localVel)), 1.0f);
Expand All @@ -368,7 +372,7 @@ public Vector3 LocalVelocity(PartData pd)
return pd.aeroModule.partLocalVel;
}

public void ApplyForce(PartData pd, Vector3 forceVector, Vector3 torqueVector)
public void ApplyForce(PartData pd, Vector3 localVel, Vector3 forceVector, Vector3 torqueVector)
{
pd.aeroModule.AddLocalForceAndTorque(forceVector, torqueVector, pd.centroidPartSpace);
}
Expand Down Expand Up @@ -507,7 +511,7 @@ private void CalculateAeroForces(float atmDensity, float machNumber, float reyno
forceVector *= data.dragFactor;
torqueVector *= data.dragFactor;

forceContext.ApplyForce(data, forceVector, torqueVector);
forceContext.ApplyForce(data, velLocal, forceVector, torqueVector);
}
}

Expand Down