Переглянути джерело

Update to latest MonoGame.Extended

Jean-David Moisan 10 місяців тому
батько
коміт
f6e2ab5d9f

+ 3 - 3
Example/Game/GameRoot.cs

@@ -5,7 +5,7 @@ using FontStashSharp;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Input;
-using MonoGame.Extended.TextureAtlases;
+using MonoGame.Extended.Graphics;
 
 namespace GameProject {
     public class GameRoot : Game {
@@ -36,7 +36,7 @@ namespace GameProject {
 
             var texture = Content.Load<Texture2D>("apos");
 
-            _apos = new TextureRegion2D(texture, 0, 0, texture.Width, texture.Height);
+            _apos = new Texture2DRegion(texture, 0, 0, texture.Width, texture.Height);
         }
 
         private string _name = "no name";
@@ -102,6 +102,6 @@ namespace GameProject {
 
         IMGUI _ui;
 
-        TextureRegion2D _apos;
+        Texture2DRegion _apos;
     }
 }

+ 2 - 2
Example/Platforms/DesktopGL/DesktopGL.csproj

@@ -14,8 +14,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.303" />
-    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.303" />
+    <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.2.1105" />
+    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.2.1105" />
 
     <ProjectReference Include="../../../Source/Apos.Gui.csproj">
       <NoWarn>CS1591</NoWarn>

+ 2 - 2
Example/Platforms/WindowsDX/WindowsDX.csproj

@@ -13,8 +13,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.303" />
-    <PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.1.303" />
+    <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.2.1105" />
+    <PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.2.1105" />
 
     <ProjectReference Include="../../../Source/Apos.Gui.csproj">
       <NoWarn>CS1591</NoWarn>

+ 3 - 3
Source/Apos.Gui.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
 
@@ -11,7 +11,7 @@
 
     <Authors>Jean-David Moisan</Authors>
     <Company>Vyne Enterprise Inc.</Company>
-    <Copyright>Copyright 2023</Copyright>
+    <Copyright>Copyright 2024</Copyright>
 
     <RepositoryUrl>https://github.com/Apostolique/Apos.Gui</RepositoryUrl>
     <PackageProjectUrl>https://github.com/Apostolique/Apos.Gui</PackageProjectUrl>
@@ -30,7 +30,7 @@
 
   <ItemGroup>
     <PackageReference Include="MonoGame.Framework.DesktopGL" PrivateAssets="All" Version="3.8.0.1641" />
-    <PackageReference Include="MonoGame.Extended" Version="3.8.0" />
+    <PackageReference Include="MonoGame.Extended" Version="4.0.3" />
     <PackageReference Include="FontStashSharp.MonoGame" Version="1.2.8" />
     <PackageReference Include="Apos.Input" Version="2.4.2" />
     <PackageReference Include="Apos.Tweens" Version="0.1.3" />

+ 4 - 4
Source/Icon.cs

@@ -1,10 +1,10 @@
 using System.Runtime.CompilerServices;
 using Microsoft.Xna.Framework;
-using MonoGame.Extended.TextureAtlases;
+using MonoGame.Extended.Graphics;
 
 namespace Apos.Gui {
-    public class Icon(int id, TextureRegion2D region) : Component(id) {
-        public TextureRegion2D Region { get; set; } = region;
+    public class Icon(int id, Texture2DRegion region) : Component(id) {
+        public Texture2DRegion Region { get; set; } = region;
 
         public override void UpdatePrefSize(GameTime gametime) {
             PrefWidth = Region.Width;
@@ -26,7 +26,7 @@ namespace Apos.Gui {
             GuiHelper.PopScissor();
         }
 
-        public static Icon Put(TextureRegion2D region, [CallerLineNumber] int id = 0, bool isAbsoluteId = false) {
+        public static Icon Put(Texture2DRegion region, [CallerLineNumber] int id = 0, bool isAbsoluteId = false) {
             id = GuiHelper.CurrentIMGUI.TryCreateId(id, isAbsoluteId, out IComponent c);
 
             Icon a;