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

Move TimeValuePair to Utility, Ring no longer inherits from VariableSizeModule

Browse Source 
Also migrated the old value for curve to scaleCurve.
This commit is contained in:
Nick 2022-08-25 19:29:06 -04:00
parent 3b55558daa
commit 8d78c49c64
10 changed files with 43 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NewHorizons/Builder/Body/ProxyBuilder.cs
View File

@ -188,7 +188,7 @@ namespace NewHorizons.Builder.Body
newProxy.SetActive(true);
}
private static GameObject AddColouredSphere(GameObject rootObj, float size, VariableSizeModule.TimeValuePair[] curve, Color color)
private static GameObject AddColouredSphere(GameObject rootObj, float size, TimeValuePair[] curve, Color color)
{
GameObject sphereGO = GameObject.CreatePrimitive(PrimitiveType.Sphere);
sphereGO.transform.name = "ProxySphere";
@ -206,7 +206,7 @@ namespace NewHorizons.Builder.Body
return sphereGO;
}
private static void AddSizeController(GameObject go, VariableSizeModule.TimeValuePair[] curve, float size)
private static void AddSizeController(GameObject go, TimeValuePair[] curve, float size)
{
var sizeController = go.AddComponent<SizeController>();
sizeController.SetScaleCurve(curve);

1
NewHorizons/Builder/Body/RingBuilder.cs
View File

@ -7,7 +7,6 @@ using System.Collections.Generic;
using NewHorizons.External.Modules;
using UnityEngine;
using Logger = NewHorizons.Utility.Logger;
using NewHorizons.External.Modules.VariableSize;
namespace NewHorizons.Builder.Body
{

4
NewHorizons/Builder/Body/SingularityBuilder.cs
View File

@ -95,7 +95,7 @@ namespace NewHorizons.Builder.Body
}
public static GameObject MakeBlackHole(GameObject planetGO, Sector sector, Vector3 localPosition, float size,
bool hasDestructionVolume, string targetSolarSystem, VariableSizeModule.TimeValuePair[] curve, bool makeAudio = true)
bool hasDestructionVolume, string targetSolarSystem, TimeValuePair[] curve, bool makeAudio = true)
{
var blackHole = new GameObject("BlackHole");
blackHole.SetActive(false);
@ -181,7 +181,7 @@ namespace NewHorizons.Builder.Body
}
public static GameObject MakeWhiteHole(GameObject planetGO, Sector sector, OWRigidbody OWRB, Vector3 localPosition, float size,
VariableSizeModule.TimeValuePair[] curve, bool makeZeroGVolume = true)
TimeValuePair[] curve, bool makeZeroGVolume = true)
{
var whiteHole = new GameObject("WhiteHole");
whiteHole.SetActive(false);

3
NewHorizons/Components/RingOpacityController.cs
View File

@ -1,4 +1,5 @@
using NewHorizons.External.Modules.VariableSize;
using NewHorizons.Utility;
using UnityEngine;
namespace NewHorizons.Components
@ -35,7 +36,7 @@ namespace NewHorizons.Components
_meshRenderer.material.SetFloat(Alpha, CurrentOpacity);
}
public void SetOpacityCurve(VariableSizeModule.TimeValuePair[] curve)
public void SetOpacityCurve(TimeValuePair[] curve)
{
opacityCurve = new AnimationCurve();
foreach (var pair in curve)

3
NewHorizons/Components/SizeControllers/SizeController.cs
View File

@ -1,4 +1,5 @@
using NewHorizons.External.Modules.VariableSize;
using NewHorizons.Utility;
using UnityEngine;
namespace NewHorizons.Components.SizeControllers
{
@ -22,7 +23,7 @@ namespace NewHorizons.Components.SizeControllers
base.transform.localScale = Vector3.one * CurrentScale;
}
public void SetScaleCurve(VariableSizeModule.TimeValuePair[] curve)
public void SetScaleCurve(TimeValuePair[] curve)
{
scaleCurve = new AnimationCurve();
foreach (var pair in curve)

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

@ -362,6 +362,12 @@ namespace NewHorizons.External.Configs
if (!string.IsNullOrEmpty(Cloak.audioClip)) Cloak.audio = Cloak.audioClip;
if (!string.IsNullOrEmpty(Cloak.audioFilePath)) Cloak.audio = Cloak.audioFilePath;
}
// Rings are no longer variable size module
if (Ring != null)
{
if (Ring.curve != null) Ring.scaleCurve = Ring.curve;
}
}
}
}

11
NewHorizons/External/Modules/VariableSize/RingModule.cs → NewHorizons/External/Modules/RingModule.cs vendored
View File

@ -1,10 +1,12 @@
using System;
using System.ComponentModel.DataAnnotations;
using NewHorizons.Utility;
using Newtonsoft.Json;
namespace NewHorizons.External.Modules.VariableSize
namespace NewHorizons.External.Modules
{
[JsonObject]
public class RingModule : VariableSizeModule
public class RingModule
{
/// <summary>
/// Fluid type for sounds/effects when colliding with this ring.
@ -46,6 +48,11 @@ namespace NewHorizons.External.Modules.VariableSize
/// </summary>
public bool unlit;
#region Obsolete
[Obsolete("curve is deprecated, please use scaleCurve instead")]
public TimeValuePair[] curve;
#endregion
/// <summary>
/// Scale rings over time. Optional. Value between 0-1, time is in minutes.
/// </summary>

17
NewHorizons/External/Modules/VariableSize/VariableSizeModule.cs vendored
View File

@ -1,3 +1,4 @@
using NewHorizons.Utility;
using Newtonsoft.Json;
using UnityEngine;
@ -7,22 +8,8 @@ namespace NewHorizons.External.Modules.VariableSize
public class VariableSizeModule
{
/// <summary>
/// Scale this module over time
/// Scale this object over time
/// </summary>
public TimeValuePair[] curve;
[JsonObject]
public class TimeValuePair
{
/// <summary>
/// A specific point in time
/// </summary>
public float time;
/// <summary>
/// The value for this point in time
/// </summary>
public float value;
}
}
}

1
NewHorizons/Handlers/TitleSceneHandler.cs
View File

@ -5,7 +5,6 @@ using System.Collections.Generic;
using System.Linq;
using UnityEngine;
using Logger = NewHorizons.Utility.Logger;
using NewHorizons.External.Modules.VariableSize;
namespace NewHorizons.Handlers
{

18
NewHorizons/Utility/TimeValuePair.cs Normal file
View File

@ -0,0 +1,18 @@
using Newtonsoft.Json;
namespace NewHorizons.Utility
{
[JsonObject]
public class TimeValuePair
{
/// <summary>
/// A specific point in time
/// </summary>
public float time;
/// <summary>
/// The value for this point in time
/// </summary>
public float value;
}
}