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 payload fairing thickness calculation #46

Merged
merged 2 commits into from
Aug 17, 2023
+29 −6
Merged

Fix payload fairing thickness calculation #46

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aeaceb5
Fix payload fairing thickness calculation
FioraAeterna Jun 25, 2023
2c36a49
Merge branch 'KSP-RO:master' into FixFairingThickness
FioraAeterna Aug 17, 2023
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
35 changes: 29 additions & 6 deletions Source/ProceduralFairings/FairingBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ public enum BaseMode { Payload, Adapter, Plate, Other }
[KSPField] public float decouplerMassMult = 1; // Mass multiplier
[KSPField] public float decouplerMassBase = 0; // Flat additional mass (0.001 = 1kg)

[KSPField(isPersistant = true)] public float maxFairingSize = 0; // the "real" maximum width of the fairing, the bulge in the middle

[KSPField(guiActiveEditor = true, guiName = "Mass", groupName = PFUtils.PAWGroup)]
public string massDisplay;

Expand Down Expand Up @@ -146,7 +148,7 @@ public enum BaseMode { Payload, Adapter, Plate, Other }
public int InterstageNodeSize => Math.Max(1, TopNodeSize - 1);
public int FairingBaseNodeSize => Math.Max(1, TopNodeSize - 1);
public float CalcSideThickness() => Mode == BaseMode.Adapter ? Mathf.Min(sideThickness * Mathf.Max(baseSize, topSize), 0.25f * Mathf.Min(baseSize, topSize))
: Mode == BaseMode.Payload ? baseSize * Mathf.Min(sideThickness, 0.25f)
: Mode == BaseMode.Payload ? Mathf.Max(baseSize, maxFairingSize) * Mathf.Min(sideThickness, 0.25f)
: 0;

public ModifierChangeWhen GetModuleCostChangeWhen() => ModifierChangeWhen.FIXED;
Expand Down Expand Up @@ -533,16 +535,24 @@ private System.Collections.IEnumerator EditorChangeDetector()

public void UpdateShape(bool pushAttachments)
{
PayloadScan scan = default;
Profiler.BeginSample("PF.UpdateShape");

Profiler.BeginSample("PF.UpdateShape.Setup");
SetUIFieldLimits();
if (!HighLogic.LoadedSceneIsFlight)
{
Profiler.BeginSample("PF.RecalcShape.ScanPayload");
scan = ScanPayload();
Profiler.EndSample();
RecalcMaxSize(scan);
}
UpdatePartProperties();
UpdateNodes(pushAttachments);
Profiler.EndSample();
Profiler.BeginSample("PF.UpdateShape.RecalcShape");
if (!HighLogic.LoadedSceneIsFlight)
RecalcShape();
RecalcShape(scan);
Profiler.EndSample();
ProceduralTools.DragCubeTool.UpdateDragCubes(part, stall: DefaultStall);
UpdateFairingSideDragCubes();
Expand Down Expand Up @@ -1123,14 +1133,27 @@ private void FillProfileOutline(PayloadScan scan)
}
}

private void RecalcMaxSize(PayloadScan scan)
{
if (Mode != BaseMode.Payload)
{
maxFairingSize = baseSize;
}
else if (!autoShape)
{
maxFairingSize = manualMaxSize;
}
else
{
maxFairingSize = scan.profile.Max() * 2;
}
}

public bool forcePartPosition = true;
public void RecalcShape ()
private void RecalcShape(PayloadScan scan)
{
if (Mode != BaseMode.Payload && Mode != BaseMode.Adapter)
return;
Profiler.BeginSample("PF.RecalcShape.ScanPayload");
var scan = ScanPayload();
Profiler.EndSample();

// Check for reversed bases (inline fairings).

Expand Down