Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update font package #885

Merged
merged 2 commits into from
Oct 31, 2021
Merged

Update font package #885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8a37bb
Update font package and fix compile error.
andy840119 Oct 31, 2021
b54fcc1
Because change type from List to IList instead in chatacter property,…
andy840119 Oct 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Karaoke.Tests/KaraokeTestBrowser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public class KaraokeTestBrowser : OsuTestBrowser
private void load()
{
// add shader resource from font package.
Resources.AddStore(new NamespacedResourceStore<byte[]>(new FontResourceStore(), "Resources"));
Resources.AddStore(new NamespacedResourceStore<byte[]>(new ShaderResourceStore(), "Resources"));
}
}
}
4 changes: 2 additions & 2 deletions osu.Game.Rulesets.Karaoke/Edit/Lyrics/Rows/Components/EditorLyricPiece.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ public RectangleF GetRubyTagPosition(RubyTag rubyTag)

var startCharacterIndex = Text.Length + skinIndex(Rubies, rubyIndex);
var count = matchedRuby.Text.Length;
var rectangles = Characters.GetRange(startCharacterIndex, count).Select(x => x.DrawRectangle).ToArray();
var rectangles = Characters.ToList().GetRange(startCharacterIndex, count).Select(x => x.DrawRectangle).ToArray();
return RectangleFUtils.Union(rectangles);
}

Expand All @@ -179,7 +179,7 @@ public RectangleF GetRomajiTagPosition(RomajiTag romajiTag)

var startCharacterIndex = Text.Length + skinIndex(Rubies, Rubies.Length) + skinIndex(Romajies, romajiIndex);
var count = matchedRomaji.Text.Length;
var rectangles = Characters.GetRange(startCharacterIndex, count).Select(x => x.DrawRectangle).ToArray();
var rectangles = Characters.ToList().GetRange(startCharacterIndex, count).Select(x => x.DrawRectangle).ToArray();
return RectangleFUtils.Union(rectangles);
}

Expand Down
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Karaoke/KaraokeRuleset.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ public override IResourceStore<byte[]> CreateResourceStore()
store.AddStore(getRulesetStore());

// add shader resource from font package.
store.AddStore(new NamespacedResourceStore<byte[]>(new FontResourceStore(), "Resources"));
store.AddStore(new NamespacedResourceStore<byte[]>(new ShaderResourceStore(), "Resources"));

return store;

Expand Down
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<PackageReference Include="ILRepack.MSBuild.Task" Version="2.0.13" />
<PackageReference Include="LanguageDetection.karaoke-dev" Version="1.3.3-alpha" />
<PackageReference Include="Octokit" Version="0.50.0" />
<PackageReference Include="osu.Framework.KaraokeFont" Version="2021.1027.0" />
<PackageReference Include="osu.Framework.KaraokeFont" Version="2021.1031.0" />
<PackageReference Include="osu.Framework.Microphone" Version="2021.1027.0" />
<PackageReference Include="ppy.osu.Game" Version="2021.1028.0" />
<PackageReference Include="LyricMaker" Version="1.1.1" />
Expand Down