Skip to content

Remove VesselState MovingAverage values #2240

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
lamont-granquist merged 1 commit into from
Jun 15, 2026
+59 −59
Merged

Remove VesselState MovingAverage values #2240

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion MechJeb2/MechJebModuleInfoItems.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ public double RCSDeltaVVacuum()
}

[ValueInfoItem("#MechJeb_AngularVelocity", InfoItem.Category.Vessel, showInEditor = false, showInFlight = true)] //Angular Velocity
public string angularVelocity() => MuUtils.PrettyPrint(VesselState.angularVelocityAvg.Value.xzy * UtilMath.Rad2Deg) + "°/s";
public string angularVelocity() => MuUtils.PrettyPrint(VesselState.angularVelocityAvg.xzy * UtilMath.Rad2Deg) + "°/s";

[ValueInfoItem("#MechJeb_CurrentAcceleration", InfoItem.Category.Vessel, format = ValueInfoItem.SI, units = "m/s²")] //Current acceleration
public double CurrentAcceleration() => CurrentThrust() / (1000 * VesselMass());
Expand Down
12 changes: 6 additions & 6 deletions MechJeb2/MechJebModuleSmartASS.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ protected override void WindowGUI(int windowID)

if (GUILayout.Button("CUR", GuiUtils.LayoutNoExpandWidth))
{
srfVelRol = -VesselState.vesselRoll.Value;
srfVelRol = -VesselState.vesselRoll;
changed = true;
}

Expand Down Expand Up @@ -530,7 +530,7 @@ protected override void WindowGUI(int windowID)

if (GUILayout.Button("CUR", GuiUtils.LayoutNoExpandWidth))
{
srfVelPit = VesselState.AoA.Value;
srfVelPit = VesselState.AoA;
changed = true;
}

Expand Down Expand Up @@ -571,7 +571,7 @@ protected override void WindowGUI(int windowID)

if (GUILayout.Button("CUR", GuiUtils.LayoutNoExpandWidth))
{
srfVelYaw = -VesselState.AoS.Value;
srfVelYaw = -VesselState.AoS;
changed = true;
}

Expand Down Expand Up @@ -641,7 +641,7 @@ protected override void WindowGUI(int windowID)
case Mode.AUTO:
break;
}

// Disable smooth control for modes that don't have it
if (!hasSmoothControl)
{
Expand Down Expand Up @@ -785,7 +785,7 @@ public void Engage(bool resetPID = true)
// Get the reference rotation for the current mode
QuaternionD refRotation = Core.Attitude.attitudeGetReferenceRotation(reference);
QuaternionD vesselRotation = QuaternionD.LookRotation(Part.vessel.GetTransform().up, -Part.vessel.GetTransform().forward);

// Get the vessel's current attitude in the reference frame
QuaternionD vesselAttitudeInRef = QuaternionD.Inverse(refRotation) * vesselRotation;

Expand Down Expand Up @@ -829,7 +829,7 @@ public override void OnFixedUpdate()
// by jumping to some random attitude because the current values are out of date
curDirection = targetDirection;
curAttitude = targetAttitude;
}
}
// Handle smooth transitions if enabled and SmartASS is still controlling
else
{
Expand Down
104 changes: 52 additions & 52 deletions MechJeb2/VesselState.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,36 +91,36 @@ private delegate void FARCalculateVesselAeroForcesDelegate(Vessel vessel, out Ve
//How about changing these so we store the instantaneous values and *also*
//the smoothed MovingAverages? Sometimes we need the instantaneous value.
[ValueInfoItem("#MechJeb_OrbitalSpeed", InfoItem.Category.Orbit, format = ValueInfoItem.SI, units = "m/s")] //Orbital speed
public readonly MovingAverage speedOrbital = new MovingAverage();
public double speedOrbital ;

[ValueInfoItem("#MechJeb_SurfaceSpeed", InfoItem.Category.Surface, format = ValueInfoItem.SI, units = "m/s")] //Surface speed
public readonly MovingAverage speedSurface = new MovingAverage();
public double speedSurface ;

[ValueInfoItem("#MechJeb_VerticalSpeed", InfoItem.Category.Surface, format = ValueInfoItem.SI, units = "m/s")] //Vertical speed
public readonly MovingAverage speedVertical = new MovingAverage();
public double speedVertical ;

[ValueInfoItem("#MechJeb_SurfaceHorizontalSpeed", InfoItem.Category.Surface, format = ValueInfoItem.SI,
units = "m/s")]
//Surface horizontal speed
public readonly MovingAverage speedSurfaceHorizontal = new MovingAverage();
public double speedSurfaceHorizontal ;

[ValueInfoItem("#MechJeb_OrbitHorizontalSpeed", InfoItem.Category.Orbit, format = ValueInfoItem.SI, units = "m/s")] //Orbit horizontal speed
public double speedOrbitHorizontal;

[ValueInfoItem("#MechJeb_Heading", InfoItem.Category.Surface, format = "F1", units = "º")] //Heading
public readonly MovingAverage vesselHeading = new MovingAverage();
public double vesselHeading ;

[ValueInfoItem("#MechJeb_Pitch", InfoItem.Category.Surface, format = "F1", units = "º")] //Pitch
public readonly MovingAverage vesselPitch = new MovingAverage();
public double vesselPitch ;

[ValueInfoItem("#MechJeb_Roll", InfoItem.Category.Surface, format = "F1", units = "º")] //Roll
public readonly MovingAverage vesselRoll = new MovingAverage();
public double vesselRoll ;

[ValueInfoItem("#MechJeb_Altitude_ASL", InfoItem.Category.Surface, format = ValueInfoItem.SI, siSigFigs = 6, units = "m")] //Altitude (ASL)
public readonly MovingAverage altitudeASL = new MovingAverage();
public double altitudeASL ;

[ValueInfoItem("#MechJeb_Altitude_true", InfoItem.Category.Surface, format = ValueInfoItem.SI, siSigFigs = 6, units = "m")] //Altitude (true)
public readonly MovingAverage altitudeTrue = new MovingAverage();
public double altitudeTrue ;

[ValueInfoItem("#MechJeb_SurfaceAltitudeASL", InfoItem.Category.Surface, format = ValueInfoItem.SI, siSigFigs = 4,
units = "m")]
Expand All @@ -130,58 +130,58 @@ private delegate void FARCalculateVesselAeroForcesDelegate(Vessel vessel, out Ve
[ValueInfoItem("#MechJeb_Apoapsis", InfoItem.Category.Orbit, units = "m", format = ValueInfoItem.SI, siSigFigs = 6,
category = InfoItem.Category.Orbit)]
//Apoapsis
public readonly MovingAverage orbitApA = new MovingAverage();
public double orbitApA ;

[ValueInfoItem("#MechJeb_Periapsis", InfoItem.Category.Orbit, units = "m", format = ValueInfoItem.SI, siSigFigs = 6,
category = InfoItem.Category.Orbit)]
//Periapsis
public readonly MovingAverage orbitPeA = new MovingAverage();
public double orbitPeA ;

[ValueInfoItem("#MechJeb_OrbitalPeriod", InfoItem.Category.Orbit, format = ValueInfoItem.TIME, timeDecimalPlaces = 2,
category = InfoItem.Category.Orbit)]
//Orbital period
public readonly MovingAverage orbitPeriod = new MovingAverage();
public double orbitPeriod ;

[ValueInfoItem("#MechJeb_TimeToApoapsis", InfoItem.Category.Orbit, format = ValueInfoItem.TIME, timeDecimalPlaces = 1)] //Time to apoapsis
public readonly MovingAverage orbitTimeToAp = new MovingAverage();
public double orbitTimeToAp ;

[ValueInfoItem("#MechJeb_TimeToPeriapsis", InfoItem.Category.Orbit, format = ValueInfoItem.TIME, timeDecimalPlaces = 1)] //Time to periapsis
public readonly MovingAverage orbitTimeToPe = new MovingAverage();
public double orbitTimeToPe ;

[ValueInfoItem("#MechJeb_LAN", InfoItem.Category.Orbit, format = ValueInfoItem.ANGLE)] //LAN
public readonly MovingAverage orbitLAN = new MovingAverage();
public double orbitLAN ;

[ValueInfoItem("#MechJeb_ArgumentOfPeriapsis", InfoItem.Category.Orbit, format = "F1", units = "º")] //Argument of periapsis
public readonly MovingAverage orbitArgumentOfPeriapsis = new MovingAverage();
public double orbitArgumentOfPeriapsis ;

[ValueInfoItem("#MechJeb_Inclination", InfoItem.Category.Orbit, format = "F3", units = "º")] //Inclination
public readonly MovingAverage orbitInclination = new MovingAverage();
public double orbitInclination ;

[ValueInfoItem("#MechJeb_Eccentricity", InfoItem.Category.Orbit, format = "F3")] //Eccentricity
public readonly MovingAverage orbitEccentricity = new MovingAverage();
public double orbitEccentricity ;

[ValueInfoItem("#MechJeb_SemiMajorAxis", InfoItem.Category.Orbit, format = ValueInfoItem.SI, siSigFigs = 6, units = "m")] //Semi-major axis
public readonly MovingAverage orbitSemiMajorAxis = new MovingAverage();
public double orbitSemiMajorAxis ;

[ValueInfoItem("Celestial Longitude", InfoItem.Category.Orbit, format = "F3")]
public readonly MovingAverage celestialLongitude = new MovingAverage();
public double celestialLongitude ;

[ValueInfoItem("#MechJeb_Latitude", InfoItem.Category.Surface, format = ValueInfoItem.ANGLE_NS)] //Latitude
public readonly MovingAverage latitude = new MovingAverage();
public double latitude ;

[ValueInfoItem("#MechJeb_Longitude", InfoItem.Category.Surface, format = ValueInfoItem.ANGLE_EW)] //Longitude
public readonly MovingAverage longitude = new MovingAverage();
public double longitude ;

[ValueInfoItem("#MechJeb_AngleOfAttack", InfoItem.Category.Misc, format = "F2", units = "º")] //Angle of Attack
public readonly MovingAverage AoA = new MovingAverage();
public double AoA ;

[ValueInfoItem("#MechJeb_AngleOfSideslip", InfoItem.Category.Misc, format = "F2", units = "º")] //Angle of Sideslip
public readonly MovingAverage AoS = new MovingAverage();
public double AoS ;

[ValueInfoItem("#MechJeb_DisplacementAngle", InfoItem.Category.Misc, format = "F2", units = "º")] //Displacement Angle
public readonly MovingAverage displacementAngle = new MovingAverage();
public double displacementAngle ;

public readonly MovingAverage3d angularVelocityAvg = new MovingAverage3d(5);
public Vector3d angularVelocityAvg;

// instantaneous values
public double currentPitch => rotationVesselSurface.eulerAngles.x > 180
Expand Down Expand Up @@ -672,39 +672,39 @@ private void UpdateBasicInfo(Vessel vessel)
gravityForce = FlightGlobals.getGeeForceAtPosition(CoM); // TODO vessel.gravityForPos or vessel.gravityTrue
localg = gravityForce.magnitude;

speedOrbital.Value = orbitalVelocity.magnitude;
speedSurface.Value = surfaceVelocity.magnitude;
speedVertical.Value = Vector3d.Dot(surfaceVelocity, up);
speedSurfaceHorizontal.Value =
speedOrbital = orbitalVelocity.magnitude;
speedSurface = surfaceVelocity.magnitude;
speedVertical = Vector3d.Dot(surfaceVelocity, up);
speedSurfaceHorizontal =
Vector3d.Exclude(up, surfaceVelocity).magnitude; //(velocityVesselSurface - (speedVertical * up)).magnitude;
speedOrbitHorizontal = (orbitalVelocity - speedVertical * up).magnitude;

// Angle of Attack, angle between surface velocity and the ship-nose vector (KSP "up" vector) in the plane that has no ship-right/left in it
var srfProj = Vector3.ProjectOnPlane(surfaceVelocity.normalized, vessel.ReferenceTransform.right);
double tmpAoA = UtilMath.Rad2Deg * Math.Atan2(Vector3.Dot(srfProj.normalized, vessel.ReferenceTransform.forward),
Vector3.Dot(srfProj.normalized, vessel.ReferenceTransform.up));
AoA.Value = double.IsNaN(tmpAoA) || speedSurface.Value < 0.01 ? 0 : tmpAoA;
AoA = double.IsNaN(tmpAoA) || speedSurface < 0.01 ? 0 : tmpAoA;

// Angle of Sideslip, angle between surface velocity and the ship-nose vector (KSP "up" vector) in the plane that has no ship-top/bottom in it (KSP "forward"/"back")
srfProj = Vector3.ProjectOnPlane(surfaceVelocity.normalized, vessel.ReferenceTransform.forward);
double tmpAoS = UtilMath.Rad2Deg * Math.Atan2(Vector3.Dot(srfProj.normalized, vessel.ReferenceTransform.right),
Vector3.Dot(srfProj.normalized, vessel.ReferenceTransform.up));
AoS.Value = double.IsNaN(tmpAoS) || speedSurface.Value < 0.01 ? 0 : tmpAoS;
AoS = double.IsNaN(tmpAoS) || speedSurface < 0.01 ? 0 : tmpAoS;

// Displacement Angle, angle between surface velocity and the ship-nose vector (KSP "up" vector) -- ignores roll of the craft (0 to 180 degrees)
double tempAoD = UtilMath.Rad2Deg *
Math.Acos(MuUtils.Clamp(Vector3.Dot(vessel.ReferenceTransform.up, surfaceVelocity.normalized), -1, 1));
displacementAngle.Value = double.IsNaN(tempAoD) || speedSurface.Value < 0.01 ? 0 : tempAoD;
displacementAngle = double.IsNaN(tempAoD) || speedSurface < 0.01 ? 0 : tempAoD;

vesselHeading.Value = currentHeading;
vesselPitch.Value = currentPitch;
vesselRoll.Value = currentRoll;
vesselHeading = currentHeading;
vesselPitch = currentPitch;
vesselRoll = currentRoll;

altitudeASL.Value = vessel.mainBody.GetAltitude(CoM);
altitudeASL = vessel.mainBody.GetAltitude(CoM);

surfaceAltitudeASL = vessel.mainBody.pqsController != null ? vessel.pqsAltitude : 0d;
if (vessel.mainBody.ocean && surfaceAltitudeASL < 0) surfaceAltitudeASL = 0;
altitudeTrue.Value = altitudeASL - surfaceAltitudeASL;
altitudeTrue = altitudeASL - surfaceAltitudeASL;

// altitudeBottom will be recomputed if someone requests it.
altitudeBottomIsCurrent = false;
Expand All @@ -730,21 +730,21 @@ private void UpdateBasicInfo(Vessel vessel)

speedOfSound = vessel.speedOfSound;

orbitApA.Value = vessel.orbit.ApA;
orbitPeA.Value = vessel.orbit.PeA;
orbitPeriod.Value = vessel.orbit.period;
orbitTimeToAp.Value = vessel.orbit.timeToAp;
orbitTimeToPe.Value = vessel.orbit.timeToPe;
orbitApA = vessel.orbit.ApA;
orbitPeA = vessel.orbit.PeA;
orbitPeriod = vessel.orbit.period;
orbitTimeToAp = vessel.orbit.timeToAp;
orbitTimeToPe = vessel.orbit.timeToPe;

orbitLAN.Value = vessel.orbit.LAN;
orbitLAN = vessel.orbit.LAN;

orbitArgumentOfPeriapsis.Value = vessel.orbit.argumentOfPeriapsis;
orbitInclination.Value = vessel.orbit.inclination;
orbitEccentricity.Value = vessel.orbit.eccentricity;
orbitSemiMajorAxis.Value = vessel.orbit.semiMajorAxis;
celestialLongitude.Value = Planetarium.right.AngleInPlane(-Planetarium.up, orbitalPosition);
latitude.Value = vessel.mainBody.GetLatitude(CoM);
longitude.Value = MuUtils.ClampDegrees180(vessel.mainBody.GetLongitude(CoM));
orbitArgumentOfPeriapsis = vessel.orbit.argumentOfPeriapsis;
orbitInclination = vessel.orbit.inclination;
orbitEccentricity = vessel.orbit.eccentricity;
orbitSemiMajorAxis = vessel.orbit.semiMajorAxis;
celestialLongitude = Planetarium.right.AngleInPlane(-Planetarium.up, orbitalPosition);
latitude = vessel.mainBody.GetLatitude(CoM);
longitude = MuUtils.ClampDegrees180(vessel.mainBody.GetLongitude(CoM));

if (vessel.mainBody != Planetarium.fetch.Sun)
{
Expand Down Expand Up @@ -1366,7 +1366,7 @@ private void UpdateMoIAndAngularMom(Vessel vessel)
{
MoI = vessel.MOI;
angularMomentum = vessel.angularMomentum;
angularVelocityAvg.Value = angularVelocity;
angularVelocityAvg = angularVelocity;
}

[ValueInfoItem("#MechJeb_TerminalVelocity", InfoItem.Category.Vessel, format = ValueInfoItem.SI, units = "m/s")] //Terminal velocity
Expand Down
Loading