Merge pull request #138 from ZiwKerman/develop

Fix for the drift!
MagicSmokeIndustries · Dec 13, 2016 · 3f12964 · 3f12964
2 parents 1dd1ab1 + 733fcc0
commit 3f12964
Showing 1 changed file with 28 additions and 8 deletions.
diff --git a/InfernalRobotics/InfernalRobotics/Module/ModuleIRServo.cs b/InfernalRobotics/InfernalRobotics/Module/ModuleIRServo.cs
@@ -57,7 +57,7 @@ public class ModuleIRServo : PartModule, IRescalable, IJointLockState
         [KSPField(isPersistant = false)]
         public float jointDamping = 0;
 
-        bool isOnRails = false;
+        bool isOnRails = true;
 
         [KSPField(isPersistant = true)] public bool rotateLimits = false;
         [KSPField(isPersistant = true)] public float rotateMax = 360;
@@ -192,7 +192,11 @@ public ModuleIRServo()
         }
 
         //BEGIN All KSPEvents&KSPActions
-
+        [KSPEvent (guiActive = true, guiActiveEditor = true, guiName = "Reattach FixedMesh", active = true)]
+        public void ReattachFixedMesh ()
+        {
+            AttachToParent ();
+        }
         [KSPEvent(guiActive = true, guiActiveEditor = true, guiName = "Engage Limits", active = false)]
         public void LimitTweakableToggle()
         {
@@ -436,6 +440,12 @@ public override void OnAwake()
             Logger.Log(string.Format("[OnAwake] End, rotateLimits={0}, minTweak={1}, maxTweak={2}, rotateJoint={0}", rotateLimits, minTweak, maxTweak), Logger.Level.Debug);
         }
 
+        public void onDestroy()
+        {
+            GameEvents.onVesselGoOnRails.Remove (OnVesselGoOnRails);
+            GameEvents.onVesselGoOffRails.Remove (OnVesselGoOffRails);
+        }
+
         public void OnVesselGoOnRails (Vessel v)
         {
             if (v != vessel)
@@ -474,11 +484,14 @@ public void OnVesselGoOffRails (Vessel v)
                 return;
 
             JointSetupDone = false;
-            Logger.Log ("[OnVesselGoOffRails] Resetting Joint", Logger.Level.Debug);
+
+            Logger.Log ("[OnVesselGoOffRails] Started for "+ part.name, Logger.Level.Debug);
+
 
             if (joint) 
             {
-                    DestroyImmediate (joint);
+                Logger.Log ("[OnVesselGoOffRails] Resetting Joint", Logger.Level.Debug);
+                DestroyImmediate (joint);
             }
 
             SetupJoints ();
@@ -548,12 +561,17 @@ public override void OnLoad(ConfigNode config)
         {
             Logger.Log("[OnLoad] Start", Logger.Level.Debug);
 
+            base.OnLoad (config);
+
             //save persistent rotation/translation data, because the joint will be initialized at current position.
             rotationDelta = rotation;
             translationDelta = translation;
 
             InitModule();
 
+            Logger.Log ("[OnLoad] Rebuilding Attachments", Logger.Level.Debug);
+            BuildAttachments ();
+
             Logger.Log("[OnLoad] End", Logger.Level.Debug);
         }
         /// <summary>
@@ -618,19 +636,21 @@ protected void SetupMinMaxTweaks()
         protected virtual void AttachToParent()
         {
             Transform fix = FixedMeshTransform;
-            //Transform fix = obj;
-
+            //first revert position to part position
+            fix.position = part.transform.position;
+            fix.rotation = part.transform.rotation;
 
             if (rotateJoint)
             {
                 fix.RotateAround(part.transform.TransformPoint(rotatePivot), part.transform.TransformDirection(rotateAxis),
                     //(invertSymmetry ? ((part.symmetryCounterparts.Count != 1) ? -1 : 1) : -1) *
-                    -rotation);
+                    -rotationDelta);
             }
             else if (translateJoint)
             {
-                fix.Translate(part.transform.TransformDirection(translateAxis.normalized)*translation, Space.World);
+                fix.Translate(translateAxis.normalized*translationDelta, Space.Self);
             }
+
             fix.parent = part.parent.transform;
         }
         /// <summary>