sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-06 16:13:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Add correct lookup for WidthForNoteHeightScale

Browse Source
This commit is contained in:
Dean Herbert
2023-02-10 19:18:41 +09:00
parent 5091c50003
commit 635e225d19
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
View File

@ -29,6 +29,8 @@ namespace osu.Game.Skinning
public Dictionary<string, string> ImageLookups = new Dictionary<string, string>(); public Dictionary<string, string> ImageLookups = new Dictionary<string, string>();
public float WidthForNoteHeightScale;
public readonly float[] ColumnLineWidth; public readonly float[] ColumnLineWidth;
public readonly float[] ColumnSpacing; public readonly float[] ColumnSpacing;
public readonly float[] ColumnWidth; public readonly float[] ColumnWidth;

1
osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
View File

@ -54,6 +54,7 @@ namespace osu.Game.Skinning
HoldNoteBodyImage, HoldNoteBodyImage,
HoldNoteLightImage, HoldNoteLightImage,
HoldNoteLightScale, HoldNoteLightScale,
WidthForNoteHeightScale,
ExplosionImage, ExplosionImage,
ExplosionScale, ExplosionScale,
ColumnLineColour, ColumnLineColour,

4
osu.Game/Skinning/LegacyManiaSkinDecoder.cs
View File

@ -115,9 +115,7 @@ namespace osu.Game.Skinning
break; break;
case "WidthForNoteHeightScale": case "WidthForNoteHeightScale":
float minWidth = float.Parse(pair.Value, CultureInfo.InvariantCulture) * LegacyManiaSkinConfiguration.POSITION_SCALE_FACTOR; currentConfig.WidthForNoteHeightScale = (float.Parse(pair.Value, CultureInfo.InvariantCulture)) * LegacyManiaSkinConfiguration.POSITION_SCALE_FACTOR;
if (minWidth > 0)
currentConfig.MinimumColumnWidth = minWidth;
break; break;
case string when pair.Key.StartsWith("Colour", StringComparison.Ordinal): case string when pair.Key.StartsWith("Colour", StringComparison.Ordinal):

4
osu.Game/Skinning/LegacySkin.cs
View File

@ -138,6 +138,10 @@ namespace osu.Game.Skinning
Debug.Assert(maniaLookup.ColumnIndex != null); Debug.Assert(maniaLookup.ColumnIndex != null);
return SkinUtils.As<TValue>(new Bindable<float>(existing.ColumnWidth[maniaLookup.ColumnIndex.Value])); return SkinUtils.As<TValue>(new Bindable<float>(existing.ColumnWidth[maniaLookup.ColumnIndex.Value]));
case LegacyManiaSkinConfigurationLookups.WidthForNoteHeightScale:
Debug.Assert(maniaLookup.ColumnIndex != null);
return SkinUtils.As<TValue>(new Bindable<float>(existing.WidthForNoteHeightScale));
case LegacyManiaSkinConfigurationLookups.ColumnSpacing: case LegacyManiaSkinConfigurationLookups.ColumnSpacing:
Debug.Assert(maniaLookup.ColumnIndex != null); Debug.Assert(maniaLookup.ColumnIndex != null);
return SkinUtils.As<TValue>(new Bindable<float>(existing.ColumnSpacing[maniaLookup.ColumnIndex.Value])); return SkinUtils.As<TValue>(new Bindable<float>(existing.ColumnSpacing[maniaLookup.ColumnIndex.Value]));