merge from other fork

.config/global.json

@@ -0,0 +1,7 @@
+{
+  "sdk": {
+    "version": "7.0.100",
+    "rollForward": "major",
+    "allowPrerelease": true
+  }
+}

AndroidApp/Activity1.cs

@@ -1,51 +1,49 @@
 using Android.App;
 using Android.Content.PM;
 using Android.OS;
-
 using Android.Views;
+using MGCore;
 using Microsoft.Xna.Framework;
 
-using MGCore;
-
 
 namespace MGXPlatfrm.Android
 {
     [Activity(
-        
+
          Label = "MGXAndroid6",
         MainLauncher = true,
-   		 Icon = "@drawable/icon",
+            Icon = "@drawable/icon",
         AlwaysRetainTaskState = true,
         LaunchMode = LaunchMode.SingleInstance,
       ScreenOrientation = ScreenOrientation.FullUser,
-        ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.Keyboard | ConfigChanges.KeyboardHidden | ConfigChanges.ScreenSize
+        ConfigurationChanges = ConfigChanges.Orientation|ConfigChanges.Keyboard|ConfigChanges.KeyboardHidden|ConfigChanges.ScreenSize
     )]
-  
+
 
     public class Activity1 : AndroidGameActivity//, IOnSystemUiVisibilityChangeListener  //was to hide hte navigation stuffk broken now
     {
 
         private View _view;
-        private CoreGame _game;
+        private GraphicsTestRig _game;
 
 
-         static Activity1()//set these before any dependencies get called
+        static Activity1()//set these before any dependencies get called
         {
-
-            CoreGame.IsDirectX = false;//
+            GraphicsTestRig.IsAndroid=true;
+            GraphicsTestRig.IsDirectX=false;//
         }
 
         protected override void OnCreate(Bundle bundle)
         {
             base.OnCreate(bundle);
 
-
-            _game = new CoreGame();
 
-            _view = _game.Services.GetService(typeof(View)) as View;
+            _game=new GraphicsTestRig();
+
+            _view=_game.Services.GetService(typeof(View)) as View;
 
-        //    this.Window.DecorView.SetOnSystemUiVisibilityChangeListener(this);
-       //
+            //    this.Window.DecorView.SetOnSystemUiVisibilityChangeListener(this);
+            //
             SetContentView(_view);
 
 

AndroidApp/AndroidApp.csproj

@@ -1,9 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-	<TargetFramework>net6.0-android31.0</TargetFramework>
-   <SupportedOSPlatformVersion>23.0</SupportedOSPlatformVersion>
+	<TargetFramework>net7.0-android33.0</TargetFramework>
     <OutputType>Exe</OutputType>
-	  <ApplicationId>com.companyname.MGClipFXv2</ApplicationId>
+	  <ApplicationId>com.MotherLoader.MGClipFX</ApplicationId>
     <ApplicationVersion>1</ApplicationVersion>
     <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
     <PackageIcon>Icon.png</PackageIcon>
@@ -12,23 +11,39 @@
 
     <BaseOutputPath>..\bin\</BaseOutputPath>
 
-    <Title>AndroidClipMGTest</Title>
+    <Title>AndroidShadersMGTest</Title>
 
     <Nullable>warnings</Nullable>
+
+    <IsPublishable>False</IsPublishable>
+
+    <SupportedOSPlatformVersion>23.0</SupportedOSPlatformVersion>
+
+
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">
     <DefineConstants>$(DefineConstants)</DefineConstants>
   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)'=='Release'">  
-	   <DefineConstants>$(DefineConstants)</DefineConstants> 
 
-  </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-     <PublishTrimmed>False</PublishTrimmed>
+   <PropertyGroup Condition="'$(Configuration)'=='Release'">
+	   <RunAOTCompilation>False</RunAOTCompilation>
+	   <PublishTrimmed>False</PublishTrimmed>
+	      <DefineConstants>$(DefineConstants)</DefineConstants> 
+	   <DebugType>none</DebugType>   
    </PropertyGroup>
 
-
+   <PropertyGroup Condition="'$(Configuration)'=='Debug'">
+     <AndroidCreatePackagePerAbi>True</AndroidCreatePackagePerAbi>
+   </PropertyGroup>
+
+   <PropertyGroup Condition="'$(Configuration)'=='Release'">
+     <AndroidCreatePackagePerAbi>True</AndroidCreatePackagePerAbi>
+   </PropertyGroup>
+
+
+
+
   <ItemGroup>
     <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.303" />
     <PackageReference Include="MonoGame.Framework.Android" Version="3.8.1.303" />

AndroidApp/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="MGXShaderTest.Droid" android:versionName="0.9`" android:installLocation="auto" android:versionCode="1">
-	<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="31" />
+	<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="33" />
 	<application android:label="MGXShaderTest"></application>
 </manifest>

CodingwDamianCLA.md

@@ -1,6 +1,6 @@
 Thank you for your interest in contributing to the open source projects of Damian. In order to clarify the intellectual property license granted with Contributions from any person or entity, Coding with Damian must have a Contributor License Agreement ("Agreement") on file that has been signed by each Contributor, indicating agreement to the license terms below. This Agreement is for your protection as a Contributor as well as the protection of Coding with Damian; it does not change your rights to use your own Contributions for any other purpose.
 
-You accept and agree to the following terms and conditions for Your present and future Contributions submitted to Coding with Damian. Except for the licenses granted herein to Coding with Damian and recipients of software distributed by Coding with Calvin, You reserve all right, title, and interest in and to Your Contributions.
+You accept and agree to the following terms and conditions for Your present and future Contributions submitted to Coding with Damian. Except for the licenses granted herein to Coding with Damian and recipients of software distributed by Coding with Damian, You reserve all right, title, and interest in and to Your Contributions.
 
 #### Definitions
 
@@ -12,4 +12,4 @@ You accept and agree to the following terms and conditions for Your present and
 1. You represent that each of Your Contributions is Your original creation (see section 7 for submissions on behalf of others). You represent that Your Contribution submissions include complete details of any third-party license or other restriction (including, but not limited to, related patents and trademarks) of which You are personally aware and which are associated with any part of Your Contributions.
 1. You are not expected to provide support for Your Contributions, except to the extent You desire to provide support. You may provide support for free, for a fee, or not at all. Unless required by applicable law or agreed to in writing, You provide Your Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON- INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.
 1. Should You wish to submit work that is not Your original creation, You may submit it to Coding with Damian separately from any Contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements) of which You are personally aware, and conspicuously marking the work as "Submitted on behalf of a third-party: [named here]".
-1. You agree to notify Coding with Damian of any facts or circumstances of which You become aware that would make these representations inaccurate in any respect.
+1. You agree to notify Coding with Damian of any facts or circumstances of which You become aware that would make these representations inaccurate in any respect.

ConsoleAppDX/CWindowsAppDX.csproj

@@ -1,20 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>warnings</Nullable>
-    <Platforms>x64;ARM64</Platforms>
+    <Platforms>x64;ARM64;AnyCPU</Platforms>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <IsPublishable>True</IsPublishable>
 
     <BaseOutputPath>..\bin\</BaseOutputPath>
 
     <Title></Title>
 
-    <PackageOutputPath />
+
 
-    <PackageId />
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">

ConsoleAppDX/Program.cs

@@ -2,7 +2,7 @@
 using MGCore;
 
 {
-    var game = new CoreGame();
-    CoreGame.IsDirectX = true;
+    var game = new GraphicsTestRig();
+    GraphicsTestRig.IsDirectX=true;
     game.Run();  //this starts the render loop
 }

ConsoleAppGL/ConsoleAppGL.csproj

@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Platforms>ARM64;x64</Platforms>
-    <PlatformTarget>x64</PlatformTarget>
+    <Platforms>AnyCPU</Platforms>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <IsPublishable>True</IsPublishable>
     <BaseOutputPath>..\bin\</BaseOutputPath>
     <EnableNETAnalyzers>False</EnableNETAnalyzers>

ConsoleAppGL/Program.cs

@@ -5,14 +5,12 @@
     System.Diagnostics.ProcessStartInfo start =
       new System.Diagnostics.ProcessStartInfo();
 
-  //  var path = Assembly.GetEntryAssembly()?.Location;  //might need the exe path on some system.. this is close..
+    //  var path = Assembly.GetEntryAssembly()?.Location;  //might need the exe path on some system.. this is close..
+
+
+    GraphicsTestRig.IsDirectX=false;
+
+    var game = new GraphicsTestRig();
 
-    start.FileName=
-        //path +
-        @"\ConsoleAppGL.exe";
-    start.WindowStyle=System.Diagnostics.ProcessWindowStyle.Hidden; //Hides GUI
-    start.CreateNoWindow=true; //Hides console  //TODO doesnt work always...    todo save window pos but this requires dev branche fixes...
-    var game = new CoreGame();
-    CoreGame.IsDirectX = false;
     game.Run();  //this starts the render loop
 }

IOSApp/IOSApp.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-ios</TargetFramework>
+    <TargetFramework>net7.0-ios</TargetFramework>
     <OutputType>Exe</OutputType>
     <SupportedOSPlatformVersion>11.2</SupportedOSPlatformVersion>
     <CodesignKey>iPhone Developer</CodesignKey>

IOSApp/Program.cs

@@ -1,20 +1,17 @@
 using Foundation;
-using System;
-using UIKit;
-
-
 using MGCore;
+using UIKit;
 
 namespace IOSApp
 {
     [Register("AppDelegate")]
     internal class Program : UIApplicationDelegate
     {
-     
+
 
         internal static void RunGame()
         {
-            var game=new CoreGame();
+            var game = new GraphicsTestRig();
             game.Run();
         }
 

MGCore/Content/Bloom.fx

@@ -0,0 +1,45 @@
+#if OPENGL
+#define SV_POSITION POSITION
+#define VS_SHADERMODEL vs_3_0
+#define PS_SHADERMODEL ps_3_0
+#else
+#define VS_SHADERMODEL vs_4_0_level_9_1
+#define PS_SHADERMODEL ps_4_0_level_9_1
+#endif
+
+#define SAMPLES 15
+#define BLOOM_THRESHOLD 0.25
+#define BLOOM_INTENSITY 2.0
+#define BLOOM_SATURATION 0.8
+
+sampler2D Texture;
+
+float GlowIntensity;
+float GlowSize;
+
+float4 main(float2 uv : TEXCOORD) : COLOR
+{
+    float4 color = tex2D(Texture, uv);
+
+    float4 sum = 0;
+    int samples = 5;
+    float delta = GlowSize / samples;
+    float intensity = GlowIntensity / samples;
+    for (int i = 0; i < samples; i++)
+    {
+        sum += tex2D(Texture, uv + float2(delta * i, 0)) * intensity;
+        sum += tex2D(Texture, uv - float2(delta * i, 0)) * intensity;
+        sum += tex2D(Texture, uv + float2(0, delta * i)) * intensity;
+        sum += tex2D(Texture, uv - float2(0, delta * i)) * intensity;
+    }
+
+    return color + sum * GlowIntensity;
+}
+
+technique Glow
+{
+    pass Pass1
+    {
+        PixelShader = compile PS_SHADERMODEL main();
+    }
+}

MGCore/Content/BloomCombine.fx

@@ -0,0 +1,55 @@
+// Pixel shader combines the bloom image with the original
+// scene, using tweakable intensity levels and saturation.
+// This is the final step in applying a bloom postprocess.
+
+sampler BloomSampler : register(s0);
+sampler BaseSampler : register(s1);
+
+float BloomIntensity;
+float BaseIntensity;
+
+float BloomSaturation;
+float BaseSaturation;
+
+
+// Helper for modifying the saturation of a color.
+float4 AdjustSaturation(float4 color, float saturation)
+{
+    // The constants 0.3, 0.59, and 0.11 are chosen because the
+    // human eye is more sensitive to green light, and less to blue.
+    float grey = dot(color, float3(0.3, 0.59, 0.11));
+
+    return lerp(grey, color, saturation);
+}
+
+
+float4 PixelShaderFunction(float2 texCoord : TEXCOORD0) : COLOR0
+{
+    // Look up the bloom and original base image colors.
+    float4 bloom = tex2D(BloomSampler, texCoord);
+    float4 base = tex2D(BaseSampler, texCoord);
+
+    // Adjust color saturation and intensity.
+    bloom = AdjustSaturation(bloom, BloomSaturation) * BloomIntensity;
+    base = AdjustSaturation(base, BaseSaturation) * BaseIntensity;
+
+    // Darken down the base image in areas where there is a lot of bloom,
+    // to prevent things looking excessively burned-out.
+    base *= (1 - saturate(bloom));
+
+    // Combine the two images.
+    return base + bloom;
+}
+
+
+technique BloomCombine
+{
+    pass Pass1
+    {
+#if SM4		
+		PixelShader = compile ps_4_0_level_9_1 PixelShaderFunction();
+#else
+		PixelShader = compile ps_2_0 PixelShaderFunction();
+#endif
+    }
+}

MGCore/Content/BloomExtract.fx

@@ -0,0 +1,29 @@
+// Pixel shader extracts the brighter areas of an image.
+// This is the first step in applying a bloom postprocess.
+
+sampler TextureSampler : register(s0);
+
+float BloomThreshold;
+
+
+float4 PixelShaderFunction(float2 texCoord : TEXCOORD0) : COLOR0
+{
+    // Look up the original image color.
+    float4 c = tex2D(TextureSampler, texCoord);
+
+    // Adjust it to keep only values brighter than the specified threshold.
+    return saturate((c - BloomThreshold) / (1 - BloomThreshold));
+}
+
+
+technique BloomExtract
+{
+    pass Pass1
+    {
+#if SM4		
+		PixelShader = compile ps_4_0_level_9_1 PixelShaderFunction();
+#else
+		PixelShader = compile ps_2_0 PixelShaderFunction();
+#endif
+    }
+}