Skip to content

Fallback evaluators fixed #153

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

Merged
JonnyOThan merged 1 commit into from
Nov 28, 2024
Merged

Fallback evaluators fixed #153

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
64 changes: 32 additions & 32 deletions RasterPropMonitor/Core/RPMVCEvaluators.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,18 +67,18 @@ internal double FallbackEvaluateDragForce()
Vector3 bodyLift = p.transform.rotation * (p.bodyLiftScalar * p.DragCubes.LiftForce);
bodyLift = Vector3.ProjectOnPlane(bodyLift, -p.dragVectorDir);
pureLiftV += bodyLift;
}

for (int m = 0; m < p.Modules.Count; m++)
for (int m = 0; m < p.Modules.Count; m++)
{
PartModule pm = p.Modules[m];
if (pm.isEnabled && pm is ModuleLiftingSurface)
{
PartModule pm = p.Modules[m];
if (pm.isEnabled && pm is ModuleLiftingSurface)
ModuleLiftingSurface liftingSurface = pm as ModuleLiftingSurface;
if (!p.ShieldedFromAirstream)
{
ModuleLiftingSurface liftingSurface = pm as ModuleLiftingSurface;
if (!p.ShieldedFromAirstream)
{
pureLiftV += liftingSurface.liftForce;
pureDragV += liftingSurface.dragForce;
}
pureLiftV += liftingSurface.liftForce;
pureDragV += liftingSurface.dragForce;
}
}
}
Expand Down Expand Up @@ -129,18 +129,18 @@ internal double FallbackEvaluateLiftForce()
Vector3 bodyLift = p.transform.rotation * (p.bodyLiftScalar * p.DragCubes.LiftForce);
bodyLift = Vector3.ProjectOnPlane(bodyLift, -p.dragVectorDir);
pureLiftV += bodyLift;
}

for (int m = 0; m < p.Modules.Count; m++)
for (int m = 0; m < p.Modules.Count; m++)
{
PartModule pm = p.Modules[m];
if (pm.isEnabled && pm is ModuleLiftingSurface)
{
PartModule pm = p.Modules[m];
if (pm.isEnabled && pm is ModuleLiftingSurface)
ModuleLiftingSurface liftingSurface = pm as ModuleLiftingSurface;
if (!p.ShieldedFromAirstream)
{
ModuleLiftingSurface liftingSurface = pm as ModuleLiftingSurface;
if (!p.ShieldedFromAirstream)
{
pureLiftV += liftingSurface.liftForce;
pureDragV += liftingSurface.dragForce;
}
pureLiftV += liftingSurface.liftForce;
pureDragV += liftingSurface.dragForce;
}
}
}
Expand Down Expand Up @@ -175,23 +175,23 @@ internal double FallbackEvaluateTerminalVelocity()
Vector3 bodyLift = p.transform.rotation * (p.bodyLiftScalar * p.DragCubes.LiftForce);
bodyLift = Vector3.ProjectOnPlane(bodyLift, -p.dragVectorDir);
pureLiftV += bodyLift;
}

for (int m = 0; m < p.Modules.Count; m++)
for (int m = 0; m < p.Modules.Count; m++)
{
PartModule pm = p.Modules[m];
if (!pm.isEnabled)
{
PartModule pm = p.Modules[m];
if (!pm.isEnabled)
{
continue;
}
continue;
}

if (pm is ModuleLiftingSurface)
{
ModuleLiftingSurface liftingSurface = (ModuleLiftingSurface)pm;
if (p.ShieldedFromAirstream)
continue;
pureLiftV += liftingSurface.liftForce;
pureDragV += liftingSurface.dragForce;
}
if (pm is ModuleLiftingSurface)
{
ModuleLiftingSurface liftingSurface = (ModuleLiftingSurface)pm;
if (p.ShieldedFromAirstream)
continue;
pureLiftV += liftingSurface.liftForce;
pureDragV += liftingSurface.dragForce;
}
}
}
Expand Down
Loading