From fedb3c90572991e3e7137b3664e1e59f0acd86d6 Mon Sep 17 00:00:00 2001 From: Noah Pilarski Date: Sat, 16 Jul 2022 20:01:06 -0400 Subject: [PATCH] Use property id --- .../SizeControllers/StarEvolutionController.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/NewHorizons/Components/SizeControllers/StarEvolutionController.cs b/NewHorizons/Components/SizeControllers/StarEvolutionController.cs index a60cccbb..13a6522d 100644 --- a/NewHorizons/Components/SizeControllers/StarEvolutionController.cs +++ b/NewHorizons/Components/SizeControllers/StarEvolutionController.cs @@ -55,6 +55,7 @@ namespace NewHorizons.Components.SizeControllers private float maxScale; private float minScale; private static readonly int ColorRamp = Shader.PropertyToID("_ColorRamp"); + private static readonly int ColorTime = Shader.PropertyToID("_ColorTime"); private Color _currentColour; @@ -159,18 +160,20 @@ namespace NewHorizons.Components.SizeControllers { _currentColour = Color.Lerp(_startColour, _endColour, t); supernova._surface._materials[0].Lerp(_startSurfaceMaterial, _endSurfaceMaterial, t); - supernova._surface._materials[0].SetFloat("_ColorTime", t); + supernova._surface._materials[0].SetFloat(ColorTime, t); } else { _currentColour = _endColour; - supernova._surface._materials[0].SetFloat("_ColorTime", 1); + supernova._surface._materials[0].Lerp(_startSurfaceMaterial, _endSurfaceMaterial, 1); + supernova._surface._materials[0].SetFloat(ColorTime, 1); } } else { _currentColour = _startColour; - supernova._surface._materials[0].SetFloat("_ColorTime", 0); + supernova._surface._materials[0].Lerp(_startSurfaceMaterial, _endSurfaceMaterial, 0); + supernova._surface._materials[0].SetFloat(ColorTime, 0); } if (_flareEmitter != null) _flareEmitter._tint = _currentColour;