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

rename LayerUtilities to Layer

Browse Source
This commit is contained in:
JohnCorby 2023-03-21 17:27:07 -07:00
parent 9d2d8a4bc3
commit 0cfe62dda5
23 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NewHorizons/Builder/Atmosphere/AirBuilder.cs
View File

@ -9,7 +9,7 @@ namespace NewHorizons.Builder.Atmosphere
{
var airGO = new GameObject("Air");
airGO.SetActive(false);
airGO.layer = LayerUtilities.BasicEffectVolume;
airGO.layer = Layer.BasicEffectVolume;
airGO.transform.parent = sector?.transform ?? planetGO.transform;
var sc = airGO.AddComponent<SphereCollider>();

6
NewHorizons/Builder/Atmosphere/CloudsBuilder.cs
View File

@ -119,7 +119,7 @@ namespace NewHorizons.Builder.Atmosphere
GameObject cloudsFluidGO = new GameObject("CloudsFluid");
cloudsFluidGO.SetActive(false);
cloudsFluidGO.layer = LayerUtilities.BasicEffectVolume;
cloudsFluidGO.layer = Layer.BasicEffectVolume;
cloudsFluidGO.transform.parent = cloudsMainGO.transform;
SphereCollider fluidSC = cloudsFluidGO.AddComponent<SphereCollider>();
@ -252,7 +252,7 @@ namespace NewHorizons.Builder.Atmosphere
if (atmo.clouds.unlit)
{
cloudsTopGO.layer = LayerUtilities.IgnoreSun;
cloudsTopGO.layer = Layer.IgnoreSun;
}
if (atmo.clouds.rotationSpeed != 0f)
@ -304,7 +304,7 @@ namespace NewHorizons.Builder.Atmosphere
{
GameObject tcrqcGO = new GameObject("TransparentCloudRenderQueueController");
tcrqcGO.transform.SetParent(cloudsTransparentGO.transform, false);
tcrqcGO.layer = LayerUtilities.BasicEffectVolume;
tcrqcGO.layer = Layer.BasicEffectVolume;
var shape = tcrqcGO.AddComponent<SphereShape>();
shape.radius = 1;

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

@ -31,7 +31,7 @@ namespace NewHorizons.Builder.Body
ringVolume.transform.localPosition = Vector3.zero;
ringVolume.transform.localScale = Vector3.one;
ringVolume.transform.localRotation = Quaternion.identity;
ringVolume.layer = LayerUtilities.BasicEffectVolume;
ringVolume.layer = Layer.BasicEffectVolume;
var ringShape = ringVolume.AddComponent<RingShape>();
ringShape.innerRadius = ring.innerRadius;

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

@ -183,7 +183,7 @@ namespace NewHorizons.Builder.Body
if (hasDestructionVolume || targetStarSystem != null)
{
var destructionVolumeGO = new GameObject("DestructionVolume");
destructionVolumeGO.layer = LayerUtilities.BasicEffectVolume;
destructionVolumeGO.layer = Layer.BasicEffectVolume;
destructionVolumeGO.transform.parent = singularity.transform;
destructionVolumeGO.transform.localScale = Vector3.one;
destructionVolumeGO.transform.localPosition = Vector3.zero;

8
NewHorizons/Builder/Body/StarBuilder.cs
View File

@ -123,7 +123,7 @@ namespace NewHorizons.Builder.Body
heatVolume.transform.SetParent(starGO.transform, false);
heatVolume.transform.localPosition = Vector3.zero;
heatVolume.transform.localScale = Vector3.one;
heatVolume.layer = LayerUtilities.BasicEffectVolume;
heatVolume.layer = Layer.BasicEffectVolume;
heatVolume.AddComponent<SphereShape>().radius = 1.1f;
heatVolume.AddComponent<OWTriggerVolume>();
heatVolume.AddComponent<HeatHazardVolume>()._damagePerSecond = 20f;
@ -133,7 +133,7 @@ namespace NewHorizons.Builder.Body
deathVolume.transform.SetParent(starGO.transform, false);
deathVolume.transform.localPosition = Vector3.zero;
deathVolume.transform.localScale = Vector3.one;
deathVolume.layer = LayerUtilities.BasicEffectVolume;
deathVolume.layer = Layer.BasicEffectVolume;
var sphereCollider = deathVolume.AddComponent<SphereCollider>();
sphereCollider.radius = 1f;
sphereCollider.isTrigger = true;
@ -149,7 +149,7 @@ namespace NewHorizons.Builder.Body
planetDestructionVolume.transform.SetParent(starGO.transform, false);
planetDestructionVolume.transform.localPosition = Vector3.zero;
planetDestructionVolume.transform.localScale = Vector3.one;
planetDestructionVolume.layer = LayerUtilities.BasicEffectVolume;
planetDestructionVolume.layer = Layer.BasicEffectVolume;
var planetSphereCollider = planetDestructionVolume.AddComponent<SphereCollider>();
planetSphereCollider.radius = 0.8f;
planetSphereCollider.isTrigger = true;
@ -446,7 +446,7 @@ namespace NewHorizons.Builder.Body
supernovaWallAudio.transform.SetParent(supernovaGO.transform, false);
supernovaWallAudio.transform.localPosition = Vector3.zero;
supernovaWallAudio.transform.localScale = Vector3.one;
supernovaWallAudio.layer = LayerUtilities.BasicEffectVolume;
supernovaWallAudio.layer = Layer.BasicEffectVolume;
var audioSource = supernovaWallAudio.AddComponent<AudioSource>();
audioSource.loop = true;
audioSource.maxDistance = 2000;

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

@ -54,7 +54,7 @@ namespace NewHorizons.Builder.Body
// Don't ignore sun when not under clouds
waterGO.layer = 0;
Delay.FireOnNextUpdate(() => { if (planetGO.FindChild("Sector/SunOverride") != null) waterGO.layer = LayerUtilities.IgnoreSun; });
Delay.FireOnNextUpdate(() => { if (planetGO.FindChild("Sector/SunOverride") != null) waterGO.layer = Layer.IgnoreSun; });
TessellatedSphereRenderer TSR = waterGO.AddComponent<TessellatedSphereRenderer>();
TSR.tessellationMeshGroup = ScriptableObject.CreateInstance<MeshGroup>();
@ -101,7 +101,7 @@ namespace NewHorizons.Builder.Body
var buoyancyObject = new GameObject("WaterVolume");
buoyancyObject.transform.parent = waterGO.transform;
buoyancyObject.transform.localScale = Vector3.one;
buoyancyObject.layer = LayerUtilities.BasicEffectVolume;
buoyancyObject.layer = Layer.BasicEffectVolume;
var sphereCollider = buoyancyObject.AddComponent<SphereCollider>();
sphereCollider.radius = 1;

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

@ -82,7 +82,7 @@ namespace NewHorizons.Builder.General
detectorGO.SetActive(false);
detectorGO.transform.parent = planetGO.transform;
detectorGO.transform.localPosition = Vector3.zero;
detectorGO.layer = LayerUtilities.BasicDetector;
detectorGO.layer = Layer.BasicDetector;
ConstantForceDetector forceDetector = detectorGO.AddComponent<ConstantForceDetector>();
forceDetector._inheritElement0 = true;
@ -91,7 +91,7 @@ namespace NewHorizons.Builder.General
// For falling into sun
if (!config.Base.invulnerableToSun && config.Star == null && config.FocalPoint == null)
{
detectorGO.layer = LayerUtilities.AdvancedDetector;
detectorGO.layer = Layer.AdvancedDetector;
var fluidDetector = detectorGO.AddComponent<DynamicFluidDetector>();
var sphereCollider = detectorGO.AddComponent<SphereCollider>();

2
NewHorizons/Builder/General/GravityBuilder.cs
View File

@ -24,7 +24,7 @@ namespace NewHorizons.Builder.General
var gravityGO = new GameObject("GravityWell");
gravityGO.transform.parent = planetGO.transform;
gravityGO.transform.localPosition = Vector3.zero;
gravityGO.layer = LayerUtilities.BasicEffectVolume;
gravityGO.layer = Layer.BasicEffectVolume;
gravityGO.SetActive(false);
var SC = gravityGO.AddComponent<SphereCollider>();

2
NewHorizons/Builder/General/RFVolumeBuilder.cs
View File

@ -13,7 +13,7 @@ namespace NewHorizons.Builder.General
var rfGO = new GameObject("RFVolume");
rfGO.transform.parent = planetGO.transform;
rfGO.transform.localPosition = Vector3.zero;
rfGO.layer = LayerUtilities.ReferenceFrameVolume;
rfGO.layer = Layer.ReferenceFrameVolume;
rfGO.SetActive(false);
var SC = rfGO.AddComponent<SphereCollider>();

6
NewHorizons/Builder/General/SpawnPointBuilder.cs
View File

@ -20,7 +20,7 @@ namespace NewHorizons.Builder.General
if (!Main.Instance.IsWarpingFromVessel && !Main.Instance.IsWarpingFromShip && module.playerSpawn != null)
{
GameObject spawnGO = GeneralPropBuilder.MakeNew("PlayerSpawnPoint", planetGO, null, module.playerSpawn);
spawnGO.layer = LayerUtilities.PlayerSafetyCollider;
spawnGO.layer = Layer.PlayerSafetyCollider;
playerSpawn = spawnGO.AddComponent<SpawnPoint>();
playerSpawn._triggerVolumes = new OWTriggerVolume[0];
@ -30,7 +30,7 @@ namespace NewHorizons.Builder.General
if (module.shipSpawn != null)
{
GameObject spawnGO = GeneralPropBuilder.MakeNew("ShipSpawnPoint", planetGO, null, module.shipSpawn);
spawnGO.layer = LayerUtilities.PlayerSafetyCollider;
spawnGO.layer = Layer.PlayerSafetyCollider;
var spawnPoint = spawnGO.AddComponent<SpawnPoint>();
spawnPoint._isShipSpawn = true;
@ -55,7 +55,7 @@ namespace NewHorizons.Builder.General
Logger.LogVerbose("Overriding player spawn to be inside ship");
GameObject playerSpawnGO = new GameObject("PlayerSpawnPoint");
playerSpawnGO.transform.parent = ship.transform;
playerSpawnGO.layer = LayerUtilities.PlayerSafetyCollider;
playerSpawnGO.layer = Layer.PlayerSafetyCollider;
playerSpawnGO.transform.localPosition = new Vector3(0, 0, 0);

4
NewHorizons/Builder/Props/DialogueBuilder.cs
View File

@ -74,7 +74,7 @@ namespace NewHorizons.Builder.Props
{
var conversationZone = GeneralPropBuilder.MakeNew("ConversationZone", planetGO, sector, info, defaultParentPath: info.pathToAnimController);
conversationZone.layer = LayerUtilities.Interactible;
conversationZone.layer = Layer.Interactible;
var sphere = conversationZone.AddComponent<SphereCollider>();
sphere.radius = info.radius;
@ -215,7 +215,7 @@ namespace NewHorizons.Builder.Props
var playerTrackingZone = new GameObject("PlayerTrackingZone");
playerTrackingZone.SetActive(false);
playerTrackingZone.layer = LayerUtilities.BasicEffectVolume;
playerTrackingZone.layer = Layer.BasicEffectVolume;
playerTrackingZone.SetActive(false);
var sphereCollider = playerTrackingZone.AddComponent<SphereCollider>();

2
NewHorizons/Builder/Props/RemoteBuilder.cs
View File

@ -88,7 +88,7 @@ namespace NewHorizons.Builder.Props
if (_shareStonePrefab == null)
{
GameObject stone = new GameObject("ShareStoneFallback");
stone.layer = LayerUtilities.Interactible;
stone.layer = Layer.Interactible;
stone.SetActive(false);
SphereCollider sc = stone.AddComponent<SphereCollider>();
sc.center = Vector3.zero;

2
NewHorizons/Builder/Props/SignalBuilder.cs
View File

@ -112,7 +112,7 @@ namespace NewHorizons.Builder.Props
public static GameObject Make(GameObject planetGO, Sector sector, SignalModule.SignalInfo info, IModBehaviour mod)
{
var signalGO = GeneralPropBuilder.MakeNew($"Signal_{info.name}", planetGO, sector, info);
signalGO.layer = LayerUtilities.AdvancedEffectVolume;
signalGO.layer = Layer.AdvancedEffectVolume;
var source = signalGO.AddComponent<AudioSource>();
var owAudioSource = signalGO.AddComponent<OWAudioSource>();

2
NewHorizons/Builder/ShipLog/RevealBuilder.cs
View File

@ -93,7 +93,7 @@ namespace NewHorizons.Builder.ShipLog
private static void MakeObservable(GameObject go, Sector sector, VolumesModule.RevealVolumeInfo info, IModBehaviour mod)
{
go.layer = LayerUtilities.Interactible;
go.layer = Layer.Interactible;
var sphere = go.AddComponent<SphereCollider>();
sphere.radius = info.radius;

4
NewHorizons/Builder/StarSystem/SkyboxBuilder.cs
View File

@ -33,7 +33,7 @@ namespace NewHorizons.Builder.StarSystem
var skySphere = new GameObject("Sky Sphere");
skySphere.transform.SetParent(skybox.transform, false);
skySphere.layer = LayerUtilities.Skybox;
skySphere.layer = Layer.Skybox;
skySphere.transform.localScale = Vector3.one * 5f;
BuildSkySphereFace(skySphere, "Right", Quaternion.Euler(0f, 90f, 0f), mesh, rightTex);
@ -56,7 +56,7 @@ namespace NewHorizons.Builder.StarSystem
var go = new GameObject(name)
{
layer = LayerUtilities.Skybox
layer = Layer.Skybox
};
var mf = go.AddComponent<MeshFilter>();

2
NewHorizons/Builder/Volumes/AudioVolumeBuilder.cs
View File

@ -19,7 +19,7 @@ namespace NewHorizons.Builder.Volumes
public static AudioVolume Make(GameObject planetGO, Sector sector, VolumesModule.AudioVolumeInfo info, IModBehaviour mod)
{
var go = GeneralPropBuilder.MakeNew("AudioVolume", planetGO, sector, info);
go.layer = LayerUtilities.AdvancedEffectVolume;
go.layer = Layer.AdvancedEffectVolume;
var audioSource = go.AddComponent<AudioSource>();

4
NewHorizons/Builder/Volumes/HazardVolumeBuilder.cs
View File

@ -16,7 +16,7 @@ namespace NewHorizons.Builder.Volumes
public static HazardVolume Make(GameObject planetGO, Sector sector, OWRigidbody owrb, VolumesModule.HazardVolumeInfo info, IModBehaviour mod)
{
var go = GeneralPropBuilder.MakeNew("HazardVolume", planetGO, sector, info);
go.layer = LayerUtilities.BasicEffectVolume;
go.layer = Layer.BasicEffectVolume;
var shape = go.AddComponent<SphereShape>();
shape.radius = info.radius;
@ -51,7 +51,7 @@ namespace NewHorizons.Builder.Volumes
var detectorGO = new GameObject("ConstantFluidDetector");
detectorGO.transform.parent = go.transform;
detectorGO.transform.localPosition = Vector3.zero;
detectorGO.layer = LayerUtilities.BasicDetector;
detectorGO.layer = Layer.BasicDetector;
var detector = detectorGO.AddComponent<ConstantFluidDetector>();
detector._onlyDetectableFluid = water;
detector._buoyancy.boundingRadius = 1;

2
NewHorizons/Builder/Volumes/NotificationVolumeBuilder.cs
View File

@ -19,7 +19,7 @@ namespace NewHorizons.Builder.Volumes
public static NHNotificationVolume Make(GameObject planetGO, Sector sector, VolumesModule.NotificationVolumeInfo info, IModBehaviour mod)
{
var go = GeneralPropBuilder.MakeNew("NotificationVolume", planetGO, sector, info);
go.layer = LayerUtilities.BasicEffectVolume;
go.layer = Layer.BasicEffectVolume;
var shape = go.AddComponent<SphereShape>();
shape.radius = info.radius;

2
NewHorizons/Builder/Volumes/VanishVolumeBuilder.cs
View File

@ -12,7 +12,7 @@ namespace NewHorizons.Builder.Volumes
public static TVolume Make<TVolume>(GameObject planetGO, Sector sector, VolumesModule.VanishVolumeInfo info) where TVolume : VanishVolume
{
var go = GeneralPropBuilder.MakeNew(typeof(TVolume).Name, planetGO, sector, info);
go.layer = LayerUtilities.BasicEffectVolume;
go.layer = Layer.BasicEffectVolume;
var collider = go.AddComponent<SphereCollider>();
collider.isTrigger = true;

2
NewHorizons/Builder/Volumes/VolumeBuilder.cs
View File

@ -12,7 +12,7 @@ namespace NewHorizons.Builder.Volumes
public static TVolume Make<TVolume>(GameObject planetGO, Sector sector, VolumesModule.VolumeInfo info) where TVolume : MonoBehaviour //Could be BaseVolume but I need to create vanilla volumes too.
{
var go = GeneralPropBuilder.MakeNew(typeof(TVolume).Name, planetGO, sector, info);
go.layer = LayerUtilities.BasicEffectVolume;
go.layer = Layer.BasicEffectVolume;
var shape = go.AddComponent<SphereShape>();
shape.radius = info.radius;

2
NewHorizons/Components/Achievement/AchievementObserveTrigger.cs
View File

@ -21,7 +21,7 @@ namespace NewHorizons.Components.Achievement
private void Reset()
{
gameObject.layer = LayerUtilities.Interactible;
gameObject.layer = Layer.Interactible;
}
private void Awake()

2
NewHorizons/Components/AddPhysics.cs
View File

@ -39,7 +39,7 @@ public class AddPhysics : MonoBehaviour
var owRigidbody = bodyGo.AddComponent<OWRigidbody>();
owRigidbody._simulateInSector = Sector;
bodyGo.layer = LayerUtilities.PhysicalDetector;
bodyGo.layer = Layer.PhysicalDetector;
bodyGo.tag = "DynamicPropDetector";
// this collider is not included in groups. oh well
bodyGo.AddComponent<SphereCollider>().radius = Radius;

2
NewHorizons/Utility/OWUtilities/LayerUtilities.cs → NewHorizons/Utility/OWUtilities/Layer.cs
View File

@ -2,7 +2,7 @@ using UnityEngine;
namespace NewHorizons.Utility.OWUtilities
{
public static class LayerUtilities
public static class Layer
{
public static int Default = LayerMask.NameToLayer(nameof(Default));
public static int TransparentFX = LayerMask.NameToLayer(nameof(TransparentFX));