Support MonoGame 3.8.1

discosultan · Aug 2, 2022 · 3a2d542 · 3a2d542
1 parent 5729589
commit 3a2d542
Show file tree

Hide file tree

Showing 32 changed files with 212 additions and 34 deletions.
diff --git a/README.md b/README.md
@@ -14,8 +14,8 @@ Penumbra allows users to easily add 2D lighting with shadowing effects to their
 
 The following is required to successfully compile the Penumbra MonoGame solution:
 
-- Visual studio 2019+
-- MonoGame 3.8+
+- Visual studio 2022+
+- MonoGame 3.8.1+
 - [DirectX End-User Runtimes (June 2010)](http://www.microsoft.com/en-us/download/details.aspx?id=8109) (to compile effect shaders)
 
 ### Using Penumbra

diff --git a/Samples/FarseerPhysics/.config/dotnet-tools.json b/Samples/FarseerPhysics/.config/dotnet-tools.json
@@ -0,0 +1,36 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-mgcb": {
+      "version": "3.8.1.303",
+      "commands": [
+        "mgcb"
+      ]
+    },
+    "dotnet-mgcb-editor": {
+      "version": "3.8.1.303",
+      "commands": [
+        "mgcb-editor"
+      ]
+    },
+    "dotnet-mgcb-editor-linux": {
+      "version": "3.8.1.303",
+      "commands": [
+        "mgcb-editor-linux"
+      ]
+    },
+    "dotnet-mgcb-editor-windows": {
+      "version": "3.8.1.303",
+      "commands": [
+        "mgcb-editor-windows"
+      ]
+    },
+    "dotnet-mgcb-editor-mac": {
+      "version": "3.8.1.303",
+      "commands": [
+        "mgcb-editor-mac"
+      ]
+    }
+  }
+}
diff --git a/Samples/FarseerPhysics/FarseerPhysics.csproj b/Samples/FarseerPhysics/FarseerPhysics.csproj
@@ -2,15 +2,15 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <DefineConstants>WINDOWS</DefineConstants>
     <ApplicationIcon>Icon.ico</ApplicationIcon>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.0.1641" />
-    <PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.0.1641" />
+    <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.303" />
+    <PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.1.303" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Samples/HelloPenumbra/.config/dotnet-tools.json b/Samples/HelloPenumbra/.config/dotnet-tools.json
@@ -0,0 +1,36 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-mgcb": {
+      "version": "3.8.1.303",
+      "commands": [
+        "mgcb"
+      ]
+    },
+    "dotnet-mgcb-editor": {
+      "version": "3.8.1.303",
+      "commands": [
+        "mgcb-editor"
+      ]
+    },
+    "dotnet-mgcb-editor-linux": {
+      "version": "3.8.1.303",
+      "commands": [
+        "mgcb-editor-linux"
+      ]
+    },
+    "dotnet-mgcb-editor-windows": {
+      "version": "3.8.1.303",
+      "commands": [
+        "mgcb-editor-windows"
+      ]
+    },
+    "dotnet-mgcb-editor-mac": {
+      "version": "3.8.1.303",
+      "commands": [
+        "mgcb-editor-mac"
+      ]
+    }
+  }
+}
diff --git a/Samples/HelloPenumbra/HelloPenumbra.csproj b/Samples/HelloPenumbra/HelloPenumbra.csproj
@@ -2,15 +2,15 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <DefineConstants>WINDOWS</DefineConstants>
     <ApplicationIcon>Icon.ico</ApplicationIcon>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.0.1641" />
-    <PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.0.1641" />
+    <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.303" />
+    <PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.1.303" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Samples/Platformer2D/.config/dotnet-tools.json b/Samples/Platformer2D/.config/dotnet-tools.json
@@ -0,0 +1,36 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-mgcb": {
+      "version": "3.8.1.303",
+      "commands": [
+        "mgcb"
+      ]
+    },
+    "dotnet-mgcb-editor": {
+      "version": "3.8.1.303",
+      "commands": [
+        "mgcb-editor"
+      ]
+    },
+    "dotnet-mgcb-editor-linux": {
+      "version": "3.8.1.303",
+      "commands": [
+        "mgcb-editor-linux"
+      ]
+    },
+    "dotnet-mgcb-editor-windows": {
+      "version": "3.8.1.303",
+      "commands": [
+        "mgcb-editor-windows"
+      ]
+    },
+    "dotnet-mgcb-editor-mac": {
+      "version": "3.8.1.303",
+      "commands": [
+        "mgcb-editor-mac"
+      ]
+    }
+  }
+}
diff --git a/Samples/Platformer2D/Platformer2D.csproj b/Samples/Platformer2D/Platformer2D.csproj
@@ -2,15 +2,15 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <DefineConstants>WINDOWS</DefineConstants>
     <ApplicationIcon>Icon.ico</ApplicationIcon>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.0.1641" />
-    <PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.0.1641" />
+    <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.303" />
+    <PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.1.303" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Samples/Sandbox/.config/dotnet-tools.json b/Samples/Sandbox/.config/dotnet-tools.json
@@ -0,0 +1,36 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-mgcb": {
+      "version": "3.8.1.303",
+      "commands": [
+        "mgcb"
+      ]
+    },
+    "dotnet-mgcb-editor": {
+      "version": "3.8.1.303",
+      "commands": [
+        "mgcb-editor"
+      ]
+    },
+    "dotnet-mgcb-editor-linux": {
+      "version": "3.8.1.303",
+      "commands": [
+        "mgcb-editor-linux"
+      ]
+    },
+    "dotnet-mgcb-editor-windows": {
+      "version": "3.8.1.303",
+      "commands": [
+        "mgcb-editor-windows"
+      ]
+    },
+    "dotnet-mgcb-editor-mac": {
+      "version": "3.8.1.303",
+      "commands": [
+        "mgcb-editor-mac"
+      ]
+    }
+  }
+}
diff --git a/Samples/Sandbox/Sandbox.csproj b/Samples/Sandbox/Sandbox.csproj
@@ -2,15 +2,15 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <DefineConstants>WINDOWS</DefineConstants>
     <ApplicationIcon>Icon.ico</ApplicationIcon>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.0.1641" />
-    <PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.0.1641" />
+    <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.303" />
+    <PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.1.303" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Samples/Shared/Common/Common.csproj b/Samples/Shared/Common/Common.csproj
@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.0.1641" />
+    <PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.1.303" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Samples/Shared/FarseerPhysics Source/Farseer Physics DebugView 3.5/DebugView MonoGame.csproj b/Samples/Shared/FarseerPhysics Source/Farseer Physics DebugView 3.5/DebugView MonoGame.csproj
@@ -2,13 +2,13 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <IsPackable>false</IsPackable>
     <DefineConstants>WINDOWS;XNA</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.0.1641" />
+    <PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.1.303" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...s/Shared/FarseerPhysics Source/Farseer Physics Engine 3.5/Farseer Physics MonoGame.csproj b/...s/Shared/FarseerPhysics Source/Farseer Physics Engine 3.5/Farseer Physics MonoGame.csproj
@@ -2,13 +2,13 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <IsPackable>false</IsPackable>
     <DefineConstants>WINDOWS;XNA</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.0.1641" />
+    <PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.1.303" />
   </ItemGroup>
 
 </Project>
diff --git a/Source/.config/dotnet-tools.json b/Source/.config/dotnet-tools.json
@@ -0,0 +1,36 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-mgcb": {
+      "version": "3.8.1.303",
+      "commands": [
+        "mgcb"
+      ]
+    },
+    "dotnet-mgcb-editor": {
+      "version": "3.8.1.303",
+      "commands": [
+        "mgcb-editor"
+      ]
+    },
+    "dotnet-mgcb-editor-linux": {
+      "version": "3.8.1.303",
+      "commands": [
+        "mgcb-editor-linux"
+      ]
+    },
+    "dotnet-mgcb-editor-windows": {
+      "version": "3.8.1.303",
+      "commands": [
+        "mgcb-editor-windows"
+      ]
+    },
+    "dotnet-mgcb-editor-mac": {
+      "version": "3.8.1.303",
+      "commands": [
+        "mgcb-editor-mac"
+      ]
+    }
+  }
+}
diff --git a/Source/Content/bin/DesktopGL/Content.DesktopGL/PenumbraHull.xnb b/Source/Content/bin/DesktopGL/Content.DesktopGL/PenumbraHull.xnb
diff --git a/Source/Content/bin/DesktopGL/Content.DesktopGL/PenumbraLight.xnb b/Source/Content/bin/DesktopGL/Content.DesktopGL/PenumbraLight.xnb
diff --git a/Source/Content/bin/DesktopGL/Content.DesktopGL/PenumbraShadow.xnb b/Source/Content/bin/DesktopGL/Content.DesktopGL/PenumbraShadow.xnb
diff --git a/Source/Content/bin/DesktopGL/Content.DesktopGL/PenumbraTexture.xnb b/Source/Content/bin/DesktopGL/Content.DesktopGL/PenumbraTexture.xnb
diff --git a/Source/Content/bin/DesktopGL/Content.WindowsDX/PenumbraHull.xnb b/Source/Content/bin/DesktopGL/Content.WindowsDX/PenumbraHull.xnb
diff --git a/Source/Content/bin/DesktopGL/Content.WindowsDX/PenumbraLight.xnb b/Source/Content/bin/DesktopGL/Content.WindowsDX/PenumbraLight.xnb
diff --git a/Source/Content/bin/DesktopGL/Content.WindowsDX/PenumbraShadow.xnb b/Source/Content/bin/DesktopGL/Content.WindowsDX/PenumbraShadow.xnb
diff --git a/Source/Content/bin/DesktopGL/Content.WindowsDX/PenumbraTexture.xnb b/Source/Content/bin/DesktopGL/Content.WindowsDX/PenumbraTexture.xnb
diff --git a/Source/Content/bin/Windows/Content.DesktopGL/PenumbraHull.xnb b/Source/Content/bin/Windows/Content.DesktopGL/PenumbraHull.xnb
diff --git a/Source/Content/bin/Windows/Content.DesktopGL/PenumbraLight.xnb b/Source/Content/bin/Windows/Content.DesktopGL/PenumbraLight.xnb
diff --git a/Source/Content/bin/Windows/Content.DesktopGL/PenumbraShadow.xnb b/Source/Content/bin/Windows/Content.DesktopGL/PenumbraShadow.xnb
diff --git a/Source/Content/bin/Windows/Content.DesktopGL/PenumbraTexture.xnb b/Source/Content/bin/Windows/Content.DesktopGL/PenumbraTexture.xnb
diff --git a/Source/Content/bin/Windows/Content.WindowsDX/PenumbraHull.xnb b/Source/Content/bin/Windows/Content.WindowsDX/PenumbraHull.xnb
diff --git a/Source/Content/bin/Windows/Content.WindowsDX/PenumbraLight.xnb b/Source/Content/bin/Windows/Content.WindowsDX/PenumbraLight.xnb
diff --git a/Source/Content/bin/Windows/Content.WindowsDX/PenumbraShadow.xnb b/Source/Content/bin/Windows/Content.WindowsDX/PenumbraShadow.xnb
diff --git a/Source/Content/bin/Windows/Content.WindowsDX/PenumbraTexture.xnb b/Source/Content/bin/Windows/Content.WindowsDX/PenumbraTexture.xnb
diff --git a/Source/Geometry/BoundingRectangle.cs b/Source/Geometry/BoundingRectangle.cs
@@ -21,9 +21,8 @@ public bool Intersects(BoundingRectangle other)
 
         public bool Intersects(ref BoundingRectangle other)
         {
-            Vector2 d1, d2;
-            Vector2.Subtract(ref other.Min, ref Max, out d1);
-            Vector2.Subtract(ref Min, ref other.Max, out d2);
+            Vector2.Subtract(ref other.Min, ref Max, out Vector2 d1);
+            Vector2.Subtract(ref Min, ref other.Max, out Vector2 d2);
 
             if (d1.X > 0.0f || d1.Y > 0.0f)
                 return false;
@@ -51,13 +50,12 @@ public static void Transform(ref BoundingRectangle bounds, ref Matrix transform,
             Vector2.Transform(ref c3, ref transform, out c3);
             Vector2.Transform(ref c4, ref transform, out c4);
 
-            Vector2 min, max;
 
-            Vector2.Min(ref c1, ref c2, out min);
+            Vector2.Min(ref c1, ref c2, out Vector2 min);
             Vector2.Min(ref min, ref c3, out min);
             Vector2.Min(ref min, ref c4, out min);
 
-            Vector2.Max(ref c1, ref c2, out max);
+            Vector2.Max(ref c1, ref c2, out Vector2 max);
             Vector2.Max(ref max, ref c3, out max);
             Vector2.Max(ref max, ref c4, out max);
 

diff --git a/Source/MonoGame.Penumbra.DesktopGL.csproj b/Source/MonoGame.Penumbra.DesktopGL.csproj
@@ -2,23 +2,23 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <DefineConstants>DESKTOPGL</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageId>MonoGame.Penumbra.DesktopGL</PackageId>
     <Title>MonoGame.Penumbra</Title>
-    <Version>2.1.0</Version>
+    <Version>3.0.0</Version>
     <Authors>Jaanus Varus</Authors>
     <Description>Penumbra allows users to easily add 2D lighting and shadow effects to their games.</Description>
     <PackageTags>monogame penumbra lighting shadowing 2d</PackageTags>
     <RepositoryUrl>https://github.com/discosultan/penumbra</RepositoryUrl>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.0.1641" />
-    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.0.1641" />
+    <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.303" />
+    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.303" />
   </ItemGroup>
 
   <ItemGroup>