From 0d030036a2c8bae98dd9731a06dde688ca048d0f Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 22 Aug 2022 18:38:33 -0400 Subject: [PATCH 1/5] Fix eccentric binaries --- NewHorizons/Builder/Orbital/InitialMotionBuilder.cs | 2 +- NewHorizons/Handlers/PlanetCreationHandler.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NewHorizons/Builder/Orbital/InitialMotionBuilder.cs b/NewHorizons/Builder/Orbital/InitialMotionBuilder.cs index 8caa1d8f..969347f3 100644 --- a/NewHorizons/Builder/Orbital/InitialMotionBuilder.cs +++ b/NewHorizons/Builder/Orbital/InitialMotionBuilder.cs @@ -129,7 +129,7 @@ namespace NewHorizons.Builder.Orbital var tru = secondaryBody.trueAnomaly; // Update their astro objects - primaryBody.SetOrbitalParametersFromTrueAnomaly(ecc, r1, inc, arg, lon, tru - 180); + primaryBody.SetOrbitalParametersFromTrueAnomaly(ecc, r1, inc, arg - 180, lon, tru); secondaryBody.SetOrbitalParametersFromTrueAnomaly(ecc, r2, inc, arg, lon, tru); primaryBody.transform.position = baryCenter.transform.position + primaryBody.GetOrbitalParameters(primaryGravity, secondaryGravity).InitialPosition; diff --git a/NewHorizons/Handlers/PlanetCreationHandler.cs b/NewHorizons/Handlers/PlanetCreationHandler.cs index 69e46520..374d1296 100644 --- a/NewHorizons/Handlers/PlanetCreationHandler.cs +++ b/NewHorizons/Handlers/PlanetCreationHandler.cs @@ -432,7 +432,7 @@ namespace NewHorizons.Handlers if (body.Config.Orbit.showOrbitLine && !body.Config.Orbit.isStatic) { - Delay.FireOnNextUpdate(() => OrbitlineBuilder.Make(body.Object, ao as NHAstroObject, body.Config.Orbit.isMoon, body.Config)); + Delay.FireOnNextUpdate(() => OrbitlineBuilder.Make(body.Object, ao, body.Config.Orbit.isMoon, body.Config)); } DetectorBuilder.Make(go, owRigidBody, primaryBody, ao, body.Config); From 925a4c7b54f7ccd5434e897e453a19363ffa9fbb Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 22 Aug 2022 18:42:05 -0400 Subject: [PATCH 2/5] Longitude of ascending node not argument of periapsis --- NewHorizons/Builder/Orbital/InitialMotionBuilder.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NewHorizons/Builder/Orbital/InitialMotionBuilder.cs b/NewHorizons/Builder/Orbital/InitialMotionBuilder.cs index 969347f3..60095799 100644 --- a/NewHorizons/Builder/Orbital/InitialMotionBuilder.cs +++ b/NewHorizons/Builder/Orbital/InitialMotionBuilder.cs @@ -129,7 +129,7 @@ namespace NewHorizons.Builder.Orbital var tru = secondaryBody.trueAnomaly; // Update their astro objects - primaryBody.SetOrbitalParametersFromTrueAnomaly(ecc, r1, inc, arg - 180, lon, tru); + primaryBody.SetOrbitalParametersFromTrueAnomaly(ecc, r1, inc, arg, lon - 180, tru); secondaryBody.SetOrbitalParametersFromTrueAnomaly(ecc, r2, inc, arg, lon, tru); primaryBody.transform.position = baryCenter.transform.position + primaryBody.GetOrbitalParameters(primaryGravity, secondaryGravity).InitialPosition; From f12107e2f72f9e8803a1bcbfe9b04916d2f37c56 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 22 Aug 2022 18:54:09 -0400 Subject: [PATCH 3/5] Revert "Longitude of ascending node not argument of periapsis" This reverts commit 925a4c7b54f7ccd5434e897e453a19363ffa9fbb. --- NewHorizons/Builder/Orbital/InitialMotionBuilder.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NewHorizons/Builder/Orbital/InitialMotionBuilder.cs b/NewHorizons/Builder/Orbital/InitialMotionBuilder.cs index 60095799..969347f3 100644 --- a/NewHorizons/Builder/Orbital/InitialMotionBuilder.cs +++ b/NewHorizons/Builder/Orbital/InitialMotionBuilder.cs @@ -129,7 +129,7 @@ namespace NewHorizons.Builder.Orbital var tru = secondaryBody.trueAnomaly; // Update their astro objects - primaryBody.SetOrbitalParametersFromTrueAnomaly(ecc, r1, inc, arg, lon - 180, tru); + primaryBody.SetOrbitalParametersFromTrueAnomaly(ecc, r1, inc, arg - 180, lon, tru); secondaryBody.SetOrbitalParametersFromTrueAnomaly(ecc, r2, inc, arg, lon, tru); primaryBody.transform.position = baryCenter.transform.position + primaryBody.GetOrbitalParameters(primaryGravity, secondaryGravity).InitialPosition; From 54a3a73c0290c163ddcb11096877c72241e2d736 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 22 Aug 2022 18:56:37 -0400 Subject: [PATCH 4/5] Revert "Revert "Longitude of ascending node not argument of periapsis"" This reverts commit f12107e2f72f9e8803a1bcbfe9b04916d2f37c56. --- NewHorizons/Builder/Orbital/InitialMotionBuilder.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NewHorizons/Builder/Orbital/InitialMotionBuilder.cs b/NewHorizons/Builder/Orbital/InitialMotionBuilder.cs index 969347f3..60095799 100644 --- a/NewHorizons/Builder/Orbital/InitialMotionBuilder.cs +++ b/NewHorizons/Builder/Orbital/InitialMotionBuilder.cs @@ -129,7 +129,7 @@ namespace NewHorizons.Builder.Orbital var tru = secondaryBody.trueAnomaly; // Update their astro objects - primaryBody.SetOrbitalParametersFromTrueAnomaly(ecc, r1, inc, arg - 180, lon, tru); + primaryBody.SetOrbitalParametersFromTrueAnomaly(ecc, r1, inc, arg, lon - 180, tru); secondaryBody.SetOrbitalParametersFromTrueAnomaly(ecc, r2, inc, arg, lon, tru); primaryBody.transform.position = baryCenter.transform.position + primaryBody.GetOrbitalParameters(primaryGravity, secondaryGravity).InitialPosition; From d0f7469cc859bbc81946b4662fd5d1fc326dd6bd Mon Sep 17 00:00:00 2001 From: TerrificTrifid <99054745+TerrificTrifid@users.noreply.github.com> Date: Mon, 22 Aug 2022 18:16:36 -0500 Subject: [PATCH 5/5] Revert "Revert "Revert "Longitude of ascending node not argument of periapsis""" This reverts commit 54a3a73c0290c163ddcb11096877c72241e2d736. --- NewHorizons/Builder/Orbital/InitialMotionBuilder.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NewHorizons/Builder/Orbital/InitialMotionBuilder.cs b/NewHorizons/Builder/Orbital/InitialMotionBuilder.cs index 60095799..969347f3 100644 --- a/NewHorizons/Builder/Orbital/InitialMotionBuilder.cs +++ b/NewHorizons/Builder/Orbital/InitialMotionBuilder.cs @@ -129,7 +129,7 @@ namespace NewHorizons.Builder.Orbital var tru = secondaryBody.trueAnomaly; // Update their astro objects - primaryBody.SetOrbitalParametersFromTrueAnomaly(ecc, r1, inc, arg, lon - 180, tru); + primaryBody.SetOrbitalParametersFromTrueAnomaly(ecc, r1, inc, arg - 180, lon, tru); secondaryBody.SetOrbitalParametersFromTrueAnomaly(ecc, r2, inc, arg, lon, tru); primaryBody.transform.position = baryCenter.transform.position + primaryBody.GetOrbitalParameters(primaryGravity, secondaryGravity).InitialPosition;