Improving terrain extender landing

jrodrigv · Jan 8, 2021 · 60e7c38 · 60e7c38
1 parent 642ed24
commit 60e7c38
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/...RangeExtender/Distribution/GameData/PhysicsRangeExtender/Plugins/PhysicsRangeExtender.dll b/...RangeExtender/Distribution/GameData/PhysicsRangeExtender/Plugins/PhysicsRangeExtender.dll
diff --git a/PhysicsRangeExtender/PhysicsRangeExtender.cs b/PhysicsRangeExtender/PhysicsRangeExtender.cs
@@ -84,8 +84,9 @@ private void NewVesselIsLoaded(Vessel vessel)
                     {
                         Vessel = vessel,
                         InitialAltitude = vessel.altitude,
+                        InitialPosition = vessel.GetWorldPos3D(),
                         LandedState = TerrainExtender.LandedVesselsStates.NotFocused
-                    });
+                    }); ;
         }
 
 

diff --git a/PhysicsRangeExtender/TerrainExtender.cs b/PhysicsRangeExtender/TerrainExtender.cs
@@ -105,7 +105,9 @@ private void ExtendTerrainForLandedVessels()
                         {
                             currentVesselData.LandedState = LandedVesselsStates.Focused;
                         }
-                        currentVessel.SetWorldVelocity(currentVessel.gravityForPos * -8 * Time.fixedDeltaTime);
+
+                        currentVessel.SetPosition(currentVesselData.InitialPosition + currentVessel.up.normalized * currentVessel.vesselSize.magnitude);
+                        currentVessel.SetWorldVelocity(Vector3.zero);
                         break;
                     case LandedVesselsStates.Focusing:
 
@@ -118,26 +120,23 @@ private void ExtendTerrainForLandedVessels()
                                 vesselLandedState.LandedState = LandedVesselsStates.Focused;
                             }
                         }
-                        currentVessel.SetWorldVelocity(currentVessel.gravityForPos * -8 * Time.fixedDeltaTime);
+                        currentVessel.SetPosition(currentVesselData.InitialPosition + currentVessel.up.normalized * currentVessel.vesselSize.magnitude);
+                        currentVessel.SetWorldVelocity(Vector3.zero);
                         break;
                     case LandedVesselsStates.Focused:
 
-                        if (currentVessel.altitude - currentVesselData.InitialAltitude >= 3d)
-                        {
+                        currentVessel.SetPosition(currentVesselData.InitialPosition + currentVessel.up.normalized * currentVessel.vesselSize.magnitude);
+                        currentVessel.SetWorldVelocity(Vector3.zero);
+                        currentVessel.UpdateLandedSplashed();
                             currentVesselData.LandedState = LandedVesselsStates.Lifted;
-                        }
-                        else
-                        {
-                            currentVessel.SetWorldVelocity(currentVessel.gravityForPos * -8 * Time.fixedDeltaTime);
-                            currentVessel.UpdateLandedSplashed();
-                        }
-
+
                         break;
                     case LandedVesselsStates.Lifted:
 
                         if (!currentVessel.Landed)
                         {
-                            currentVessel.SetWorldVelocity(currentVessel.gravityForPos.normalized* 20.0f  *Time.fixedDeltaTime);
+                            currentVessel.SetWorldVelocity(currentVessel.gravityForPos.normalized * 20.0f * Time.fixedDeltaTime);
+
                             currentVessel.UpdateLandedSplashed();
                         }
                         else
@@ -299,6 +298,8 @@ public class VesselLandedState
             public double InitialAltitude { get; set; }
 
             public double TimeOfState { get; set; }
+
+            public Vector3d InitialPosition { get; set; }
         }
     }
 }