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

Apply NRT to some storyboard classes

Browse Source
This commit is contained in:
Dean Herbert 2023-04-25 14:28:56 +09:00
parent 36113f60b7
commit 3919400be2
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Storyboards/StoryboardAnimation.cs
View File

@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
#nullable disable
using osuTK; using osuTK;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Game.Storyboards.Drawables; using osu.Game.Storyboards.Drawables;

13
osu.Game/Storyboards/StoryboardSprite.cs
View File

@ -1,12 +1,9 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
#nullable disable
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using JetBrains.Annotations;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Game.Storyboards.Drawables; using osu.Game.Storyboards.Drawables;
using osuTK; using osuTK;
@ -114,7 +111,7 @@ namespace osu.Game.Storyboards
public virtual Drawable CreateDrawable() public virtual Drawable CreateDrawable()
=> new DrawableStoryboardSprite(this); => new DrawableStoryboardSprite(this);
public void ApplyTransforms(Drawable drawable, IEnumerable<Tuple<CommandTimelineGroup, double>> triggeredGroups = null) public void ApplyTransforms(Drawable drawable, IEnumerable<Tuple<CommandTimelineGroup, double>>? triggeredGroups = null)
{ {
// For performance reasons, we need to apply the commands in order by start time. Not doing so will cause many functions to be interleaved, resulting in O(n^2) complexity. // For performance reasons, we need to apply the commands in order by start time. Not doing so will cause many functions to be interleaved, resulting in O(n^2) complexity.
// To achieve this, commands are "generated" as pairs of (command, initFunc, transformFunc) and batched into a contiguous list // To achieve this, commands are "generated" as pairs of (command, initFunc, transformFunc) and batched into a contiguous list
@ -156,7 +153,7 @@ namespace osu.Game.Storyboards
foreach (var command in commands) foreach (var command in commands)
{ {
DrawablePropertyInitializer<T> initFunc = null; DrawablePropertyInitializer<T>? initFunc = null;
if (!initialized) if (!initialized)
{ {
@ -169,7 +166,7 @@ namespace osu.Game.Storyboards
} }
} }
private IEnumerable<CommandTimeline<T>.TypedCommand> getCommands<T>(CommandTimelineSelector<T> timelineSelector, IEnumerable<Tuple<CommandTimelineGroup, double>> triggeredGroups) private IEnumerable<CommandTimeline<T>.TypedCommand> getCommands<T>(CommandTimelineSelector<T> timelineSelector, IEnumerable<Tuple<CommandTimelineGroup, double>>? triggeredGroups)
{ {
var commands = TimelineGroup.GetCommands(timelineSelector); var commands = TimelineGroup.GetCommands(timelineSelector);
foreach (var loop in loops) foreach (var loop in loops)
@ -198,11 +195,11 @@ namespace osu.Game.Storyboards
{ {
public double StartTime => command.StartTime; public double StartTime => command.StartTime;
private readonly DrawablePropertyInitializer<T> initializeProperty; private readonly DrawablePropertyInitializer<T>? initializeProperty;
private readonly DrawableTransformer<T> transform; private readonly DrawableTransformer<T> transform;
private readonly CommandTimeline<T>.TypedCommand command; private readonly CommandTimeline<T>.TypedCommand command;
public GeneratedCommand([NotNull] CommandTimeline<T>.TypedCommand command, [CanBeNull] DrawablePropertyInitializer<T> initializeProperty, [NotNull] DrawableTransformer<T> transform) public GeneratedCommand(CommandTimeline<T>.TypedCommand command, DrawablePropertyInitializer<T>? initializeProperty, DrawableTransformer<T> transform)
{ {
this.command = command; this.command = command;
this.initializeProperty = initializeProperty; this.initializeProperty = initializeProperty;