Skip to content

Commit

Permalink
Fix: Unintentional case sensitivity in loading options
Browse files Browse the repository at this point in the history 
#1066 (comment)
  • Loading branch information
@leezer3
leezer3 committed Dec 7, 2024
1 parent 01cc880 commit d2b81d3
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 146 deletions.
16 changes: 1 addition & 15 deletions source/ObjectViewer/Options.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
using OpenBveApi;
using OpenBveApi.Graphics;
using OpenBveApi.Input;
using OpenBveApi.Objects;
using OpenTK.Graphics.ES11;
using Path = OpenBveApi.Path;

namespace ObjectViewer
Expand Down Expand Up @@ -83,19 +81,7 @@ public override void Save(string fileName)
Builder.AppendLine("isUseNewRenderer = " + (IsUseNewRenderer ? "true" : "false"));
Builder.AppendLine();
Builder.AppendLine("[quality]");
{
string t; switch (Interpolation)
{
case InterpolationMode.NearestNeighbor: t = "nearestNeighbor"; break;
case InterpolationMode.Bilinear: t = "bilinear"; break;
case InterpolationMode.NearestNeighborMipmapped: t = "nearestNeighborMipmapped"; break;
case InterpolationMode.BilinearMipmapped: t = "bilinearMipmapped"; break;
case InterpolationMode.TrilinearMipmapped: t = "trilinearMipmapped"; break;
case InterpolationMode.AnisotropicFiltering: t = "anisotropicFiltering"; break;
default: t = "bilinearMipmapped"; break;
}
Builder.AppendLine("interpolation = " + t);
}
Builder.AppendLine("interpolation = " + Interpolation);
Builder.AppendLine("anisotropicfilteringlevel = " + AnisotropicFilteringLevel.ToString(Culture));
Builder.AppendLine("antialiasinglevel = " + AntiAliasingLevel.ToString(Culture));
Builder.AppendLine("transparencyMode = " + ((int)TransparencyMode).ToString(Culture));
Expand Down
123 changes: 6 additions & 117 deletions source/OpenBVE/System/Options.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,29 +269,7 @@ public override void Save(string fileName)
Builder.AppendLine();
Builder.AppendLine("[interface]");
Builder.AppendLine("folder = " + UserInterfaceFolder);
{
string t;
switch (TimeTableStyle)
{
case TimeTableMode.None:
t = "none";
break;
case TimeTableMode.Default:
t = "default";
break;
case TimeTableMode.AutoGenerated:
t = "autogenerated";
break;
case TimeTableMode.PreferCustom:
t = "prefercustom";
break;
default:
t = "default";
break;
}

Builder.AppendLine("timetablemode = " + t);
}
Builder.AppendLine("timetablemode = " + TimeTableStyle);
Builder.AppendLine("kioskMode = " + (KioskMode ? "true" : "false"));
Builder.AppendLine("kioskModeTimer = " + KioskModeTimer);
Builder.AppendLine("accessibility = " + (Accessibility ? "true" : "false"));
Expand All @@ -316,62 +294,15 @@ public override void Save(string fileName)
Builder.AppendLine("uiscalefactor = " + UserInterfaceScaleFactor);
Builder.AppendLine();
Builder.AppendLine("[quality]");
{
string t;
switch (Interpolation)
{
case InterpolationMode.NearestNeighbor:
t = "nearestNeighbor";
break;
case InterpolationMode.Bilinear:
t = "bilinear";
break;
case InterpolationMode.NearestNeighborMipmapped:
t = "nearestNeighborMipmapped";
break;
case InterpolationMode.BilinearMipmapped:
t = "bilinearMipmapped";
break;
case InterpolationMode.TrilinearMipmapped:
t = "trilinearMipmapped";
break;
case InterpolationMode.AnisotropicFiltering:
t = "anisotropicFiltering";
break;
default:
t = "bilinearMipmapped";
break;
}

Builder.AppendLine("interpolation = " + t);
}
Builder.AppendLine("interpolation = " + Interpolation);
Builder.AppendLine("anisotropicFilteringLevel = " + AnisotropicFilteringLevel.ToString(Culture));
Builder.AppendLine("anisotropicFilteringMaximum = " + AnisotropicFilteringMaximum.ToString(Culture));
Builder.AppendLine("antiAliasingLevel = " + AntiAliasingLevel.ToString(Culture));
Builder.AppendLine("transparencyMode = " + ((int)TransparencyMode).ToString(Culture));
Builder.AppendLine("oldtransparencymode = " + (OldTransparencyMode ? "true" : "false"));
Builder.AppendLine("viewingDistance = " + ViewingDistance.ToString(Culture));
Builder.AppendLine("quadLeafSize = " + QuadTreeLeafSize.ToString(Culture));
{
string t;
switch (MotionBlur)
{
case MotionBlurMode.Low:
t = "low";
break;
case MotionBlurMode.Medium:
t = "medium";
break;
case MotionBlurMode.High:
t = "high";
break;
default:
t = "none";
break;
}

Builder.AppendLine("motionBlur = " + t);
}
Builder.AppendLine("motionBlur = " + MotionBlur);
Builder.AppendLine("fpslimit = " + FPSLimit.ToString(Culture));
Builder.AppendLine();
Builder.AppendLine("[objectOptimization]");
Expand Down Expand Up @@ -420,54 +351,12 @@ public override void Save(string fileName)
Builder.AppendLine("raildrivermph = " + (RailDriverMPH ? "true" : "false"));
Builder.AppendLine();
Builder.AppendLine("[sound]");
Builder.Append("model = ");
switch (SoundModel)
{
case SoundModels.Linear:
Builder.AppendLine("linear");
break;
default:
Builder.AppendLine("inverse");
break;
}

Builder.Append("range = ");
switch (SoundRange)
{
case SoundRange.Low:
Builder.AppendLine("low");
break;
case SoundRange.Medium:
Builder.AppendLine("medium");
break;
case SoundRange.High:
Builder.AppendLine("high");
break;
default:
Builder.AppendLine("low");
break;
}

Builder.Append("model = " + SoundModel);
Builder.Append("range = " + SoundRange);
Builder.AppendLine("number = " + SoundNumber.ToString(Culture));
Builder.AppendLine();
Builder.AppendLine("[packages]");
Builder.Append("compression = ");
switch (packageCompressionType)
{
case CompressionType.Zip:
Builder.AppendLine("zip");
break;
case CompressionType.TarGZ:
Builder.AppendLine("gzip");
break;
case CompressionType.BZ2:
Builder.AppendLine("bzip");
break;
default:
Builder.AppendLine("zip");
break;
}

Builder.Append("compression = " + packageCompressionType);
Builder.AppendLine();
Builder.AppendLine("[folders]");
Builder.AppendLine("route = " + RouteFolder);
Expand Down
2 changes: 1 addition & 1 deletion source/Plugins/Formats.OpenBve/CFG/ConfigFile.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@ public override bool GetEnumValue<T3>(T2 key, out T3 enumValue)
{
if (keyValuePairs.TryGetValue(key, out var value))
{
if (Enum.TryParse(value.Value, out enumValue))
if (Enum.TryParse(value.Value, true, out enumValue))
{
return true;
}
Expand Down
14 changes: 1 addition & 13 deletions source/RouteViewer/Options.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,19 +44,7 @@ public override void Save(string fileName)
Builder.AppendLine("quadleafsize = " + QuadTreeLeafSize);
Builder.AppendLine();
Builder.AppendLine("[quality]");
{
string t; switch (Interpolation)
{
case InterpolationMode.NearestNeighbor: t = "nearestNeighbor"; break;
case InterpolationMode.Bilinear: t = "bilinear"; break;
case InterpolationMode.NearestNeighborMipmapped: t = "nearestNeighborMipmapped"; break;
case InterpolationMode.BilinearMipmapped: t = "bilinearMipmapped"; break;
case InterpolationMode.TrilinearMipmapped: t = "trilinearMipmapped"; break;
case InterpolationMode.AnisotropicFiltering: t = "anisotropicFiltering"; break;
default: t = "bilinearMipmapped"; break;
}
Builder.AppendLine("interpolation = " + t);
}
Builder.AppendLine("interpolation = " + Interpolation);
Builder.AppendLine("anisotropicfilteringlevel = " + AnisotropicFilteringLevel.ToString(Culture));
Builder.AppendLine("antialiasinglevel = " + AntiAliasingLevel.ToString(Culture));
Builder.AppendLine("transparencyMode = " + ((int)TransparencyMode).ToString(Culture));
Expand Down

0 comments on commit d2b81d3

Please sign in to comment.