mirror of
https://github.com/osukey/osukey.git
synced 2025-07-01 16:29:58 +09:00
Make use of new timing system in Drawables and Transforms.
This commit is contained in:
Submodule osu-framework updated: ed33cc4899...beddb830a2
@ -75,7 +75,9 @@
|
|||||||
<Name>osu.Game.Resources</Name>
|
<Name>osu.Game.Resources</Name>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup />
|
<ItemGroup>
|
||||||
|
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
|
||||||
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="Beatmaps\IO\OszArchiveReaderTest.cs" />
|
<Compile Include="Beatmaps\IO\OszArchiveReaderTest.cs" />
|
||||||
<Compile Include="Beatmaps\IO\ImportBeatmapTest.cs" />
|
<Compile Include="Beatmaps\IO\ImportBeatmapTest.cs" />
|
||||||
@ -86,4 +88,4 @@
|
|||||||
<EmbeddedResource Include="Resources\Soleily - Renatus %28Gamu%29 [Insane].osu" />
|
<EmbeddedResource Include="Resources\Soleily - Renatus %28Gamu%29 [Insane].osu" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||||
</Project>
|
</Project>
|
@ -49,7 +49,7 @@ namespace osu.Game.Beatmaps.Objects
|
|||||||
{
|
{
|
||||||
base.Update();
|
base.Update();
|
||||||
|
|
||||||
if (Time >= HitObject.EndTime && !counted)
|
if (Time.Current >= HitObject.EndTime && !counted)
|
||||||
{
|
{
|
||||||
counted = true;
|
counted = true;
|
||||||
if (state == ArmedState.Armed)
|
if (state == ArmedState.Armed)
|
||||||
|
@ -112,7 +112,7 @@ namespace osu.Game.GameModes.Menu
|
|||||||
icon.ScaleTo(1, 500, EasingTypes.OutElasticHalf);
|
icon.ScaleTo(1, 500, EasingTypes.OutElasticHalf);
|
||||||
|
|
||||||
double offset = 0; //(1 - Game.Audio.SyncBeatProgress) * duration;
|
double offset = 0; //(1 - Game.Audio.SyncBeatProgress) * duration;
|
||||||
double startTime = Time + offset;
|
double startTime = Time.Current + offset;
|
||||||
|
|
||||||
icon.RotateTo(10, offset, EasingTypes.InOutSine);
|
icon.RotateTo(10, offset, EasingTypes.InOutSine);
|
||||||
icon.ScaleTo(new Vector2(1, 0.9f), offset, EasingTypes.Out);
|
icon.ScaleTo(new Vector2(1, 0.9f), offset, EasingTypes.Out);
|
||||||
|
@ -238,8 +238,8 @@ namespace osu.Game.GameModes.Play
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
transform.StartTime = Time;
|
transform.StartTime = Time.Current;
|
||||||
transform.EndTime = Time + getProportionalDuration(currentValue, newValue);
|
transform.EndTime = Time.Current + getProportionalDuration(currentValue, newValue);
|
||||||
transform.StartValue = currentValue;
|
transform.StartValue = currentValue;
|
||||||
transform.EndValue = newValue;
|
transform.EndValue = newValue;
|
||||||
transform.Easing = RollingEasing;
|
transform.Easing = RollingEasing;
|
||||||
@ -253,7 +253,7 @@ namespace osu.Game.GameModes.Play
|
|||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
double time = CurrentTime ?? 0;
|
double time = Time?.Current ?? 0;
|
||||||
if (time < StartTime) return StartValue;
|
if (time < StartTime) return StartValue;
|
||||||
if (time >= EndTime) return EndValue;
|
if (time >= EndTime) return EndValue;
|
||||||
|
|
||||||
|
@ -45,7 +45,7 @@ namespace osu.Game.GameModes.Play
|
|||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
double time = CurrentTime ?? 0;
|
double time = Time?.Current ?? 0;
|
||||||
if (time < StartTime) return StartValue;
|
if (time < StartTime) return StartValue;
|
||||||
if (time >= EndTime) return EndValue;
|
if (time >= EndTime) return EndValue;
|
||||||
|
|
||||||
|
@ -225,8 +225,8 @@ namespace osu.Game.Graphics.UserInterface
|
|||||||
? GetProportionalDuration(currentValue, newValue)
|
? GetProportionalDuration(currentValue, newValue)
|
||||||
: RollingDuration;
|
: RollingDuration;
|
||||||
|
|
||||||
transform.StartTime = Time;
|
transform.StartTime = Time.Current;
|
||||||
transform.EndTime = Time + rollingTotalDuration;
|
transform.EndTime = Time.Current + rollingTotalDuration;
|
||||||
transform.StartValue = currentValue;
|
transform.StartValue = currentValue;
|
||||||
transform.EndValue = newValue;
|
transform.EndValue = newValue;
|
||||||
transform.Easing = RollingEasing;
|
transform.Easing = RollingEasing;
|
||||||
|
@ -60,7 +60,7 @@ namespace osu.Game.Graphics.UserInterface
|
|||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
double time = CurrentTime ?? 0;
|
double time = Time?.Current ?? 0;
|
||||||
if (time < StartTime) return StartValue;
|
if (time < StartTime) return StartValue;
|
||||||
if (time >= EndTime) return EndValue;
|
if (time >= EndTime) return EndValue;
|
||||||
|
|
||||||
|
@ -50,7 +50,7 @@ namespace osu.Game.Graphics.UserInterface
|
|||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
double elapsedTime = Time - transformStartTime;
|
double elapsedTime = Time.Current - transformStartTime;
|
||||||
double expectedElapsedTime = Math.Abs(prevCount - count) * animationDelay;
|
double expectedElapsedTime = Math.Abs(prevCount - count) * animationDelay;
|
||||||
if (elapsedTime >= expectedElapsedTime)
|
if (elapsedTime >= expectedElapsedTime)
|
||||||
return count;
|
return count;
|
||||||
@ -149,7 +149,7 @@ namespace osu.Game.Graphics.UserInterface
|
|||||||
public void StopAnimation()
|
public void StopAnimation()
|
||||||
{
|
{
|
||||||
prevCount = count;
|
prevCount = count;
|
||||||
transformStartTime = Time;
|
transformStartTime = Time.Current;
|
||||||
|
|
||||||
for (int i = 0; i < MaxStars; i++)
|
for (int i = 0; i < MaxStars; i++)
|
||||||
transformStarQuick(i, count);
|
transformStarQuick(i, count);
|
||||||
@ -188,7 +188,7 @@ namespace osu.Game.Graphics.UserInterface
|
|||||||
transformStar(i, newValue);
|
transformStar(i, newValue);
|
||||||
stars[i].DelayReset();
|
stars[i].DelayReset();
|
||||||
}
|
}
|
||||||
transformStartTime = Time;
|
transformStartTime = Time.Current;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -67,21 +67,12 @@ namespace osu.Game.Graphics.UserInterface.Volume
|
|||||||
base.Dispose(isDisposing);
|
base.Dispose(isDisposing);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override bool OnWheelDown(InputState state)
|
protected override bool OnWheel(InputState state)
|
||||||
{
|
{
|
||||||
if (!IsVisible)
|
if (!IsVisible)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
volumeMeterMaster.TriggerWheelDown(state);
|
volumeMeterMaster.TriggerWheel(state);
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override bool OnWheelUp(InputState state)
|
|
||||||
{
|
|
||||||
if (!IsVisible)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
volumeMeterMaster.TriggerWheelUp(state);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -14,13 +14,7 @@ namespace osu.Game.Graphics.UserInterface.Volume
|
|||||||
{
|
{
|
||||||
public Action ActivateRequested;
|
public Action ActivateRequested;
|
||||||
|
|
||||||
protected override bool OnWheelDown(InputState state)
|
protected override bool OnWheel(InputState state)
|
||||||
{
|
|
||||||
ActivateRequested?.Invoke();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override bool OnWheelUp(InputState state)
|
|
||||||
{
|
{
|
||||||
ActivateRequested?.Invoke();
|
ActivateRequested?.Invoke();
|
||||||
return true;
|
return true;
|
||||||
|
@ -73,15 +73,9 @@ namespace osu.Game.Graphics.UserInterface.Volume
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override bool OnWheelUp(InputState state)
|
protected override bool OnWheel(InputState state)
|
||||||
{
|
{
|
||||||
Volume += 0.05f;
|
Volume += 0.05f * state.Mouse.WheelDiff;
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override bool OnWheelDown(InputState state)
|
|
||||||
{
|
|
||||||
Volume -= 0.05f;
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user