Gittes-archive/new-horizons
2
0
Fork 0
mirror of https://github.com/Outer-Wilds-New-Horizons/new-horizons.git synced 2025-12-11 20:15:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Put circumbinary gravity directly on focalpoint (remove fake barycenter)

Browse Source 
Fixes #221
This commit is contained in:
Nick 2022-07-05 18:49:40 -04:00
parent a6b3911e93
commit 6b5b12dbde
6 changed files with 55 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
NewHorizons/Builder/General/DetectorBuilder.cs
View File

@ -44,45 +44,41 @@ namespace NewHorizons.Builder.General
public static void SetDetector(AstroObject primaryBody, AstroObject astroObject, ConstantForceDetector forceDetector)
{
GravityVolume parentGravityVolume = primaryBody?.GetAttachedOWRigidbody()?.GetAttachedGravityVolume();
if (parentGravityVolume != null)
var binaryFocalPoint = primaryBody?.gameObject?.GetComponent<BinaryFocalPoint>();
var parentGravityVolume = primaryBody?.GetAttachedOWRigidbody()?.GetAttachedGravityVolume();
if (binaryFocalPoint != null)
{
forceDetector._detectableFields = new ForceVolume[] { parentGravityVolume };
}
else if (astroObject != null)
{
// It's probably a focal point (or its just broken)
var binaryFocalPoint = primaryBody?.gameObject?.GetComponent<BinaryFocalPoint>();
if (binaryFocalPoint != null)
if (astroObject.GetCustomName().Equals(binaryFocalPoint.PrimaryName))
{
if (astroObject.GetCustomName().Equals(binaryFocalPoint.PrimaryName))
binaryFocalPoint.Primary = astroObject;
if (binaryFocalPoint.Secondary != null)
{
binaryFocalPoint.Primary = astroObject;
if (binaryFocalPoint.Secondary != null)
{
var secondaryRB = binaryFocalPoint.Secondary.GetAttachedOWRigidbody();
SetBinaryForceDetectableFields(binaryFocalPoint, forceDetector, (ConstantForceDetector)secondaryRB.GetAttachedForceDetector());
}
}
else if (astroObject.GetCustomName().Equals(binaryFocalPoint.SecondaryName))
{
binaryFocalPoint.Secondary = astroObject;
if (binaryFocalPoint.Primary != null)
{
var primaryRB = binaryFocalPoint.Primary.GetAttachedOWRigidbody();
SetBinaryForceDetectableFields(binaryFocalPoint, (ConstantForceDetector)primaryRB.GetAttachedForceDetector(), forceDetector);
}
}
else
{
// It's a planet
if (binaryFocalPoint.Primary != null && binaryFocalPoint.Secondary != null)
{
var fakeBarycenterGravityVolume = binaryFocalPoint.FakeMassBody.GetComponent<AstroObject>().GetGravityVolume();
forceDetector._detectableFields = new ForceVolume[] { fakeBarycenterGravityVolume };
}
var secondaryRB = binaryFocalPoint.Secondary.GetAttachedOWRigidbody();
SetBinaryForceDetectableFields(binaryFocalPoint, forceDetector, (ConstantForceDetector)secondaryRB.GetAttachedForceDetector());
}
}
else if (astroObject.GetCustomName().Equals(binaryFocalPoint.SecondaryName))
{
binaryFocalPoint.Secondary = astroObject;
if (binaryFocalPoint.Primary != null)
{
var primaryRB = binaryFocalPoint.Primary.GetAttachedOWRigidbody();
SetBinaryForceDetectableFields(binaryFocalPoint, (ConstantForceDetector)primaryRB.GetAttachedForceDetector(), forceDetector);
}
}
else
{
// It's a planet
if (binaryFocalPoint.Primary != null && binaryFocalPoint.Secondary != null)
{
forceDetector._detectableFields = new ForceVolume[] { parentGravityVolume };
}
}
}
else
{
forceDetector._detectableFields = new ForceVolume[] { parentGravityVolume };
}
}

35
NewHorizons/Builder/Orbital/FocalPointBuilder.cs
View File

@ -4,6 +4,7 @@ using NewHorizons.External.Modules;
using NewHorizons.Handlers;
using NewHorizons.Utility;
using OWML.Common;
using System.Linq;
using UnityEngine;
using Logger = NewHorizons.Utility.Logger;
namespace NewHorizons.Builder.Orbital
@ -18,12 +19,10 @@ namespace NewHorizons.Builder.Orbital
binary.PrimaryName = module.primary;
binary.SecondaryName = module.secondary;
// Below is the stupid fix for making circumbinary planets or wtv
// Grab the bodies from the main dictionary
NewHorizonsBody primary = null;
NewHorizonsBody secondary = null;
foreach (var body in Main.BodyDict[Main.Instance.CurrentStarSystem])
foreach (var body in Main.BodyDict[config.starSystem])
{
if (body.Config.name == module.primary)
{
@ -44,28 +43,26 @@ namespace NewHorizons.Builder.Orbital
Logger.LogError($"Couldn't make focal point between [{module.primary} = {primary}] and [{module.secondary} = {secondary}]");
return;
}
}
public static void ValidateConfig(PlanetConfig config)
{
var primary = Main.BodyDict[config.starSystem].Where(x => x.Config.name == config.FocalPoint.primary).FirstOrDefault();
var secondary = Main.BodyDict[config.starSystem].Where(x => x.Config.name == config.FocalPoint.secondary).FirstOrDefault();
var gravitationalMass = GetGravitationalMass(primary.Config) + GetGravitationalMass(secondary.Config);
// Copying it because I don't want to modify the actual config
var fakeMassConfig = new PlanetConfig();
// Now need to fake the 3 values to make it return this mass
fakeMassConfig.Base.surfaceSize = 1;
fakeMassConfig.Base.surfaceGravity = gravitationalMass * GravityVolume.GRAVITATIONAL_CONSTANT;
fakeMassConfig.Base.gravityFallOff = primary.Config.Base.gravityFallOff;
config.Base.surfaceSize = 1;
config.Base.surfaceGravity = gravitationalMass * GravityVolume.GRAVITATIONAL_CONSTANT;
config.Base.gravityFallOff = primary.Config.Base.gravityFallOff;
// Other stuff to make the fake barycenter not interact with anything in any way
fakeMassConfig.name = config.name + "_FakeBarycenterMass";
fakeMassConfig.Base.soiOverride = 0;
fakeMassConfig.Base.hasMapMarker = false;
fakeMassConfig.ReferenceFrame.enabled = false;
fakeMassConfig.ReferenceFrame.hideInMap = true;
// Other stuff to make the barycenter not interact with anything in any way
config.Base.soiOverride = 0;
fakeMassConfig.Orbit = new OrbitModule();
fakeMassConfig.Orbit.CopyPropertiesFrom(config.Orbit);
binary.FakeMassBody = PlanetCreationHandler.GenerateBody(new NewHorizonsBody(fakeMassConfig, mod));
var separation = primary.Config.Orbit.semiMajorAxis + secondary.Config.Orbit.semiMajorAxis;
config.ReferenceFrame.bracketRadius = separation;
config.ReferenceFrame.targetColliderRadius = separation;
}
private static float GetGravitationalMass(PlanetConfig config)

8
NewHorizons/Builder/Orbital/InitialMotionBuilder.cs
View File

@ -70,8 +70,8 @@ namespace NewHorizons.Builder.Orbital
else
{
// It's a circumbinary moon/planet
var fakePrimaryBody = focalPoint.FakeMassBody.GetComponent<AstroObject>();
SetMotionFromPrimary(fakePrimaryBody, secondaryBody, secondaryBody as NHAstroObject, initialMotion);
var focalPointAO = focalPoint.GetComponent<AstroObject>();
SetMotionFromPrimary(focalPointAO, secondaryBody, secondaryBody as NHAstroObject, initialMotion);
}
}
else if (primaryBody.GetGravityVolume())
@ -107,11 +107,11 @@ namespace NewHorizons.Builder.Orbital
// Might make binaries with binaries with binaries work
if (primaryBody.GetGravityVolume() == null)
{
primaryGravity = new Gravity(primaryBody.GetComponent<BinaryFocalPoint>()?.FakeMassBody?.GetComponent<AstroObject>()?.GetGravityVolume());
primaryGravity = new Gravity(primaryBody.GetGravityVolume());
}
if (secondaryBody.GetGravityVolume() == null)
{
secondaryGravity = new Gravity(secondaryBody.GetComponent<BinaryFocalPoint>()?.FakeMassBody?.GetComponent<AstroObject>()?.GetGravityVolume());
secondaryGravity = new Gravity(secondaryBody.GetGravityVolume());
}
// Update the positions

12
NewHorizons/Components/Orbital/BinaryFocalPoint.cs
View File

@ -1,4 +1,4 @@
using UnityEngine;
using UnityEngine;
namespace NewHorizons.Components.Orbital
{
public class BinaryFocalPoint : MonoBehaviour
@ -9,14 +9,6 @@ namespace NewHorizons.Components.Orbital
public AstroObject Primary { get; set; }
public AstroObject Secondary { get; set; }
public GameObject FakeMassBody { get; set; }
void Start()
{
// Make sure its active but maybe it hasn't been set yet
if (FakeMassBody) FakeMassBody.SetActive(true);
}
void Update()
{
if (Primary == null || Secondary == null)
@ -48,8 +40,6 @@ namespace NewHorizons.Components.Orbital
{
component2.DisableMarker();
}
FakeMassBody.SetActive(false);
}
}
}

1
NewHorizons/External/Configs/PlanetConfig.cs vendored
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using NewHorizons.Builder.Orbital;
using NewHorizons.External.Modules;
using NewHorizons.External.Modules.VariableSize;
using Newtonsoft.Json;

3
NewHorizons/Handlers/PlanetCreationHandler.cs
View File

@ -267,6 +267,9 @@ namespace NewHorizons.Handlers
// Only called when making new planets
public static GameObject GenerateBody(NewHorizonsBody body, bool defaultPrimaryToSun = false)
{
// Focal points are weird
if (body.Config.FocalPoint != null) FocalPointBuilder.ValidateConfig(body.Config);
AstroObject primaryBody;
if (body.Config.Orbit.primaryBody != null)
{