Skip to content

Commit

Permalink
Merge pull request #212 from bittiez/dev
Browse files Browse the repository at this point in the history
v3.20.0
  • Loading branch information
bittiez committed Feb 1, 2024
2 parents 29e8c93 + 8accb46 commit dad78d7
Show file tree
Hide file tree
Showing 118 changed files with 9,916 additions and 548 deletions.
5 changes: 1 addition & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,4 @@
url = https://github.com/FNA-XNA/FNA.git
[submodule "external/MP3Sharp"]
path = external/MP3Sharp
url = https://github.com/andreakarasho/MP3Sharp.git
[submodule "external/FontStashSharp"]
path = external/FontStashSharp
url = https://github.com/FontStashSharp/FontStashSharp.git
url = https://github.com/andreakarasho/MP3Sharp.git
42 changes: 42 additions & 0 deletions ClassicUO.sln
Original file line number Diff line number Diff line change
Expand Up @@ -79,44 +79,86 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FontStashSharp.FNA.Core", "
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{6F193271-70B3-48EC-9CE5-B8EE1A5CA89E}.Debug|Any CPU.ActiveCfg = Debug|x64
{6F193271-70B3-48EC-9CE5-B8EE1A5CA89E}.Debug|Any CPU.Build.0 = Debug|x64
{6F193271-70B3-48EC-9CE5-B8EE1A5CA89E}.Debug|x64.ActiveCfg = Debug|x64
{6F193271-70B3-48EC-9CE5-B8EE1A5CA89E}.Release|Any CPU.ActiveCfg = Release|x64
{6F193271-70B3-48EC-9CE5-B8EE1A5CA89E}.Release|Any CPU.Build.0 = Release|x64
{6F193271-70B3-48EC-9CE5-B8EE1A5CA89E}.Release|x64.ActiveCfg = Release|x64
{85972CEA-4AB1-45DC-922C-00C4E17764B5}.Debug|Any CPU.ActiveCfg = Debug|x64
{85972CEA-4AB1-45DC-922C-00C4E17764B5}.Debug|Any CPU.Build.0 = Debug|x64
{85972CEA-4AB1-45DC-922C-00C4E17764B5}.Debug|x64.ActiveCfg = Debug|x64
{85972CEA-4AB1-45DC-922C-00C4E17764B5}.Release|Any CPU.ActiveCfg = Release|x64
{85972CEA-4AB1-45DC-922C-00C4E17764B5}.Release|Any CPU.Build.0 = Release|x64
{85972CEA-4AB1-45DC-922C-00C4E17764B5}.Release|x64.ActiveCfg = Release|x64
{3F9AB6CE-3AD1-40B6-B2AA-C4D82F76258F}.Debug|Any CPU.ActiveCfg = Debug|x64
{3F9AB6CE-3AD1-40B6-B2AA-C4D82F76258F}.Debug|Any CPU.Build.0 = Debug|x64
{3F9AB6CE-3AD1-40B6-B2AA-C4D82F76258F}.Debug|x64.ActiveCfg = Debug|x64
{3F9AB6CE-3AD1-40B6-B2AA-C4D82F76258F}.Debug|x64.Build.0 = Debug|x64
{3F9AB6CE-3AD1-40B6-B2AA-C4D82F76258F}.Release|Any CPU.ActiveCfg = Release|x64
{3F9AB6CE-3AD1-40B6-B2AA-C4D82F76258F}.Release|Any CPU.Build.0 = Release|x64
{3F9AB6CE-3AD1-40B6-B2AA-C4D82F76258F}.Release|x64.ActiveCfg = Release|x64
{3F9AB6CE-3AD1-40B6-B2AA-C4D82F76258F}.Release|x64.Build.0 = Release|x64
{D7EE32B0-ED1C-4263-B017-6C3EC74FD731}.Debug|Any CPU.ActiveCfg = Debug|x64
{D7EE32B0-ED1C-4263-B017-6C3EC74FD731}.Debug|Any CPU.Build.0 = Debug|x64
{D7EE32B0-ED1C-4263-B017-6C3EC74FD731}.Debug|x64.ActiveCfg = Debug|x64
{D7EE32B0-ED1C-4263-B017-6C3EC74FD731}.Debug|x64.Build.0 = Debug|x64
{D7EE32B0-ED1C-4263-B017-6C3EC74FD731}.Release|Any CPU.ActiveCfg = Release|x64
{D7EE32B0-ED1C-4263-B017-6C3EC74FD731}.Release|Any CPU.Build.0 = Release|x64
{D7EE32B0-ED1C-4263-B017-6C3EC74FD731}.Release|x64.ActiveCfg = Release|x64
{D7EE32B0-ED1C-4263-B017-6C3EC74FD731}.Release|x64.Build.0 = Release|x64
{DDF690A2-7588-44BC-8E2E-9080C746A49C}.Debug|Any CPU.ActiveCfg = Debug|x64
{DDF690A2-7588-44BC-8E2E-9080C746A49C}.Debug|Any CPU.Build.0 = Debug|x64
{DDF690A2-7588-44BC-8E2E-9080C746A49C}.Debug|x64.ActiveCfg = Debug|x64
{DDF690A2-7588-44BC-8E2E-9080C746A49C}.Debug|x64.Build.0 = Debug|x64
{DDF690A2-7588-44BC-8E2E-9080C746A49C}.Release|Any CPU.ActiveCfg = Release|x64
{DDF690A2-7588-44BC-8E2E-9080C746A49C}.Release|Any CPU.Build.0 = Release|x64
{DDF690A2-7588-44BC-8E2E-9080C746A49C}.Release|x64.ActiveCfg = Release|x64
{DDF690A2-7588-44BC-8E2E-9080C746A49C}.Release|x64.Build.0 = Release|x64
{6B932930-D24C-43BB-8877-85B4F3F7A57B}.Debug|Any CPU.ActiveCfg = Debug|x64
{6B932930-D24C-43BB-8877-85B4F3F7A57B}.Debug|Any CPU.Build.0 = Debug|x64
{6B932930-D24C-43BB-8877-85B4F3F7A57B}.Debug|x64.ActiveCfg = Debug|x64
{6B932930-D24C-43BB-8877-85B4F3F7A57B}.Debug|x64.Build.0 = Debug|x64
{6B932930-D24C-43BB-8877-85B4F3F7A57B}.Release|Any CPU.ActiveCfg = Release|x64
{6B932930-D24C-43BB-8877-85B4F3F7A57B}.Release|Any CPU.Build.0 = Release|x64
{6B932930-D24C-43BB-8877-85B4F3F7A57B}.Release|x64.ActiveCfg = Release|x64
{6B932930-D24C-43BB-8877-85B4F3F7A57B}.Release|x64.Build.0 = Release|x64
{535BE739-1314-4F8D-B24B-06890DDD3B8D}.Debug|Any CPU.ActiveCfg = Debug|x64
{535BE739-1314-4F8D-B24B-06890DDD3B8D}.Debug|Any CPU.Build.0 = Debug|x64
{535BE739-1314-4F8D-B24B-06890DDD3B8D}.Debug|x64.ActiveCfg = Debug|x64
{535BE739-1314-4F8D-B24B-06890DDD3B8D}.Debug|x64.Build.0 = Debug|x64
{535BE739-1314-4F8D-B24B-06890DDD3B8D}.Release|Any CPU.ActiveCfg = Release|x64
{535BE739-1314-4F8D-B24B-06890DDD3B8D}.Release|Any CPU.Build.0 = Release|x64
{535BE739-1314-4F8D-B24B-06890DDD3B8D}.Release|x64.ActiveCfg = Release|x64
{535BE739-1314-4F8D-B24B-06890DDD3B8D}.Release|x64.Build.0 = Release|x64
{69C1A629-F519-4F5A-85D5-4E0317CD267F}.Debug|Any CPU.ActiveCfg = Debug|x64
{69C1A629-F519-4F5A-85D5-4E0317CD267F}.Debug|Any CPU.Build.0 = Debug|x64
{69C1A629-F519-4F5A-85D5-4E0317CD267F}.Debug|x64.ActiveCfg = Debug|x64
{69C1A629-F519-4F5A-85D5-4E0317CD267F}.Debug|x64.Build.0 = Debug|x64
{69C1A629-F519-4F5A-85D5-4E0317CD267F}.Release|Any CPU.ActiveCfg = Release|x64
{69C1A629-F519-4F5A-85D5-4E0317CD267F}.Release|Any CPU.Build.0 = Release|x64
{69C1A629-F519-4F5A-85D5-4E0317CD267F}.Release|x64.ActiveCfg = Release|x64
{69C1A629-F519-4F5A-85D5-4E0317CD267F}.Release|x64.Build.0 = Release|x64
{5AF00B6D-70C2-4CB0-A5D8-41F488F0DDF2}.Debug|Any CPU.ActiveCfg = Debug|x64
{5AF00B6D-70C2-4CB0-A5D8-41F488F0DDF2}.Debug|Any CPU.Build.0 = Debug|x64
{5AF00B6D-70C2-4CB0-A5D8-41F488F0DDF2}.Debug|x64.ActiveCfg = Debug|x64
{5AF00B6D-70C2-4CB0-A5D8-41F488F0DDF2}.Debug|x64.Build.0 = Debug|x64
{5AF00B6D-70C2-4CB0-A5D8-41F488F0DDF2}.Release|Any CPU.ActiveCfg = Release|x64
{5AF00B6D-70C2-4CB0-A5D8-41F488F0DDF2}.Release|Any CPU.Build.0 = Release|x64
{5AF00B6D-70C2-4CB0-A5D8-41F488F0DDF2}.Release|x64.ActiveCfg = Release|x64
{5AF00B6D-70C2-4CB0-A5D8-41F488F0DDF2}.Release|x64.Build.0 = Release|x64
{5ACA68DA-A282-434D-919F-B243A801D4C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5ACA68DA-A282-434D-919F-B243A801D4C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5ACA68DA-A282-434D-919F-B243A801D4C3}.Debug|x64.ActiveCfg = Debug|Any CPU
{5ACA68DA-A282-434D-919F-B243A801D4C3}.Debug|x64.Build.0 = Debug|Any CPU
{5ACA68DA-A282-434D-919F-B243A801D4C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5ACA68DA-A282-434D-919F-B243A801D4C3}.Release|Any CPU.Build.0 = Release|Any CPU
{5ACA68DA-A282-434D-919F-B243A801D4C3}.Release|x64.ActiveCfg = Release|Any CPU
{5ACA68DA-A282-434D-919F-B243A801D4C3}.Release|x64.Build.0 = Release|Any CPU
EndGlobalSection
Expand Down
1 change: 0 additions & 1 deletion external/FontStashSharp
Submodule FontStashSharp deleted from f11f97
14 changes: 14 additions & 0 deletions external/FontStashSharp/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<Project>
<PropertyGroup>
<Authors>FontStashSharpTeam</Authors>
<Product>FontStashSharp</Product>
<PackageLicenseExpression>Zlib</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/rds1983/FontStashSharp</PackageProjectUrl>
<RootNamespace>FontStashSharp</RootNamespace>
<Version>1.2.8</Version>
<FontStashSharpBaseVersion>1.1.8</FontStashSharpBaseVersion>
<StbImageSharpVersion>2.27.13</StbImageSharpVersion>
<CyotekDrawingBitmapFontVersion>2.0.4</CyotekDrawingBitmapFontVersion>
<MonoGameVersion>3.8.1.303</MonoGameVersion>
</PropertyGroup>
</Project>
11 changes: 11 additions & 0 deletions external/FontStashSharp/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
The zlib/libpng License

This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.

Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:

The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.

Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.

This notice may not be removed or altered from any source distribution.
59 changes: 59 additions & 0 deletions external/FontStashSharp/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# FontStashSharp
[![NuGet](https://img.shields.io/nuget/v/FontStashSharp.svg)](https://www.nuget.org/packages/FontStashSharp/)
![Build & Publish](https://github.com/rds1983/FontStashSharp/workflows/Build%20&%20Publish/badge.svg)
[![Chat](https://img.shields.io/discord/628186029488340992.svg)](https://discord.gg/ZeHxhCY)

FontStashSharp is the text rendering library.

# Usage
[Using FontStashSharp in MonoGame or FNA](https://github.com/FontStashSharp/FontStashSharp/wiki/Using-FontStashSharp-in-MonoGame-or-FNA)

[Custom Render Interfaces](https://github.com/FontStashSharp/FontStashSharp/wiki/Custom-Render-Interfaces)

[Dealing With Texture Atlas Overflow](https://github.com/FontStashSharp/FontStashSharp/wiki/Dealing-With-Texture-Atlas-Overflow)

[Making Fonts Sharper And Better At Scaling](https://github.com/FontStashSharp/FontStashSharp/wiki/Making-Fonts-Sharper-And-Better-At-Scaling)

[Using Existing Texture As Font Glyphs Atlas](https://github.com/FontStashSharp/FontStashSharp/wiki/Using-Existing-Texture-As-Font-Glyphs-Atlas)

[Custom Font Rasterizer](https://github.com/FontStashSharp/FontStashSharp/wiki/Custom-Font-Rasterizer)

[StaticSpriteFont](https://github.com/FontStashSharp/FontStashSharp/wiki/StaticSpriteFont)

[Rich Text](https://github.com/FontStashSharp/FontStashSharp/wiki/Rich-Text)

[Using FontStashSharp in any C# engine](https://github.com/rds1983/FontStashSharp/wiki/Using-FontStashSharp-in-generic-game-engine)

## Support
[Discord](https://discord.gg/ZeHxhCY)

## Building From Source Code
1. Clone this repo.
2. Open a solution from the "build" folder.

## Sponsor
https://www.patreon.com/rds1983

https://boosty.to/rds1983

bitcoin: 3GeKFcv8X1cn8WqH1mr8i7jgPBkQjQuyN1

# Screenshots
Ordinary Text:
![](/screenshots/simple.png)

Blurry Text:
![](/screenshots/blurry.png)

Stroked Text:
![](/screenshots/stroked.png)

## Credits
* [fontstash](https://github.com/memononen/fontstash)
* [stb](https://github.com/nothings/stb)
* [bartwe's fork of SpriteFontPlus](https://github.com/bartwe/SpriteFontPlus)
* [MonoGame](http://www.monogame.net/)
* [SharpFont](https://github.com/Robmaister/SharpFont)
* [FreeTypeSharp](https://github.com/ryancheung/FreeTypeSharp)
* [SixLabors.Fonts](https://github.com/SixLabors/Fonts)
* [TrippyGL](https://github.com/SilkCommunity/TrippyGL)
77 changes: 77 additions & 0 deletions external/FontStashSharp/build/FontStashSharp.FNA.Core.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.1.32328.378
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{8ED83526-FD30-4BA1-90C4-8CE29F53E5FB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FNA.Core", "..\..\FNA\FNA.Core.csproj", "{6ED7B053-7CD7-4F9B-8F06-597F56F698D1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FontStashSharp.Samples.DynamicSpriteFont.FNA.Core", "..\samples\FontStashSharp.Samples.DynamicSpriteFont\FontStashSharp.Samples.DynamicSpriteFont.FNA.Core.csproj", "{2A96085A-5F58-4E6B-ACBD-B8F9392C246F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FontStashSharp.FNA.Core", "..\src\XNA\FontStashSharp.FNA.Core.csproj", "{FB73E808-A6B1-41A6-9324-91352CBE5577}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FontStashSharp.Samples.StaticSpriteFont.FNA.Core", "..\samples\FontStashSharp.Samples.StaticSpriteFont\FontStashSharp.Samples.StaticSpriteFont.FNA.Core.csproj", "{9AD74712-4F78-4F62-A73A-862FBD2593AA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FontStashSharp.Samples.RichText.FNA.Core", "..\samples\FontStashSharp.Samples.RichText\FontStashSharp.Samples.RichText.FNA.Core.csproj", "{B113348B-3F10-4DB3-B6AC-8C14799B25CA}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{6ED7B053-7CD7-4F9B-8F06-597F56F698D1}.Debug|Any CPU.ActiveCfg = Debug|x64
{6ED7B053-7CD7-4F9B-8F06-597F56F698D1}.Debug|Any CPU.Build.0 = Debug|x64
{6ED7B053-7CD7-4F9B-8F06-597F56F698D1}.Debug|x64.ActiveCfg = Debug|x64
{6ED7B053-7CD7-4F9B-8F06-597F56F698D1}.Debug|x64.Build.0 = Debug|x64
{6ED7B053-7CD7-4F9B-8F06-597F56F698D1}.Release|Any CPU.ActiveCfg = Release|x64
{6ED7B053-7CD7-4F9B-8F06-597F56F698D1}.Release|x64.ActiveCfg = Release|x64
{6ED7B053-7CD7-4F9B-8F06-597F56F698D1}.Release|x64.Build.0 = Release|x64
{2A96085A-5F58-4E6B-ACBD-B8F9392C246F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2A96085A-5F58-4E6B-ACBD-B8F9392C246F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2A96085A-5F58-4E6B-ACBD-B8F9392C246F}.Debug|x64.ActiveCfg = Debug|Any CPU
{2A96085A-5F58-4E6B-ACBD-B8F9392C246F}.Debug|x64.Build.0 = Debug|Any CPU
{2A96085A-5F58-4E6B-ACBD-B8F9392C246F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2A96085A-5F58-4E6B-ACBD-B8F9392C246F}.Release|Any CPU.Build.0 = Release|Any CPU
{2A96085A-5F58-4E6B-ACBD-B8F9392C246F}.Release|x64.ActiveCfg = Release|Any CPU
{2A96085A-5F58-4E6B-ACBD-B8F9392C246F}.Release|x64.Build.0 = Release|Any CPU
{FB73E808-A6B1-41A6-9324-91352CBE5577}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FB73E808-A6B1-41A6-9324-91352CBE5577}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FB73E808-A6B1-41A6-9324-91352CBE5577}.Debug|x64.ActiveCfg = Debug|Any CPU
{FB73E808-A6B1-41A6-9324-91352CBE5577}.Debug|x64.Build.0 = Debug|Any CPU
{FB73E808-A6B1-41A6-9324-91352CBE5577}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FB73E808-A6B1-41A6-9324-91352CBE5577}.Release|Any CPU.Build.0 = Release|Any CPU
{FB73E808-A6B1-41A6-9324-91352CBE5577}.Release|x64.ActiveCfg = Release|Any CPU
{FB73E808-A6B1-41A6-9324-91352CBE5577}.Release|x64.Build.0 = Release|Any CPU
{9AD74712-4F78-4F62-A73A-862FBD2593AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9AD74712-4F78-4F62-A73A-862FBD2593AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9AD74712-4F78-4F62-A73A-862FBD2593AA}.Debug|x64.ActiveCfg = Debug|Any CPU
{9AD74712-4F78-4F62-A73A-862FBD2593AA}.Debug|x64.Build.0 = Debug|Any CPU
{9AD74712-4F78-4F62-A73A-862FBD2593AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9AD74712-4F78-4F62-A73A-862FBD2593AA}.Release|Any CPU.Build.0 = Release|Any CPU
{9AD74712-4F78-4F62-A73A-862FBD2593AA}.Release|x64.ActiveCfg = Release|Any CPU
{9AD74712-4F78-4F62-A73A-862FBD2593AA}.Release|x64.Build.0 = Release|Any CPU
{B113348B-3F10-4DB3-B6AC-8C14799B25CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B113348B-3F10-4DB3-B6AC-8C14799B25CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B113348B-3F10-4DB3-B6AC-8C14799B25CA}.Debug|x64.ActiveCfg = Debug|Any CPU
{B113348B-3F10-4DB3-B6AC-8C14799B25CA}.Debug|x64.Build.0 = Debug|Any CPU
{B113348B-3F10-4DB3-B6AC-8C14799B25CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B113348B-3F10-4DB3-B6AC-8C14799B25CA}.Release|Any CPU.Build.0 = Release|Any CPU
{B113348B-3F10-4DB3-B6AC-8C14799B25CA}.Release|x64.ActiveCfg = Release|Any CPU
{B113348B-3F10-4DB3-B6AC-8C14799B25CA}.Release|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{2A96085A-5F58-4E6B-ACBD-B8F9392C246F} = {8ED83526-FD30-4BA1-90C4-8CE29F53E5FB}
{9AD74712-4F78-4F62-A73A-862FBD2593AA} = {8ED83526-FD30-4BA1-90C4-8CE29F53E5FB}
{B113348B-3F10-4DB3-B6AC-8C14799B25CA} = {8ED83526-FD30-4BA1-90C4-8CE29F53E5FB}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {A9C9D369-EE58-4E9D-B9FE-63023B644741}
EndGlobalSection
EndGlobal

0 comments on commit dad78d7

Please sign in to comment.