diff --git a/NewHorizons/Builder/Atmosphere/VolumesBuilder.cs b/NewHorizons/Builder/Atmosphere/VolumesBuilder.cs index 6a960870..f4e7e17c 100644 --- a/NewHorizons/Builder/Atmosphere/VolumesBuilder.cs +++ b/NewHorizons/Builder/Atmosphere/VolumesBuilder.cs @@ -44,7 +44,7 @@ namespace NewHorizons.Builder.Atmosphere var cloudMaterial = new Material(gdRuleset._cloudMaterial); if (config.Atmosphere?.clouds?.tint != null) { - cloudMaterial.SetColor(FogColor, config.Atmosphere.clouds.tint.ToColor32()); + cloudMaterial.SetColor(FogColor, config.Atmosphere.clouds.tint.ToColor()); } ER._cloudMaterial = cloudMaterial; diff --git a/NewHorizons/Builder/Body/SandBuilder.cs b/NewHorizons/Builder/Body/SandBuilder.cs index 261a3434..c9e02920 100644 --- a/NewHorizons/Builder/Body/SandBuilder.cs +++ b/NewHorizons/Builder/Body/SandBuilder.cs @@ -24,8 +24,8 @@ namespace NewHorizons.Builder.Body new Material(sandMaterials[1]) }; GameObject.Destroy(oldMR); - sandMR.sharedMaterials[0].color = module.Tint.ToColor32(); - sandMR.sharedMaterials[1].color = module.Tint.ToColor32(); + sandMR.sharedMaterials[0].color = module.Tint.ToColor(); + sandMR.sharedMaterials[1].color = module.Tint.ToColor(); } var collider = GameObject.Instantiate(GameObject.Find("TowerTwin_Body/SandSphere_Draining/Collider"), sandGO.transform); diff --git a/NewHorizons/Builder/Orbital/OrbitlineBuilder.cs b/NewHorizons/Builder/Orbital/OrbitlineBuilder.cs index dc2a0232..61fe3f88 100644 --- a/NewHorizons/Builder/Orbital/OrbitlineBuilder.cs +++ b/NewHorizons/Builder/Orbital/OrbitlineBuilder.cs @@ -57,13 +57,13 @@ namespace NewHorizons.Builder.Orbital } var color = Color.white; - if (config.Orbit.tint != null) color = config.Orbit.tint.ToColor32(); - else if (config.Star != null) color = config.Star.tint.ToColor32(); - else if (config.Atmosphere?.clouds?.tint != null) color = config.Atmosphere.clouds.tint.ToColor32(); + if (config.Orbit.tint != null) color = config.Orbit.tint.ToColor(); + else if (config.Star != null) color = config.Star.tint.ToColor(); + else if (config.Atmosphere?.clouds?.tint != null) color = config.Atmosphere.clouds.tint.ToColor(); else if (config.Singularity != null) color = new Color(1f, 0.5f, 1f); else if (config.Water != null) color = new Color(0.5f, 0.5f, 1f); else if (config.Lava != null) color = new Color(1f, 0.5f, 0.5f); - else if (config.Atmosphere != null && config.Atmosphere.fogTint != null) color = config.Atmosphere.fogTint.ToColor32(); + else if (config.Atmosphere != null && config.Atmosphere.fogTint != null) color = config.Atmosphere.fogTint.ToColor(); var fade = isMoon; diff --git a/NewHorizons/Utility/MColor.cs b/NewHorizons/Utility/MColor.cs index 9bb81358..8c1e44dd 100644 --- a/NewHorizons/Utility/MColor.cs +++ b/NewHorizons/Utility/MColor.cs @@ -39,9 +39,6 @@ namespace NewHorizons.Utility [DefaultValue(255f)] public int a; - public Color32 ToColor32() => new Color32((byte)r, (byte)g, (byte)b, (byte)a); - public Color ToColor() => new Color(r / 255f, g / 255f, b / 255f, a / 255f); - public static implicit operator Color(MColor c) => new Color(c.r / 255f, c.g / 255f, c.b / 255f, c.a / 255f); } }