Save grid settings to beatmap via IBeatmap

osu.Game.Rulesets.Osu/Edit/OsuGridToolboxGroup.cs

@@ -19,6 +19,7 @@
 using osu.Game.Screens.Edit.Components.RadioButtons;
 using osuTK;
 using osuTK.Graphics;
+using Vortice.DXGI;
 
 namespace osu.Game.Rulesets.Osu.Edit
 {
@@ -149,7 +150,30 @@ private void load()
  },
  };
 
- Spacing.Value = editorBeatmap.BeatmapInfo.GridSize;
+ Spacing.Value = editorBeatmap.GridSize;
+ GridLinesRotation.Value = editorBeatmap.GridRotation;
+ if (editorBeatmap.GridStartPositionX != 0)
+ {
+ StartPositionX.Value = editorBeatmap.GridStartPositionX;
+ }
+ if (editorBeatmap.GridStartPositionY != 0)
+ {
+ StartPositionY.Value = editorBeatmap.GridStartPositionY;
+ }
+
+ switch (editorBeatmap.GridType)
+ {
+ case "Square":
+ GridType.Value = PositionSnapGridType.Square;
+ break;
+ case "Triangle":
+ GridType.Value = PositionSnapGridType.Triangle;
+ break;
+ case "Circle":
+ GridType.Value = PositionSnapGridType.Circle;
+ break;
+ }
+
  }
 
  protected override void LoadComplete()
@@ -163,27 +187,30 @@ protected override void LoadComplete()
  startPositionXSlider.ContractedLabelText = $"X: {x.NewValue:N0}";
  startPositionXSlider.ExpandedLabelText = $"X Offset: {x.NewValue:N0}";
  StartPosition.Value = new Vector2(x.NewValue, StartPosition.Value.Y);
+ editorBeatmap.GridStartPositionX = (int)x.NewValue;
  }, true);
 
  StartPositionY.BindValueChanged(y =>
  {
  startPositionYSlider.ContractedLabelText = $"Y: {y.NewValue:N0}";
  startPositionYSlider.ExpandedLabelText = $"Y Offset: {y.NewValue:N0}";
  StartPosition.Value = new Vector2(StartPosition.Value.X, y.NewValue);
+ editorBeatmap.GridStartPositionY = (int)y.NewValue;
  }, true);
 
  Spacing.BindValueChanged(spacing =>
  {
  spacingSlider.ContractedLabelText = $"S: {spacing.NewValue:N0}";
  spacingSlider.ExpandedLabelText = $"Spacing: {spacing.NewValue:N0}";
  SpacingVector.Value = new Vector2(spacing.NewValue);
- editorBeatmap.BeatmapInfo.GridSize = (int)spacing.NewValue;
+ editorBeatmap.GridSize = (int)spacing.NewValue;
  }, true);
 
  GridLinesRotation.BindValueChanged(rotation =>
  {
  gridLinesRotationSlider.ContractedLabelText = $"R: {rotation.NewValue:#,0.##}";
  gridLinesRotationSlider.ExpandedLabelText = $"Rotation: {rotation.NewValue:#,0.##}";
+ editorBeatmap.GridRotation = (int)rotation.NewValue;
  }, true);
 
  expandingContainer?.Expanded.BindValueChanged(v =>
@@ -202,12 +229,18 @@ protected override void LoadComplete()
  GridLinesRotation.Value = ((GridLinesRotation.Value + 405) % 90) - 45;
  GridLinesRotation.MinValue = -45;
  GridLinesRotation.MaxValue = 45;
+ editorBeatmap.GridType = "Square";
  break;
 
  case PositionSnapGridType.Triangle:
  GridLinesRotation.Value = ((GridLinesRotation.Value + 390) % 60) - 30;
  GridLinesRotation.MinValue = -30;
  GridLinesRotation.MaxValue = 30;
+ editorBeatmap.GridType = "Triangle";
+ break;
+
+ case PositionSnapGridType.Circle:
+ editorBeatmap.GridType = "Circle";
  break;
  }
  }, true);

osu.Game/Beatmaps/Beatmap.cs

@@ -115,6 +115,12 @@ public double GetMostCommonBeatLength()
  return mostCommon.beatLength;
  }
 
+ public int GridSize { get; set; }
+ public int GridRotation { get; set; }
+ public int GridStartPositionX { get; set; }
+ public int GridStartPositionY { get; set; }
+ public string GridType { get; set; }
+
  IBeatmap IBeatmap.Clone() => Clone();
 
  public Beatmap<T> Clone() => (Beatmap<T>)MemberwiseClone();

osu.Game/Beatmaps/BeatmapConverter.cs

@@ -73,6 +73,11 @@ protected virtual Beatmap<T> ConvertBeatmap(IBeatmap original, CancellationToken
  beatmap.HitObjects = convertHitObjects(original.HitObjects, original, cancellationToken).OrderBy(s => s.StartTime).ToList();
  beatmap.Breaks = original.Breaks;
  beatmap.UnhandledEventLines = original.UnhandledEventLines;
+ beatmap.GridSize = original.GridSize;
+ beatmap.GridRotation = original.GridRotation;
+ beatmap.GridStartPositionX = original.GridStartPositionX;
+ beatmap.GridStartPositionY = original.GridStartPositionY;
+ beatmap.GridType = original.GridType;
 
  return beatmap;
  }

osu.Game/Beatmaps/BeatmapImporter.cs

@@ -426,7 +426,6 @@ private List<BeatmapInfo> createBeatmapDifficulties(BeatmapSetInfo beatmapSet, R
  SamplesMatchPlaybackRate = decodedInfo.SamplesMatchPlaybackRate,
  DistanceSpacing = decodedInfo.DistanceSpacing,
  BeatDivisor = decodedInfo.BeatDivisor,
- GridSize = decodedInfo.GridSize,
  TimelineZoom = decodedInfo.TimelineZoom,
  MD5Hash = memoryStream.ComputeMD5Hash(),
  EndTimeObjectCount = decoded.HitObjects.Count(h => h is IHasDuration),

osu.Game/Beatmaps/BeatmapInfo.cs

@@ -171,8 +171,6 @@ public void ResetOnlineInfo()
 
  public int BeatDivisor { get; set; } = 4;
 
- public int GridSize { get; set; }
-
  public double TimelineZoom { get; set; } = 1.0;
 
  /// <summary>

osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs

@@ -340,7 +340,23 @@ private void handleEditor(string line)
  break;
 
  case @"GridSize":
- beatmap.BeatmapInfo.GridSize = Parsing.ParseInt(pair.Value);
+ beatmap.GridSize = Parsing.ParseInt(pair.Value);
+ break;
+
+ case @"GridRotation":
+ beatmap.GridRotation = Parsing.ParseInt(pair.Value);
+ break;
+
+ case @"GridStartPositionX":
+ beatmap.GridStartPositionX = Parsing.ParseInt(pair.Value);
+ break;
+
+ case @"GridStartPositionY":
+ beatmap.GridStartPositionY = Parsing.ParseInt(pair.Value);
+ break;
+
+ case @"GridType":
+ beatmap.GridType = pair.Value;
  break;
 
  case @"TimelineZoom":

osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs

@@ -114,8 +114,13 @@ private void handleEditor(TextWriter writer)
  writer.WriteLine(FormattableString.Invariant($"Bookmarks: {string.Join(',', beatmap.BeatmapInfo.Bookmarks)}"));
  writer.WriteLine(FormattableString.Invariant($"DistanceSpacing: {beatmap.BeatmapInfo.DistanceSpacing}"));
  writer.WriteLine(FormattableString.Invariant($"BeatDivisor: {beatmap.BeatmapInfo.BeatDivisor}"));
- writer.WriteLine(FormattableString.Invariant($"GridSize: {beatmap.BeatmapInfo.GridSize}"));
+ writer.WriteLine(FormattableString.Invariant($"GridSize: {beatmap.GridSize}"));
+ writer.WriteLine(FormattableString.Invariant($"GridRotation: {beatmap.GridRotation}"));
+ writer.WriteLine(FormattableString.Invariant($"GridStartPositionX: {beatmap.GridStartPositionX}"));
+ writer.WriteLine(FormattableString.Invariant($"GridStartPositionY: {beatmap.GridStartPositionY}"));
+ writer.WriteLine(FormattableString.Invariant($"GridType: {beatmap.GridType}"));
  writer.WriteLine(FormattableString.Invariant($"TimelineZoom: {beatmap.BeatmapInfo.TimelineZoom}"));
+
  }
 
  private void handleMetadata(TextWriter writer)

osu.Game/Beatmaps/IBeatmap.cs

@@ -74,6 +74,15 @@ public interface IBeatmap
  /// </summary>
  /// <returns>The shallow-cloned beatmap.</returns>
  IBeatmap Clone();
+
+ /// <summary>
+ /// Grid settings for the beatmap
+ /// </summary>
+ public int GridSize { get; set; }
+ public int GridRotation { get; set; }
+ public int GridStartPositionX { get; set; }
+ public int GridStartPositionY { get; set; }
+ public string GridType { get; set; }
  }
 
  /// <summary>

osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs

@@ -341,6 +341,12 @@ public SortedList<BreakPeriod> Breaks
  public double GetMostCommonBeatLength() => baseBeatmap.GetMostCommonBeatLength();
  public IBeatmap Clone() => new ProgressiveCalculationBeatmap(baseBeatmap.Clone());
 
+ public int GridSize { get; set; }
+ public int GridRotation { get; set; }
+ public int GridStartPositionX { get; set; }
+ public int GridStartPositionY { get; set; }
+ public string GridType { get; set; }
+
  #endregion
  }
  }

osu.Game/Screens/Edit/EditorBeatmap.cs

@@ -89,6 +89,32 @@ public partial class EditorBeatmap : TransactionalCommitComponent, IBeatmap, IBe
 
  public BindableInt PreviewTime { get; }
 
+ public int GridSize
+ {
+ get => PlayableBeatmap.GridSize;
+ set => PlayableBeatmap.GridSize = value;
+ }
+ public int GridRotation
+ {
+ get => PlayableBeatmap.GridRotation;
+ set => PlayableBeatmap.GridRotation = value;
+ }
+ public int GridStartPositionX
+ {
+ get => PlayableBeatmap.GridStartPositionX;
+ set => PlayableBeatmap.GridStartPositionX = value;
+ }
+ public int GridStartPositionY
+ {
+ get => PlayableBeatmap.GridStartPositionY;
+ set => PlayableBeatmap.GridStartPositionY = value;
+ }
+ public string GridType
+ {
+ get => PlayableBeatmap.GridType;
+ set => PlayableBeatmap.GridType = value;
+ }
+
  private readonly IBeatmapProcessor beatmapProcessor;
 
  private readonly Dictionary<HitObject, Bindable<double>> startTimeBindables = new Dictionary<HitObject, Bindable<double>>();