From ea8ec69dd6e85b6c87cae06227f0ab74b0c868e4 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Mon, 2 Sep 2024 19:55:28 +0200 Subject: [PATCH] Added MLEM.KNI and friends, which are fully compatible with KNI --- CHANGELOG.md | 17 ++++ Demos.DesktopGL/Demos.DesktopGL.KNI.csproj | 39 +++++++++ Demos.DesktopGL/Program.cs | 2 +- Demos/Content/Fonts/RobotoBold.spritefont | 2 +- Demos/Content/Fonts/RobotoItalic.spritefont | 2 +- Demos/Content/Fonts/TestFontBold.spritefont | 18 ++-- Demos/Content/Fonts/TestFontItalic.spritefont | 18 ++-- Demos/Demos.KNI.csproj | 40 +++++++++ Docs/articles/input.md | 2 +- Docs/articles/ui.md | 4 +- MLEM.Data/Content/RawContentManager.cs | 4 +- MLEM.Data/Content/Texture2DReader.cs | 2 +- MLEM.Data/MLEM.Data.KNI.csproj | 61 ++++++++++++++ MLEM.Extended/MLEM.Extended.KNI.csproj | 70 ++++++++++++++++ MLEM.KNI.sln | 78 ++++++++++++++++++ MLEM.Startup/MLEM.Startup.KNI.csproj | 56 +++++++++++++ MLEM.Ui/MLEM.Ui.KNI.csproj | 54 ++++++++++++ MLEM/Font/GenericSpriteFont.cs | 11 +++ MLEM/Graphics/GraphicsExtensions.cs | 4 +- MLEM/Input/InputHandler.cs | 2 +- MLEM/MLEM.KNI.csproj | 53 ++++++++++++ README.md | 8 +- Tests/Content/TestFontKni.xnb | Bin 0 -> 288842 bytes Tests/FontTests.cs | 7 +- Tests/TestGame.cs | 16 +++- Tests/Tests.KNI.csproj | 44 ++++++++++ Tests/Tests.KNI.runsettings | 12 +++ Tests/Tests.runsettings | 1 + build.cake | 4 + 29 files changed, 593 insertions(+), 38 deletions(-) create mode 100644 Demos.DesktopGL/Demos.DesktopGL.KNI.csproj create mode 100644 Demos/Demos.KNI.csproj create mode 100644 MLEM.Data/MLEM.Data.KNI.csproj create mode 100644 MLEM.Extended/MLEM.Extended.KNI.csproj create mode 100644 MLEM.KNI.sln create mode 100644 MLEM.Startup/MLEM.Startup.KNI.csproj create mode 100644 MLEM.Ui/MLEM.Ui.KNI.csproj create mode 100644 MLEM/MLEM.KNI.csproj create mode 100644 Tests/Content/TestFontKni.xnb create mode 100644 Tests/Tests.KNI.csproj create mode 100644 Tests/Tests.KNI.runsettings diff --git a/CHANGELOG.md b/CHANGELOG.md index a171a49..ef3e80c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,23 @@ Jump to version: ### MLEM Additions - Added ColorExtensions.ToHsl and ColorHelper.FromHsl as well as ColorExtensions.ToHsv and ColorHelper.FromHsv +- Added MLEM.KNI, which is fully compatible with KNI + +### MLEM.Ui +Additions +- Added MLEM.Ui.KNI, which is fully compatible with KNI + +### MLEM.Extended +Additions +- Added MLEM.Extended.KNI, which is fully compatible with KNI + +### MLEM.Data +Additions +- Added MLEM.Data.KNI, which is fully compatible with KNI + +### MLEM.Startup +Additions +- Added MLEM.Startup.KNI, which is fully compatible with KNI ## 7.0.0 diff --git a/Demos.DesktopGL/Demos.DesktopGL.KNI.csproj b/Demos.DesktopGL/Demos.DesktopGL.KNI.csproj new file mode 100644 index 0000000..e7e9f03 --- /dev/null +++ b/Demos.DesktopGL/Demos.DesktopGL.KNI.csproj @@ -0,0 +1,39 @@ + + + + Exe + net8.0 + Icon.ico + MLEM Desktop Demos + Demos.DesktopGL + $(DefineConstants);KNI + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Demos.DesktopGL/Program.cs b/Demos.DesktopGL/Program.cs index 567e8f1..6c9304a 100644 --- a/Demos.DesktopGL/Program.cs +++ b/Demos.DesktopGL/Program.cs @@ -1,5 +1,5 @@ using MLEM.Misc; -#if !FNA +#if !FNA && !KNI using Microsoft.Xna.Framework; #else using Microsoft.Xna.Framework.Input; diff --git a/Demos/Content/Fonts/RobotoBold.spritefont b/Demos/Content/Fonts/RobotoBold.spritefont index b2e6112..aae2531 100644 --- a/Demos/Content/Fonts/RobotoBold.spritefont +++ b/Demos/Content/Fonts/RobotoBold.spritefont @@ -35,7 +35,7 @@ with. Style controls the style of the font. Valid entries are "Regular", "Bold", "Italic", and "Bold, Italic", and are case sensitive. --> - + - + - + - CAYTANOB - + CAYTANOB.ttf + 32 - + 0 - + true - + - - + + * - + - + - CAYETANI - + CAYETANI.ttf + 32 - + 0 - + true - + - - + + * - +