From 51a5272ffbf3fa229a9cd9f813a5bc485d82dd8b Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 18 Apr 2022 00:13:08 -0400 Subject: [PATCH] Remove some old circumbinary planet stuff that doesn't work --- NewHorizons/Builder/General/DetectorBuilder.cs | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/NewHorizons/Builder/General/DetectorBuilder.cs b/NewHorizons/Builder/General/DetectorBuilder.cs index 1ca5fc62..fc992310 100644 --- a/NewHorizons/Builder/General/DetectorBuilder.cs +++ b/NewHorizons/Builder/General/DetectorBuilder.cs @@ -58,7 +58,7 @@ namespace NewHorizons.Builder.General if (binaryFocalPoint.Secondary != null) { var secondaryRB = binaryFocalPoint.Secondary.GetAttachedOWRigidbody(); - SetBinaryForceDetectableFields(binaryFocalPoint, forceDetector, (ConstantForceDetector)secondaryRB.GetAttachedForceDetector(), OWRB, secondaryRB); + SetBinaryForceDetectableFields(binaryFocalPoint, forceDetector, (ConstantForceDetector)secondaryRB.GetAttachedForceDetector()); } } else if (astroObject.GetCustomName().Equals(binaryFocalPoint.SecondaryName)) @@ -67,13 +67,12 @@ namespace NewHorizons.Builder.General if (binaryFocalPoint.Primary != null) { var primaryRB = binaryFocalPoint.Primary.GetAttachedOWRigidbody(); - SetBinaryForceDetectableFields(binaryFocalPoint, (ConstantForceDetector)primaryRB.GetAttachedForceDetector(), forceDetector, primaryRB, OWRB); + SetBinaryForceDetectableFields(binaryFocalPoint, (ConstantForceDetector)primaryRB.GetAttachedForceDetector(), forceDetector); } } else { // It's a planet - binaryFocalPoint.Planets.Add(astroObject); if(binaryFocalPoint.Primary != null && binaryFocalPoint.Secondary != null) { var fakeBarycenterGravityVolume = binaryFocalPoint.FakeMassBody.GetComponent().GetGravityVolume(); @@ -87,13 +86,12 @@ namespace NewHorizons.Builder.General return detectorGO; } - private static void SetBinaryForceDetectableFields(BinaryFocalPoint point, ConstantForceDetector primaryCFD, ConstantForceDetector secondaryCFD, OWRigidbody primaryRB, OWRigidbody secondaryRB) + private static void SetBinaryForceDetectableFields(BinaryFocalPoint point, ConstantForceDetector primaryCFD, ConstantForceDetector secondaryCFD) { Logger.Log($"Setting up binary focal point for {point.name}"); var primary = point.Primary; var secondary = point.Secondary; - var planets = point.Planets; // Binaries have to use the same gravity exponent var primaryGV = primary.GetGravityVolume(); @@ -117,15 +115,6 @@ namespace NewHorizons.Builder.General secondaryCFD._inheritDetector = pointForceDetector; secondaryCFD._activeInheritedDetector = pointForceDetector; secondaryCFD._inheritElement0 = false; - - foreach(var planet in planets) - { - var planetCFD = planet.GetAttachedOWRigidbody().GetAttachedForceDetector() as ConstantForceDetector; - planetCFD._detectableFields = new ForceVolume[] { primaryGV, secondaryGV }; - planetCFD._inheritDetector = pointForceDetector; - planetCFD._activeInheritedDetector = pointForceDetector; - planetCFD._inheritElement0 = false; - } } } }