From 0adea1a3250001d554e78df8b3cb2445ee7d3b98 Mon Sep 17 00:00:00 2001 From: PopSlime Date: Fri, 21 Feb 2025 21:42:28 +0800 Subject: [PATCH] fix: Remove SeverityColorMapping config --- Assets/Cryville.EEW.Unity/Config.cs | 7 +++---- Assets/Cryville.EEW.Unity/SharedSettings.cs | 9 ++++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Assets/Cryville.EEW.Unity/Config.cs b/Assets/Cryville.EEW.Unity/Config.cs index cc0a372..0566b30 100644 --- a/Assets/Cryville.EEW.Unity/Config.cs +++ b/Assets/Cryville.EEW.Unity/Config.cs @@ -1,10 +1,10 @@ +using System; using System.Collections.Generic; using System.Text.Json.Serialization; namespace Cryville.EEW.Unity { record Config( string SeverityScheme, - string SeverityColorMapping, float SeverityColorMappingLuminanceMultiplier, bool UseContinuousColor, string ColorScheme, @@ -16,7 +16,6 @@ namespace Cryville.EEW.Unity { IReadOnlyCollection EventSources ) { public static Config Default => new( - "Default", "Default", 1f, false, @@ -27,9 +26,9 @@ namespace Cryville.EEW.Unity { true, new List { - new JMAAtomEventSourceConfig(), + new JMAAtomEventSourceConfig(Array.Empty()), new UpdateCheckerEventSourceConfig(), - new WolfxEventSourceConfig(), + new WolfxEventSourceConfig(Array.Empty()), } ); } diff --git a/Assets/Cryville.EEW.Unity/SharedSettings.cs b/Assets/Cryville.EEW.Unity/SharedSettings.cs index e0b8348..447d9b9 100644 --- a/Assets/Cryville.EEW.Unity/SharedSettings.cs +++ b/Assets/Cryville.EEW.Unity/SharedSettings.cs @@ -69,11 +69,14 @@ namespace Cryville.EEW.Unity { "Legacy" => new LegacySeverityScheme(), _ => throw new InvalidOperationException("Unknown severity scheme."), }; - SeverityColorMapping = config.SeverityColorMapping switch { + SeverityColorMapping = config.ColorScheme switch { "Default" => new DefaultSeverityColorMapping(config.SeverityColorMappingLuminanceMultiplier), "SREV" => new SREVSeverityColorMapping(config.SeverityColorMappingLuminanceMultiplier), - "SREVBorder" => new SREVBorderSeverityColorMapping(config.SeverityColorMappingLuminanceMultiplier), - _ => throw new InvalidOperationException("Unknown severity color mapping."), + "DichromaticYB" => new DichromaticSeverityColorMapping(0.62f, 0.20f, 90, config.SeverityColorMappingLuminanceMultiplier), + "DichromaticRC" => new DichromaticSeverityColorMapping(0.62f, 0.25f, 30, config.SeverityColorMappingLuminanceMultiplier), + "DichromaticPG" => new DichromaticSeverityColorMapping(0.62f, 0.30f, -30, config.SeverityColorMappingLuminanceMultiplier), + "Monochromatic" => new MonochromaticSeverityColorMapping(config.SeverityColorMappingLuminanceMultiplier), + _ => throw new InvalidOperationException("Unknown color scheme."), }; UseContinuousColor = config.UseContinuousColor; ColorScheme = config.ColorScheme switch {