AstralTransRocketries/TrueCraft
Archived
1
0
Fork 0
Code Issues 48 Pull Requests 1 Packages Projects Releases Wiki Activity

Fix font loader on case sensitive filesystems

Browse Source
This commit is contained in:
Drew DeVault 2015-06-16 22:22:40 -06:00
parent 2ae26f1519
commit 8848697656
8 changed files with 36 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
TrueCraft.Client/Content/Fonts/dejavu_bold.fnt → TrueCraft.Client/Content/Fonts/DejaVu_Bold.fnt
View File

0
TrueCraft.Client/Content/Fonts/dejavu_bold_0.png → TrueCraft.Client/Content/Fonts/DejaVu_Bold_0.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

0
TrueCraft.Client/Content/Fonts/dejavu_italic.fnt → TrueCraft.Client/Content/Fonts/DejaVu_Italic.fnt
View File

0
TrueCraft.Client/Content/Fonts/dejavu_italic_0.png → TrueCraft.Client/Content/Fonts/DejaVu_Italic_0.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

0
TrueCraft.Client/Content/Fonts/dejavu_regular.fnt → TrueCraft.Client/Content/Fonts/DejaVu_Regular.fnt
View File

0
TrueCraft.Client/Content/Fonts/dejavu_regular_0.png → TrueCraft.Client/Content/Fonts/DejaVu_Regular_0.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

4
TrueCraft.Client/Rendering/Font.cs
View File

@ -69,7 +69,7 @@ namespace TrueCraft.Client.Rendering
/// <param name="contentManager"></param> /// <param name="contentManager"></param>
private void LoadContent(ContentManager contentManager) private void LoadContent(ContentManager contentManager)
{ {
var definitionPath = string.Format("{0}_{1}.fnt", Name.ToLowerInvariant(), Style.ToString().ToLowerInvariant()); var definitionPath = string.Format("{0}_{1}.fnt", Name, Style);
using (var contents = File.OpenRead(Path.Combine(contentManager.RootDirectory, definitionPath))) using (var contents = File.OpenRead(Path.Combine(contentManager.RootDirectory, definitionPath)))
_definition = FontLoader.Load(contents); _definition = FontLoader.Load(contents);
@ -77,7 +77,7 @@ namespace TrueCraft.Client.Rendering
_textures = new Texture2D[_definition.Pages.Count]; _textures = new Texture2D[_definition.Pages.Count];
for (int i = 0; i < _definition.Pages.Count; i++) for (int i = 0; i < _definition.Pages.Count; i++)
{ {
var texturePath = string.Format("{0}_{1}_{2}.png", Name.ToLowerInvariant(), Style.ToString().ToLowerInvariant(), i.ToString()); var texturePath = string.Format("{0}_{1}_{2}.png", Name, Style, i);
_textures[i] = contentManager.Load<Texture2D>(texturePath); _textures[i] = contentManager.Load<Texture2D>(texturePath);
} }
} }

78
TrueCraft.Client/TrueCraft.Client.csproj
View File

@ -64,38 +64,28 @@
<PlatformTarget>x86</PlatformTarget> <PlatformTarget>x86</PlatformTarget>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition=" '$(OS)' == 'Unix' "> <ItemGroup Condition=" '$(OS)' == 'Unix' ">
<Reference Include="MonoGame.Framework, Version=3.4.0.459, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="MonoGame.Framework, Version=3.4.0.459, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\MonoGame.Framework.Linux.3.4.0.459\lib\net40\MonoGame.Framework.dll</HintPath> <HintPath>..\packages\MonoGame.Framework.Linux.3.4.0.459\lib\net40\MonoGame.Framework.dll</HintPath>
<Private>True</Private> </Reference>
<Reference Include="Ionic.Zip.Reduced">
<HintPath>..\lib\Ionic.Zip.Reduced.dll</HintPath>
</Reference>
<Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4">
<HintPath>..\packages\MonoGame.Framework.Linux.3.4.0.459\lib\net40\OpenTK.dll</HintPath>
</Reference>
<Reference Include="Tao.Sdl, Version=1.2.13.0, Culture=neutral, PublicKeyToken=9c7a200e36c0094e">
<HintPath>..\packages\MonoGame.Framework.Linux.3.4.0.459\lib\net40\Tao.Sdl.dll</HintPath>
</Reference>
<Reference Include="MonoGame.Framework">
<HintPath>..\packages\MonoGame.Framework.WindowsGL.3.4.0.459\lib\net40\MonoGame.Framework.dll</HintPath>
</Reference>
<Reference Include="OpenTK">
<HintPath>..\packages\MonoGame.Framework.WindowsGL.3.4.0.459\lib\net40\OpenTK.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Ionic.Zip.Reduced, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\lib\Ionic.Zip.Reduced.dll</HintPath>
</Reference>
<Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
<HintPath>..\packages\MonoGame.Framework.Linux.3.4.0.459\lib\net40\OpenTK.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="Tao.Sdl, Version=1.2.13.0, Culture=neutral, PublicKeyToken=9c7a200e36c0094e, processorArchitecture=MSIL">
<HintPath>..\packages\MonoGame.Framework.Linux.3.4.0.459\lib\net40\Tao.Sdl.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
<Reference Include="MonoGame.Framework, Version=3.4.0.459, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\MonoGame.Framework.WindowsGL.3.4.0.459\lib\net40\MonoGame.Framework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\MonoGame.Framework.WindowsGL.3.4.0.459\lib\net40\OpenTK.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Input\KeyboardComponent.cs" /> <Compile Include="Input\KeyboardComponent.cs" />
@ -171,15 +161,6 @@
<ItemGroup /> <ItemGroup />
<ItemGroup /> <ItemGroup />
<ItemGroup> <ItemGroup>
<Content Include="Content\Fonts\dejavu_bold_0.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Fonts\dejavu_italic_0.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Fonts\dejavu_regular_0.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\items.png"> <Content Include="Content\items.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
@ -192,15 +173,6 @@
<Content Include="Content\terrain.png"> <Content Include="Content\terrain.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<None Include="Content\Fonts\dejavu_bold.fnt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Fonts\dejavu_italic.fnt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Fonts\dejavu_regular.fnt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="OpenTK.dll.config"> <None Include="OpenTK.dll.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
@ -208,5 +180,23 @@
<None Include="Tao.Sdl.dll.config"> <None Include="Tao.Sdl.dll.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
<Content Include="Content\Fonts\DejaVu_Bold_0.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<None Include="Content\Fonts\DejaVu_Bold.fnt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Fonts\DejaVu_Italic.fnt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<Content Include="Content\Fonts\DejaVu_Italic_0.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<None Include="Content\Fonts\DejaVu_Regular.fnt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<Content Include="Content\Fonts\DejaVu_Regular_0.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup> </ItemGroup>
</Project> </Project>