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

Revert for now

Browse Source
This commit is contained in:
Noah Pilarski 2022-08-21 18:23:37 -04:00
parent b09aa24037
commit 8684a2d08c
3 changed files with 23 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -178,6 +178,16 @@ namespace NewHorizons.Builder.Body
} }
surfaceAudio.SetStarEvolutionController(controller); surfaceAudio.SetStarEvolutionController(controller);
starGO.SetActive(true); starGO.SetActive(true);
// It fucking insists on this existing and its really annoying
var supernovaVolume = new GameObject("SupernovaVolumePlaceholder");
supernovaVolume.transform.SetParent(starGO.transform);
supernovaVolume.layer = LayerMask.NameToLayer("BasicEffectVolume");
var sphere = supernovaVolume.AddComponent<SphereCollider>();
sphere.radius = 0f;
sphere.isTrigger = true;
supernovaVolume.AddComponent<OWCollider>();
supernova._supernovaVolume = supernovaVolume.AddComponent<SupernovaDestructionVolume>();
} }
var shockLayerRuleset = sector.gameObject.AddComponent<ShockLayerRuleset>(); var shockLayerRuleset = sector.gameObject.AddComponent<ShockLayerRuleset>();
@ -200,7 +210,7 @@ namespace NewHorizons.Builder.Body
{ {
var supernova = MakeSupernova(starGO, starModule); var supernova = MakeSupernova(starGO, starModule);
supernova.SetIsProxy(true); supernova._belongsToProxySun = true;
starGO.SetActive(false); starGO.SetActive(false);
var controller = starGO.AddComponent<StarEvolutionController>(); var controller = starGO.AddComponent<StarEvolutionController>();
@ -302,7 +312,7 @@ namespace NewHorizons.Builder.Body
return starGO; return starGO;
} }
public static StellarDeathController MakeSupernova(GameObject starGO, StarModule starModule) public static SupernovaEffectController MakeSupernova(GameObject starGO, StarModule starModule)
{ {
var supernovaGO = SearchUtilities.Find("Sun_Body/Sector_SUN/Effects_SUN/Supernova").InstantiateInactive(); var supernovaGO = SearchUtilities.Find("Sun_Body/Sector_SUN/Effects_SUN/Supernova").InstantiateInactive();
supernovaGO.name = "Supernova"; supernovaGO.name = "Supernova";
@ -310,35 +320,26 @@ namespace NewHorizons.Builder.Body
supernovaGO.transform.localPosition = Vector3.zero; supernovaGO.transform.localPosition = Vector3.zero;
var supernova = supernovaGO.GetComponent<SupernovaEffectController>(); var supernova = supernovaGO.GetComponent<SupernovaEffectController>();
var stellarDeath = supernovaGO.AddComponent<StellarDeathController>(); supernova._surface = starGO.GetComponentInChildren<TessellatedSphereRenderer>();
stellarDeath.enabled = false; supernova._supernovaScale = new AnimationCurve(new Keyframe(0, 200, 0, 0, 1f / 3f, 1f / 3f), new Keyframe(45, starModule.supernovaSize, 1758.508f, 1758.508f, 1f / 3f, 1f / 3f));
stellarDeath._surface = starGO.GetComponentInChildren<TessellatedSphereRenderer>(); supernova._supernovaAlpha = new AnimationCurve(new Keyframe(5, 1, 0, 0, 1f / 3f, 1f / 3f), new Keyframe(15, 1.0002f, 0, 0, 1f / 3f, 1f / 3f), new Keyframe(50, 0, -0.0578f, 1 / 3f, -0.0578f, 1 / 3f));
stellarDeath._supernovaScale = new AnimationCurve(new Keyframe(0, 200, 0, 0, 1f / 3f, 1f / 3f), new Keyframe(45, starModule.supernovaSize, 1758.508f, 1758.508f, 1f / 3f, 1f / 3f)); supernova._supernovaVolume = null;
stellarDeath._supernovaAlpha = new AnimationCurve(new Keyframe(5, 1, 0, 0, 1f / 3f, 1f / 3f), new Keyframe(15, 1.0002f, 0, 0, 1f / 3f, 1f / 3f), new Keyframe(50, 0, -0.0578f, 1 / 3f, -0.0578f, 1 / 3f));
stellarDeath._explosionParticles = supernova._explosionParticles;
stellarDeath._shockwave = supernova._shockwave;
stellarDeath._shockwaveLength = supernova._shockwaveLength;
stellarDeath._shockwaveAlpha = supernova._shockwaveAlpha;
stellarDeath._shockwaveScale = supernova._shockwaveScale;
stellarDeath._supernovaMaterial = supernova._supernovaMaterial;
stellarDeath._audioSource = supernova._audioSource;
GameObject.Destroy(supernova);
if (starModule.supernovaTint != null) if (starModule.supernovaTint != null)
{ {
var colour = starModule.supernovaTint.ToColor(); var colour = starModule.supernovaTint.ToColor();
var supernovaMaterial = new Material(stellarDeath._supernovaMaterial); var supernovaMaterial = new Material(supernova._supernovaMaterial);
var ramp = ImageUtilities.LerpGreyscaleImage(ImageUtilities.GetTexture(Main.Instance, "Assets/textures/Effects_SUN_Supernova_d.png"), Color.white, colour); var ramp = ImageUtilities.LerpGreyscaleImage(ImageUtilities.GetTexture(Main.Instance, "Assets/textures/Effects_SUN_Supernova_d.png"), Color.white, colour);
supernovaMaterial.SetTexture(ColorRamp, ramp); supernovaMaterial.SetTexture(ColorRamp, ramp);
stellarDeath._supernovaMaterial = supernovaMaterial; supernova._supernovaMaterial = supernovaMaterial;
// Motes // Motes
var moteMaterial = supernovaGO.GetComponentInChildren<ParticleSystemRenderer>().material; var moteMaterial = supernova.GetComponentInChildren<ParticleSystemRenderer>().material;
moteMaterial.color = new Color(colour.r * 3f, colour.g * 3f, colour.b * 3f, moteMaterial.color.a); moteMaterial.color = new Color(colour.r * 3f, colour.g * 3f, colour.b * 3f, moteMaterial.color.a);
} }
foreach (var controller in supernovaGO.GetComponentsInChildren<SupernovaStreamersController>()) foreach (var controller in supernova.GetComponentsInChildren<SupernovaStreamersController>())
{ {
Object.DestroyImmediate(controller); Object.DestroyImmediate(controller);
} }
@ -349,12 +350,11 @@ namespace NewHorizons.Builder.Body
supernovaWallAudio.transform.localScale = Vector3.one; supernovaWallAudio.transform.localScale = Vector3.one;
supernovaWallAudio.layer = LayerMask.NameToLayer("BasicEffectVolume"); supernovaWallAudio.layer = LayerMask.NameToLayer("BasicEffectVolume");
supernovaWallAudio.AddComponent<AudioSource>(); supernovaWallAudio.AddComponent<AudioSource>();
stellarDeath._audioSource = supernovaWallAudio.AddComponent<OWAudioSource>(); supernova._audioSource = supernovaWallAudio.AddComponent<OWAudioSource>();
stellarDeath._audioSource._audioLibraryClip = AudioType.Sun_SupernovaWall_LP;
supernovaGO.SetActive(true); supernovaGO.SetActive(true);
return stellarDeath; return supernova;
} }
} }
} }

2
NewHorizons/Components/SizeControllers/StarEvolutionController.cs
View File

@ -19,7 +19,7 @@ namespace NewHorizons.Components.SizeControllers
public GameObject atmosphere; public GameObject atmosphere;
public StarController controller; public StarController controller;
public StellarDeathController supernova; public SupernovaEffectController supernova;
public bool WillExplode { get; set; } public bool WillExplode { get; set; }
public MColor StartColour { get; set; } public MColor StartColour { get; set; }
public MColor EndColour { get; set; } public MColor EndColour { get; set; }

100
NewHorizons/Components/StellarDeathController.cs
View File

@ -1,100 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
namespace NewHorizons.Components
{
public class StellarDeathController : MonoBehaviour
{
public ParticleSystem[] _explosionParticles;
public MeshRenderer _shockwave;
public float _shockwaveLength = 5f;
public AnimationCurve _shockwaveScale = AnimationCurve.Linear(0.0f, 0.0f, 1f, 100000f);
public AnimationCurve _shockwaveAlpha = AnimationCurve.Linear(0.0f, 1f, 1f, 0.0f);
[Space]
public TessellatedSphereRenderer _surface;
public Material _supernovaMaterial;
public AnimationCurve _supernovaScale = new AnimationCurve(new Keyframe(0, 200, 0, 0, 1f / 3f, 1f / 3f), new Keyframe(45, 50000, 1758.508f, 1758.508f, 1f / 3f, 1f / 3f));
public AnimationCurve _supernovaAlpha = new AnimationCurve(new Keyframe(5, 1, 0, 0, 1f / 3f, 1f / 3f), new Keyframe(15, 1.0002f, 0, 0, 1f / 3f, 1f / 3f), new Keyframe(50, 0, -0.0578f, 1 / 3f, -0.0578f, 1 / 3f));
[Space]
public OWAudioSource _audioSource;
private float _time;
private float _currentSupernovaScale;
private Material _localSupernovaMat;
private bool _isProxy;
private ParticleSystemRenderer[] _cachedParticleRenderers;
private void Awake()
{
_cachedParticleRenderers = new ParticleSystemRenderer[_explosionParticles.Length];
for (int index = 0; index < _explosionParticles.Length; ++index)
_cachedParticleRenderers[index] = _explosionParticles[index].GetComponent<ParticleSystemRenderer>();
}
private void OnEnable()
{
_shockwave.enabled = true;
foreach (var particle in _explosionParticles) particle.Play();
_time = 0.0f;
_currentSupernovaScale = _supernovaScale.Evaluate(0.0f);
_localSupernovaMat = new Material(_supernovaMaterial);
_surface.sharedMaterial = _localSupernovaMat;
if (_audioSource == null) return;
_audioSource.AssignAudioLibraryClip(AudioType.Sun_SupernovaWall_LP);
_audioSource.SetLocalVolume(0);
_audioSource.Play();
}
private void OnDisable()
{
_shockwave.enabled = false;
if (_audioSource == null) return;
_audioSource.SetLocalVolume(0);
_audioSource.Stop();
}
private void FixedUpdate()
{
_time += Time.deltaTime;
float shockwaveTime = Mathf.Clamp01(_time / _shockwaveLength);
_shockwave.transform.localScale = Vector3.one * _shockwaveScale.Evaluate(shockwaveTime);
_shockwave.material.color = Color.Lerp(Color.black, _shockwave.sharedMaterial.color, _shockwaveAlpha.Evaluate(shockwaveTime));
_currentSupernovaScale = _supernovaScale.Evaluate(_time);
_surface.transform.localScale = Vector3.one * _currentSupernovaScale;
_localSupernovaMat.color = Color.Lerp(Color.black, _supernovaMaterial.color, _supernovaAlpha.Evaluate(_time));
float distanceToPlayer = PlayerState.InDreamWorld() ? 20000f : (Vector3.Distance(transform.position, Locator.GetPlayerCamera().transform.position) - GetSupernovaRadius());
if (_isProxy) return;
if (_audioSource != null)
{
float dt = Mathf.InverseLerp(12000f, 0.0f, distanceToPlayer);
_audioSource.SetLocalVolume(Mathf.Lerp(0.0f, 1f, dt * dt) * Mathf.InverseLerp(0.0f, 5f, _time));
}
RumbleManager.UpdateSupernova(distanceToPlayer);
}
public float GetSupernovaRadius() => _currentSupernovaScale;
public void SetIsProxy(bool isProxy) => _isProxy = isProxy;
public void SetParticlesVisibility(bool visible)
{
foreach (var particleRenderer in _cachedParticleRenderers) particleRenderer.enabled = visible;
}
public void SetRenderingEnabled(bool renderingEnabled)
{
if (!enabled) return;
_shockwave.enabled = renderingEnabled;
SetParticlesVisibility(renderingEnabled);
}
}
}