ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move font resources to Client.Common

This commit is contained in:
YoshiRulz 2021-05-28 18:03:32 +10:00 committed by James Groom
parent 332542c38b
commit 6fa34a6257
6 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/BizHawk.Client.Common/BizHawk.Client.Common.csproj
View File

@ -13,6 +13,7 @@
<PackageReference Include="SharpCompress" Version="0.24.0" /> <PackageReference Include="SharpCompress" Version="0.24.0" />
<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj" /> <ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj" />
<ProjectReference Include="$(ProjectDir)../BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj" /> <ProjectReference Include="$(ProjectDir)../BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj" />
<EmbeddedResource Include="Resources/**/*" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Update="movie/bk2/Bk2Movie.HeaderApi.cs" DependentUpon="Bk2Movie.cs" /> <Compile Update="movie/bk2/Bk2Movie.HeaderApi.cs" DependentUpon="Bk2Movie.cs" />

0
src/BizHawk.Client.EmuHawk/Resources/courier16px.fnt → src/BizHawk.Client.Common/Resources/courier16px.fnt
View File

0
src/BizHawk.Client.EmuHawk/Resources/courier16px_0.png → src/BizHawk.Client.Common/Resources/courier16px_0.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

0
src/BizHawk.Client.EmuHawk/Resources/fceux.ttf → src/BizHawk.Client.Common/Resources/fceux.ttf
View File

0
src/BizHawk.Client.EmuHawk/Resources/gens.ttf → src/BizHawk.Client.Common/Resources/gens.ttf
View File

16
src/BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
View File

@ -85,21 +85,13 @@ namespace BizHawk.Client.EmuHawk
_shaderChainFrugalizers[i] = new RenderTargetFrugalizer(_gl); _shaderChainFrugalizers[i] = new RenderTargetFrugalizer(_gl);
} }
using (var xml = EmuHawk.ReflectionCache.EmbeddedResourceStream("Resources.courier16px.fnt"))
{ {
using var tex = EmuHawk.ReflectionCache.EmbeddedResourceStream("Resources.courier16px_0.png"); using var xml = Client.Common.ReflectionCache.EmbeddedResourceStream("Resources.courier16px.fnt");
using var tex = Client.Common.ReflectionCache.EmbeddedResourceStream("Resources.courier16px_0.png");
_theOneFont = new StringRenderer(_gl, xml, tex); _theOneFont = new StringRenderer(_gl, xml, tex);
} using var gens = Client.Common.ReflectionCache.EmbeddedResourceStream("Resources.gens.ttf");
using (var gens =
EmuHawk.ReflectionCache.EmbeddedResourceStream("Resources.gens.ttf"))
{
LoadCustomFont(gens); LoadCustomFont(gens);
} using var fceux = Client.Common.ReflectionCache.EmbeddedResourceStream("Resources.fceux.ttf");
using (var fceux =
EmuHawk.ReflectionCache.EmbeddedResourceStream("Resources.fceux.ttf"))
{
LoadCustomFont(fceux); LoadCustomFont(fceux);
} }