Skip to content
This repository has been archived by the owner on Apr 5, 2021. It is now read-only.

Commit

Permalink
Merge branch 'master' into add-template
Browse files Browse the repository at this point in the history
  • Loading branch information
@peppy
peppy authored Oct 7, 2019
2 parents 56a9d44 + 7ef2142 commit 7b7e829
Show file tree
Hide file tree
Showing 29 changed files with 162 additions and 141 deletions.
25 changes: 25 additions & 0 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Autodetect text files and ensure that we normalise their
# line endings to lf internally. When checked out they may
# use different line endings.
* text=auto

# Check out with crlf (Windows) line endings
*.sln text eol=crlf
*.csproj text eol=crlf
*.cs text diff=csharp eol=crlf
*.resx text eol=crlf
*.vsixmanifest text eol=crlf
packages.config text eol=crlf
App.config text eol=crlf
*.bat text eol=crlf
*.cmd text eol=crlf
*.snippet text eol=crlf
*.manifest text eol=crlf
*.licenseheader text eol=crlf

# Check out with lf (UNIX) line endings
*.sh text eol=lf
.gitignore text eol=lf
.gitattributes text eol=lf
*.md text eol=lf
.travis.yml text eol=lf
0 ...FreeformRuleset.Tests/.vscode/launch.json → ...s.EmptyFreeform.Tests/.vscode/launch.json
View file
File renamed without changes.
0 ...yFreeformRuleset.Tests/.vscode/tasks.json → ...ts.EmptyFreeform.Tests/.vscode/tasks.json
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...FreeformRuleset.Tests/TestSceneOsuGame.cs → ...s.EmptyFreeform.Tests/TestSceneOsuGame.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
using osu.Game.Tests.Visual;
using osuTK.Graphics;

namespace osu.Game.Rulesets.EmptyFreeformRuleset.Tests
namespace osu.Game.Rulesets.EmptyFreeform.Tests
{
public class TestSceneOsuGame : OsuTestScene
{
Expand Down
6 changes: 3 additions & 3 deletions ...eeformRuleset.Tests/TestSceneOsuPlayer.cs → ...EmptyFreeform.Tests/TestSceneOsuPlayer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
using NUnit.Framework;
using osu.Game.Tests.Visual;

namespace osu.Game.Rulesets.EmptyFreeformRuleset.Tests
namespace osu.Game.Rulesets.EmptyFreeform.Tests
{
[TestFixture]
public class TestSceneOsuPlayer : PlayerTestScene
{
public TestSceneOsuPlayer()
: base(new EmptyFreeformRulesetRuleset())
: base(new EmptyFreeformRuleset())
{
}
}
}
}
4 changes: 2 additions & 2 deletions ...FreeformRuleset.Tests/VisualTestRunner.cs → ...s.EmptyFreeform.Tests/VisualTestRunner.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using osu.Framework.Platform;
using osu.Game.Tests;

namespace osu.Game.Rulesets.EmptyFreeformRuleset.Tests
namespace osu.Game.Rulesets.EmptyFreeform.Tests
{
public static class VisualTestRunner
{
Expand All @@ -20,4 +20,4 @@ public static int Main(string[] args)
}
}
}
}
}
6 changes: 3 additions & 3 deletions ...ulesets.EmptyFreeformRuleset.Tests.csproj → ....Game.Rulesets.EmptyFreeform.Tests.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<StartupObject>osu.Game.Rulesets.EmptyFreeformRuleset.Tests.VisualTestRunner</StartupObject>
<StartupObject>osu.Game.Rulesets.EmptyFreeform.Tests.VisualTestRunner</StartupObject>
</PropertyGroup>
<ItemGroup Label="Service">
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
Expand All @@ -16,11 +16,11 @@
<PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\osu.Game.Rulesets.EmptyFreeformRuleset\osu.Game.Rulesets.EmptyFreeformRuleset.csproj"/>
<ProjectReference Include="..\osu.Game.Rulesets.EmptyFreeform\osu.Game.Rulesets.EmptyFreeform.csproj" />
</ItemGroup>
<PropertyGroup Label="Project">
<OutputType>WinExe</OutputType>
<TargetFramework>netcoreapp2.2</TargetFramework>
<RootNamespace>osu.Game.Rulesets.EmptyFreeformRuleset.Tests</RootNamespace>
<RootNamespace>osu.Game.Rulesets.EmptyFreeform.Tests</RootNamespace>
</PropertyGroup>
</Project>
4 changes: 2 additions & 2 deletions ...su.Game.Rulesets.EmptyFreeformRuleset.sln → ...empty/osu.Game.Rulesets.EmptyFreeform.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29123.88
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "osu.Game.Rulesets.EmptyFreeformRuleset", "osu.Game.Rulesets.EmptyFreeformRuleset\osu.Game.Rulesets.EmptyFreeformRuleset.csproj", "{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "osu.Game.Rulesets.EmptyFreeform", "osu.Game.Rulesets.EmptyFreeform\osu.Game.Rulesets.EmptyFreeform.csproj", "{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Rulesets.EmptyFreeformRuleset.Tests", "osu.Game.Rulesets.EmptyFreeformRuleset.Tests\osu.Game.Rulesets.EmptyFreeformRuleset.Tests.csproj", "{B4577C85-CB83-462A-BCE3-22FFEB16311D}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Rulesets.EmptyFreeform.Tests", "osu.Game.Rulesets.EmptyFreeform.Tests\osu.Game.Rulesets.EmptyFreeform.Tests.csproj", "{B4577C85-CB83-462A-BCE3-22FFEB16311D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
6 changes: 3 additions & 3 deletions ...sets.EmptyFreeformRuleset.sln.DotSettings → ...me.Rulesets.EmptyFreeform.sln.DotSettings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadControlBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadDeclarationBracesIndent/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadDeclarationBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadEmptyFreeformRulesetScrollingBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadEmptyFreeformScrollingBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadExpressionBracesIndent/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadExpressionBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadGenericBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
Expand Down Expand Up @@ -120,7 +120,7 @@
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInAttributeList/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInEnumDeclaration/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInInitializer/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantEmptyFreeformRulesetScrollingObjectCreationArgumentList/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantEmptyFreeformScrollingObjectCreationArgumentList/@EntryIndexedValue">WARNING</s:String>

<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantExplicitParamsArrayCreation/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantImmediateDelegateInvocation/@EntryIndexedValue">WARNING</s:String>
Expand Down Expand Up @@ -216,7 +216,7 @@
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002EGlobal/@EntryIndexedValue">HINT</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002ELocal/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=WrongIndentSize/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Code_0020Cleanup_0020_0028peppy_0029/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Code Cleanup (peppy)"&gt;&lt;CSArrangeThisQualifier&gt;True&lt;/CSArrangeThisQualifier&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;CAN_CHANGE_TO_EXPLICIT&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;ALWAYS_EXPLICIT&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_EXPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSUpdateFileHeader&gt;True&lt;/CSUpdateFileHeader&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="False" ArrangeTypeMemberAccessModifier="False" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="False" ArrangeBraces="False" ArrangeAttributes="False" ArrangeArgumentsStyle="False" /&gt;&lt;XAMLCollapseEmptyFreeformRulesetScrollingTags&gt;False&lt;/XAMLCollapseEmptyFreeformRulesetScrollingTags&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;/Profile&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Code_0020Cleanup_0020_0028peppy_0029/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Code Cleanup (peppy)"&gt;&lt;CSArrangeThisQualifier&gt;True&lt;/CSArrangeThisQualifier&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;CAN_CHANGE_TO_EXPLICIT&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;ALWAYS_EXPLICIT&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_EXPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSUpdateFileHeader&gt;True&lt;/CSUpdateFileHeader&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="False" ArrangeTypeMemberAccessModifier="False" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="False" ArrangeBraces="False" ArrangeAttributes="False" ArrangeArgumentsStyle="False" /&gt;&lt;XAMLCollapseEmptyFreeformScrollingTags&gt;False&lt;/XAMLCollapseEmptyFreeformScrollingTags&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;/Profile&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/CodeCleanup/RecentlyUsedProfile/@EntryValue">Code Cleanup (peppy)</s:String>
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/LOCAL_FUNCTION_BODY/@EntryValue">ExpressionBody</s:String>
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/METHOD_OR_OPERATOR_BODY/@EntryValue">ExpressionBody</s:String>
Expand Down
12 changes: 6 additions & 6 deletions ...s/EmptyFreeformRulesetBeatmapConverter.cs → ...Beatmaps/EmptyFreeformBeatmapConverter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
using System;
using System.Collections.Generic;
using osu.Game.Beatmaps;
using osu.Game.Rulesets.EmptyFreeform.Objects;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.EmptyFreeformRuleset.Objects;
using osu.Game.Rulesets.Objects.Types;
using osuTK;

namespace osu.Game.Rulesets.EmptyFreeformRuleset.Beatmaps
namespace osu.Game.Rulesets.EmptyFreeform.Beatmaps
{
public class EmptyFreeformRulesetBeatmapConverter : BeatmapConverter<EmptyFreeformRulesetHitObject>
public class EmptyFreeformBeatmapConverter : BeatmapConverter<EmptyFreeformHitObject>
{
protected override IEnumerable<Type> ValidConversionTypes { get; } = new[]
{
Expand All @@ -20,14 +20,14 @@ public class EmptyFreeformRulesetBeatmapConverter : BeatmapConverter<EmptyFreefo
typeof(IHasPosition)
};

public EmptyFreeformRulesetBeatmapConverter(IBeatmap beatmap)
public EmptyFreeformBeatmapConverter(IBeatmap beatmap)
: base(beatmap)
{
}

protected override IEnumerable<EmptyFreeformRulesetHitObject> ConvertHitObject(HitObject original, IBeatmap beatmap)
protected override IEnumerable<EmptyFreeformHitObject> ConvertHitObject(HitObject original, IBeatmap beatmap)
{
yield return new EmptyFreeformRulesetHitObject
yield return new EmptyFreeformHitObject
{
Samples = original.Samples,
StartTime = original.StartTime,
Expand Down
6 changes: 3 additions & 3 deletions ...ptyFreeformRulesetDifficultyCalculator.cs → ...form/EmptyFreeformDifficultyCalculator.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
using osu.Game.Rulesets.Difficulty.Skills;
using osu.Game.Rulesets.Mods;

namespace osu.Game.Rulesets.EmptyFreeformRuleset
namespace osu.Game.Rulesets.EmptyFreeform
{
public class EmptyFreeformRulesetDifficultyCalculator : DifficultyCalculator
public class EmptyFreeformDifficultyCalculator : DifficultyCalculator
{
public EmptyFreeformRulesetDifficultyCalculator(Ruleset ruleset, WorkingBeatmap beatmap)
public EmptyFreeformDifficultyCalculator(Ruleset ruleset, WorkingBeatmap beatmap)
: base(ruleset, beatmap)
{
}
Expand Down
8 changes: 4 additions & 4 deletions ...leset/EmptyFreeformRulesetInputManager.cs → ...mptyFreeform/EmptyFreeformInputManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
using osu.Framework.Input.Bindings;
using osu.Game.Rulesets.UI;

namespace osu.Game.Rulesets.EmptyFreeformRuleset
namespace osu.Game.Rulesets.EmptyFreeform
{
public class EmptyFreeformRulesetInputManager : RulesetInputManager<EmptyFreeformRulesetAction>
public class EmptyFreeformInputManager : RulesetInputManager<EmptyFreeformAction>
{
public EmptyFreeformRulesetInputManager(RulesetInfo ruleset)
public EmptyFreeformInputManager(RulesetInfo ruleset)
: base(ruleset, 0, SimultaneousBindingMode.Unique)
{
}
}

public enum EmptyFreeformRulesetAction
public enum EmptyFreeformAction
{
[Description("Button 1")]
Button1,
Expand Down
24 changes: 12 additions & 12 deletions ...ormRuleset/EmptyFreeformRulesetRuleset.cs → ...ets.EmptyFreeform/EmptyFreeformRuleset.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,40 +10,40 @@
using osu.Game.Beatmaps;
using osu.Game.Graphics;
using osu.Game.Rulesets.Difficulty;
using osu.Game.Rulesets.EmptyFreeform.Beatmaps;
using osu.Game.Rulesets.EmptyFreeform.Mods;
using osu.Game.Rulesets.EmptyFreeform.UI;
using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.EmptyFreeformRuleset.Beatmaps;
using osu.Game.Rulesets.EmptyFreeformRuleset.Mods;
using osu.Game.Rulesets.EmptyFreeformRuleset.UI;
using osu.Game.Rulesets.UI;
using osuTK;
using osuTK.Graphics;

namespace osu.Game.Rulesets.EmptyFreeformRuleset
namespace osu.Game.Rulesets.EmptyFreeform
{
public class EmptyFreeformRulesetRuleset : Ruleset
public class EmptyFreeformRuleset : Ruleset
{
public EmptyFreeformRulesetRuleset(RulesetInfo rulesetInfo = null)
public EmptyFreeformRuleset(RulesetInfo rulesetInfo = null)
: base(rulesetInfo)
{
}

public override string Description => "a very emptyfreeformruleset ruleset";

public override DrawableRuleset CreateDrawableRulesetWith(IWorkingBeatmap beatmap, IReadOnlyList<Mod> mods) =>
new DrawableEmptyFreeformRulesetRuleset(this, beatmap, mods);
new DrawableEmptyFreeformRuleset(this, beatmap, mods);

public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) =>
new EmptyFreeformRulesetBeatmapConverter(beatmap);
new EmptyFreeformBeatmapConverter(beatmap);

public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) =>
new EmptyFreeformRulesetDifficultyCalculator(this, beatmap);
new EmptyFreeformDifficultyCalculator(this, beatmap);

public override IEnumerable<Mod> GetModsFor(ModType type)
{
switch (type)
{
case ModType.Automation:
return new[] { new EmptyFreeformRulesetModAutoplay() };
return new[] { new EmptyFreeformModAutoplay() };

default:
return new Mod[] { null };
Expand All @@ -54,8 +54,8 @@ public override IEnumerable<Mod> GetModsFor(ModType type)

public override IEnumerable<KeyBinding> GetDefaultKeyBindings(int variant = 0) => new[]
{
new KeyBinding(InputKey.Z, EmptyFreeformRulesetAction.Button1),
new KeyBinding(InputKey.X, EmptyFreeformRulesetAction.Button2),
new KeyBinding(InputKey.Z, EmptyFreeformAction.Button1),
new KeyBinding(InputKey.X, EmptyFreeformAction.Button2),
};

public override Drawable CreateIcon() => new Icon(ShortName[0]);
Expand Down
10 changes: 5 additions & 5 deletions ...t/Mods/EmptyFreeformRulesetModAutoplay.cs → ...Freeform/Mods/EmptyFreeformModAutoplay.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@
// See the LICENCE file in the repository root for full licence text.

using osu.Game.Beatmaps;
using osu.Game.Rulesets.EmptyFreeform.Objects;
using osu.Game.Rulesets.EmptyFreeform.Replays;
using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.EmptyFreeformRuleset.Objects;
using osu.Game.Rulesets.EmptyFreeformRuleset.Replays;
using osu.Game.Scoring;
using osu.Game.Users;

namespace osu.Game.Rulesets.EmptyFreeformRuleset.Mods
namespace osu.Game.Rulesets.EmptyFreeform.Mods
{
public class EmptyFreeformRulesetModAutoplay : ModAutoplay<EmptyFreeformRulesetHitObject>
public class EmptyFreeformModAutoplay : ModAutoplay<EmptyFreeformHitObject>
{
public override Score CreateReplayScore(IBeatmap beatmap) => new Score
{
ScoreInfo = new ScoreInfo
{
User = new User { Username = "sample" },
},
Replay = new EmptyFreeformRulesetAutoGenerator(beatmap).Generate(),
Replay = new EmptyFreeformAutoGenerator(beatmap).Generate(),
};
}
}
6 changes: 3 additions & 3 deletions .../DrawableEmptyFreeformRulesetHitObject.cs → ...awables/DrawableEmptyFreeformHitObject.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
using osuTK;
using osuTK.Graphics;

namespace osu.Game.Rulesets.EmptyFreeformRuleset.Objects.Drawables
namespace osu.Game.Rulesets.EmptyFreeform.Objects.Drawables
{
public class DrawableEmptyFreeformRulesetHitObject : DrawableHitObject<EmptyFreeformRulesetHitObject>
public class DrawableEmptyFreeformHitObject : DrawableHitObject<EmptyFreeformHitObject>
{
public DrawableEmptyFreeformRulesetHitObject(EmptyFreeformRulesetHitObject hitObject)
public DrawableEmptyFreeformHitObject(EmptyFreeformHitObject hitObject)
: base(hitObject)
{
Size = new Vector2(40);
Expand Down
6 changes: 3 additions & 3 deletions .../Objects/EmptyFreeformRulesetHitObject.cs → ...reeform/Objects/EmptyFreeformHitObject.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
using osu.Game.Rulesets.Objects.Types;
using osuTK;

namespace osu.Game.Rulesets.EmptyFreeformRuleset.Objects
namespace osu.Game.Rulesets.EmptyFreeform.Objects
{
public class EmptyFreeformRulesetHitObject : HitObject, IHasPosition
public class EmptyFreeformHitObject : HitObject, IHasPosition
{
public override Judgement CreateJudgement() => new Judgement();

Expand All @@ -17,4 +17,4 @@ public class EmptyFreeformRulesetHitObject : HitObject, IHasPosition
public float X => Position.X;
public float Y => Position.Y;
}
}
}
16 changes: 8 additions & 8 deletions ...lays/EmptyFreeformRulesetAutoGenerator.cs → ...orm/Replays/EmptyFreeformAutoGenerator.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,31 @@
using System.Collections.Generic;
using osu.Game.Beatmaps;
using osu.Game.Replays;
using osu.Game.Rulesets.EmptyFreeformRuleset.Objects;
using osu.Game.Rulesets.EmptyFreeform.Objects;
using osu.Game.Rulesets.Replays;

namespace osu.Game.Rulesets.EmptyFreeformRuleset.Replays
namespace osu.Game.Rulesets.EmptyFreeform.Replays
{
public class EmptyFreeformRulesetAutoGenerator : AutoGenerator
public class EmptyFreeformAutoGenerator : AutoGenerator
{
protected Replay Replay;
protected List<ReplayFrame> Frames => Replay.Frames;

public new Beatmap<EmptyFreeformRulesetHitObject> Beatmap => (Beatmap<EmptyFreeformRulesetHitObject>)base.Beatmap;
public new Beatmap<EmptyFreeformHitObject> Beatmap => (Beatmap<EmptyFreeformHitObject>)base.Beatmap;

public EmptyFreeformRulesetAutoGenerator(IBeatmap beatmap)
public EmptyFreeformAutoGenerator(IBeatmap beatmap)
: base(beatmap)
{
Replay = new Replay();
}

public override Replay Generate()
{
Frames.Add(new EmptyFreeformRulesetReplayFrame());
Frames.Add(new EmptyFreeformReplayFrame());

foreach (EmptyFreeformRulesetHitObject hitObject in Beatmap.HitObjects)
foreach (EmptyFreeformHitObject hitObject in Beatmap.HitObjects)
{
Frames.Add(new EmptyFreeformRulesetReplayFrame
Frames.Add(new EmptyFreeformReplayFrame
{
Time = hitObject.StartTime,
Position = hitObject.Position,
Expand Down
Loading

0 comments on commit 7b7e829

Please sign in to comment.