195 Commits

• Fix distance snap grid being used before it's ready for use

  Closes https://github.com/ppy/osu/issues/32136.
  
  `DistanceSnapGrid.MaxIntervals` is written to in
  
  	https://github.com/ppy/osu/blob/a360f153f73255d6f78148da17edf2c348af4e94/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs#L107-L110
  
  which gets run the first time on `LoadComplete()`:
  
  	https://github.com/ppy/osu/blob/a360f153f73255d6f78148da17edf2c348af4e94/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs#L96-L97
  
  meaning it is not valid to attempt to use the grid to snap before it's
  loaded, which does actually appear to occur sometimes before this
  change.

  Bartłomiej Dach · 2025-05-13 11:00:41 +02:00
  a09d5468c7
• Discard distance snapping result if it results in objects being placed out of playfield bounds

  Mainly an issue with "limit distance snap to current time". Reported in
  https://discord.com/channels/90072389919997952/1259818301517725707/1369037235797753999.
  
  This slightly changes behaviour of distance snap when the mouse is near
  the edges of the screen (will turn off snap rather than clamp to edge as
  previously), but I think that's probably fine.

  Bartłomiej Dach · 2025-05-07 14:23:35 +02:00
  9c40344c9e
• Add explanation of why the logic is in such a bad place
  Dean Herbert · 2025-03-12 16:56:16 +09:00
  c2de43f677
• Fix new combo being toggled when selection is made
  Dean Herbert · 2025-03-12 16:52:51 +09:00
  6a7a834151
• Add back right-click-for-new-combo and right-click-delete when in compose mode

  Requested too many times to count.
  
  I'm not sure what to do about the code quality of this. It's a bit weird
  that there's no way to check the current composition tool from a higher
  level.
  
  Also it was discussed IRL that there should be some kind of hinting that
  existing notes will be deleted when they are hovered, but I'm not sure
  how well this will work in normal mapping flows, since it will display
  even in cases that users aren't intending to delete an object. Still
  willing to explore this direction though (it's just non-trivial to
  implement so I haven't yet).

  Dean Herbert · 2025-02-26 17:52:33 +09:00
  2738c1a807
• Fix code quality
  Bartłomiej Dach · 2025-02-03 15:18:03 +01:00
  2d6f64e891
• Refactor IDistanceSnapProvider to accept slider velocity objects as a reference

  Method signatures are also changed to be a lot more explicit as to what
  inputs they expect.

  Bartłomiej Dach · 2025-02-03 14:00:57 +01:00
  a1185df2eb
• Avoid moving already placed objects temporally when "limit distance snap to current time" is active
  Bartłomiej Dach · 2025-01-31 09:51:13 +01:00
  8718483c70
• Fix distance snap time part ceasing to work when grid snap is also active

  As pointed out in
  https://github.com/ppy/osu/pull/31655#discussion_r1935536934.

  Bartłomiej Dach · 2025-01-30 14:42:44 +01:00
  261a7e537b
• Fix behavioural change in interaction between grid & distance snap
  Bartłomiej Dach · 2025-01-24 13:14:26 +01:00
  b04144df54
• Simplify code
  Bartłomiej Dach · 2025-01-24 13:14:06 +01:00
  589035c534
• Fix tests
  Bartłomiej Dach · 2025-01-24 11:59:07 +01:00
  269ade178e
• Remove dependence of placement blueprints on IPositionSnapProvider
  Bartłomiej Dach · 2025-01-24 11:59:07 +01:00
  a6987f5c95
• Remove dependence of blueprint containers on IPositionSnapProvider
  Bartłomiej Dach · 2025-01-24 11:59:05 +01:00
  15b6e28ebe
• Remove redundant ToArray() calls in Osu/ManiaHitObjectComposer
  Berkan Diler · 2025-01-19 23:27:44 +01:00
  b6ce72b6d9
• Add combo colour override control to editor

  Closes https://github.com/ppy/osu/issues/25608.
  
  Logic mostly matching stable. All operations are done on `ComboOffset`
  which still makes overridden combo colours weirdly relatively dependent
  on each other rather than them be an "absolute" choice, but alas...
  
  As per stable, two consecutive new combos can use the same colour only
  if they are separated by a break:
  
      https://github.com/peppy/osu-stable-reference/blob/52f3f75ed7efd7b9eb56e1e45c95bb91504337be/osu!/GameModes/Edit/Modes/EditorModeCompose.cs#L4564-L4571
  
  This control is only available once the user has changed the combo
  colours from defaults; additionally, only a single new combo object
  must be selected for the colour selector to show up.

  Bartłomiej Dach · 2025-01-10 13:40:56 +01:00
  48196949e0
• Simplify editor "ternary button" structure

  As I look into re-implementing the ability to choose combo colour for an
  object (also known as "colourhax") from the editor UI, I stumble upon
  these wretched ternary items again and sigh a deep sigh of annoyance.
  
  The structure is overly rigid. `TernaryItem` does nothing that
  `DrawableTernaryItem` couldn't, except make it more annoying to add
  specific sub-variants of `DrawableTernaryItem` that could do more
  things.
  
  Yes you could sprinkle more levels of virtuals to
  `CreateDrawableButton()` or something, but after all, as Saint Exupéry
  says, "perfection is finally attained not when there is no longer
  anything to add, but when there is no longer anything to take away."
  So I'm leaning for taking one step towards perfection.

  Bartłomiej Dach · 2025-01-09 13:41:22 +01:00
  5c8ae6f851
• move grid placement tool to left toolbox
  OliBomby · 2024-10-07 12:04:14 +02:00
  7b998219d7
• Merge remote-tracking branch 'upstream/master' into grids-4
  OliBomby · 2024-10-01 15:43:54 +02:00
  f8397cccc7
• return grid placement tool to right toolbox
  OliBomby · 2024-09-28 17:04:11 +02:00
  1c6e42671a
• Merge pull request #29949 from minetoblend/feature/scale-around-center

  Support scaling around center when scaling with select box

  Dean Herbert · 2024-09-28 21:37:39 +09:00
  c46d787f1e
• Refactor PlacementBlueprint to not be hitobject specific
  OliBomby · 2024-09-24 20:31:00 +02:00
  e3b4483872
• Convert 'grid from points' button to placement tool
  OliBomby · 2024-09-23 16:36:45 +02:00
  0a5a463380
• Refactor PlacementBlueprint to not be hitobject specific
  OliBomby · 2024-09-23 16:33:36 +02:00
  1a81e12192
• Prevent the distance snap grid from being activated by alt key while dragging select box handle
  Marvin Schürz · 2024-09-21 14:22:17 +02:00
  3180468db1
• Merge remote-tracking branch 'upstream/master' into grids-4
  OliBomby · 2024-09-19 20:06:47 +02:00
  e3aeaf6d85
• Merge branch 'master' into grids-3
  Dean Herbert · 2024-09-19 18:21:05 +09:00
  188a430418
• Make grid/distance snap binds T/Y respectively
  Dan Balasescu · 2024-08-20 12:15:33 +09:00
  86c3c115f6
• Merge branch 'master' into polygon-tool
  Dean Herbert · 2024-08-19 13:54:02 +09:00
  7248c04ba4
• Fix typo in editor field
  Dean Herbert · 2024-08-19 13:49:59 +09:00
  95d06333c1
• Merge branch 'master' into polygon-tool
  Dean Herbert · 2024-08-19 13:00:02 +09:00
  f34132fd6b
• Merge branch 'master' into grids-3
  Bartłomiej Dach · 2024-08-12 13:55:35 +02:00
  06c2952fe8
• Snap to stack in osu! composer when dragging to any of the items on it

  Previously it would be required to drag to the starting position of the
  stack which feels weird.

  Bartłomiej Dach · 2024-07-09 13:58:58 +02:00
  9cc0e0137b
• Merge remote-tracking branch 'upstream/master' into grids-3
  OliBomby · 2024-07-03 12:25:57 +02:00
  c285744509
• Merge branch 'master' into grids-2
  Bartłomiej Dach · 2024-07-03 10:57:05 +02:00
  17ce9cd162
• Update HasFlag usages
  Dean Herbert · 2024-07-03 00:19:04 +09:00
  5350945340
• Fix distance snap control being removed
  Dean Herbert · 2024-06-27 23:59:38 +09:00
  fd6b77ea92
• Remove redundant array spec
  Dean Herbert · 2024-06-27 22:19:06 +09:00
  b293eb7930
• Show distance in pixels to previous/next object in osu! hitobject inspector
  Bartłomiej Dach · 2024-06-27 14:46:57 +02:00
  1b741dada3
• Fix exception type

  Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>

  Olivier Schipper · 2024-06-20 17:27:38 +02:00
  4c6741e8aa
• Reimplement stable polygon tool

  Addresses https://github.com/ppy/osu/discussions/19970.
  
  While yes, https://github.com/ppy/osu/pull/26303 is also a thing,
  in discussing with users I don't think that grids are going to be able
  to deprecate this feature.
  
  Logic transcribed verbatim from stable.

  Bartłomiej Dach · 2024-06-20 16:29:46 +02:00
  225b309ba3
• Merge remote-tracking branch 'upstream/master' into grids-2
  OliBomby · 2024-06-05 17:18:48 +02:00
  d8994786f6
• Merge branch 'master' into grids-1
  Bartłomiej Dach · 2024-06-03 12:33:51 +02:00
  4fcb902341
• refactor CanScaleFromPlayfieldOrigin and GetClampedScale to derived class
  OliBomby · 2024-05-28 17:12:16 +02:00
  d143a697d2
• Add simple scale tool
  OliBomby · 2024-05-25 18:31:19 +02:00
  6aa92bcc45
• Merge branch 'master' into grids-1
  Bartłomiej Dach · 2024-05-24 14:39:55 +02:00
  9f19ab092d
• Use ArgumentOutOfRangeException throw helper methods
  Berkan Diler · 2024-03-05 10:20:30 +01:00
  a891303484
• move GridFromPointsClicked handler creation code
  OliBomby · 2024-01-01 16:12:28 +01:00
  b54c9a36fe
• improve grid from points tool code
  OliBomby · 2024-01-01 16:12:28 +01:00
  98505d0bba
• Rotate popover rotates around grid center
  OliBomby · 2024-01-01 15:51:55 +01:00
  078fe5a78c