sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 07:33:55 +09:00
Code Issues Packages Projects Releases Wiki Activity

Provide ruleset dependencies only to Compose Placement Blueprints

Browse Source
This commit is contained in:
Derrick Timmermans
2022-11-27 21:43:33 +01:00
parent 65e5c9a3ae
commit 70c320b2e8
11 changed files with 60 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
View File

@ -15,11 +15,13 @@ using osu.Framework.Graphics.Sprites;
using osu.Framework.Input.Events;
using osu.Game.Audio;
using osu.Game.Graphics.UserInterface;
using osu.Game.Rulesets;
using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Edit.Tools;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Objects.Types;
using osu.Game.Rulesets.UI;
using osu.Game.Screens.Edit.Components.TernaryButtons;
using osuTK;
using osuTK.Input;
@ -37,15 +39,19 @@ namespace osu.Game.Screens.Edit.Compose.Components
private PlacementBlueprint currentPlacement;
private readonly Ruleset ruleset;
/// <remarks>
/// Positional input must be received outside the container's bounds,
/// in order to handle composer blueprints which are partially offscreen.
/// </remarks>
public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
public ComposeBlueprintContainer(HitObjectComposer composer)
public ComposeBlueprintContainer(HitObjectComposer composer, Ruleset ruleset)
: base(composer)
{
this.ruleset = ruleset;
placementBlueprintContainer = new Container<PlacementBlueprint>
{
RelativeSizeAxes = Axes.Both
@ -57,7 +63,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
{
TernaryStates = CreateTernaryButtons().ToArray();
AddInternal(placementBlueprintContainer);
AddInternal(new DrawableRulesetDependenciesProvidingContainer(ruleset)
{
Child = placementBlueprintContainer
});
}
protected override void LoadComplete()