Skip to content

Pullrequests/to/upstream/2020 1221 #8

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

Open
Lisias wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Pullrequests/to/upstream/2020 1221 #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad6b341
Fixing the module Life Cycle
Lisias Dec 21, 2020
a254163
If OnUpdate is inhibited, OnFixedUpdate should be inhibited too - or …
Lisias Dec 21, 2020
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
33 changes: 15 additions & 18 deletions HLAirships/HLEnvelope.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,21 +281,18 @@ public void BuoyancyC_Action(KSPActionParam param)

public override void OnAwake()
{
if (!HighLogic.LoadedSceneIsEditor && !HighLogic.LoadedSceneIsFlight)
return;

this.objGravity = new GameObject();
this.objUp = new GameObject();
this.objPosition = new GameObject();
this.objUpProjected = new GameObject();
this.objPositionProjected = new GameObject();

/// Constructor style setup.
/// Called in the Part\'s Awake method.
/// The model may not be built by this point.

// Set starting animation state
Debug.Log("Set Envelope Animation");
/// Constructor style setup.
/// Called in the Part\'s Awake method.
/// The model may not be built by this point.

this.objGravity = new GameObject();
this.objUp = new GameObject();
this.objPosition = new GameObject();
this.objUpProjected = new GameObject();
this.objPositionProjected = new GameObject();

// Set starting animation state
Debug.Log("Set Envelope Animation");
if (animationState == 0 || targetBuoyantVessel == 0)
{
// If it does not have animation start it "opened"
Expand Down Expand Up @@ -438,9 +435,6 @@ public void animateEnvelope()

public override void OnStart(StartState state)
{
if (!HighLogic.LoadedSceneIsEditor && !HighLogic.LoadedSceneIsFlight)
return;

// OnFlightStart seems to have been removed
/// Called during the Part startup.
/// StartState gives flag values of initial state
Expand Down Expand Up @@ -493,6 +487,9 @@ public override void OnFixedUpdate()
/// Called ONLY when Part is ACTIVE!
///

if (!HighLogic.LoadedSceneIsEditor && !HighLogic.LoadedSceneIsFlight)
return;

if (leadEnvelope == this.part) leadEnvelopeUpdate();

// Update buoyancy properties
Expand Down