Merge pull request #3 from wannkunstbeikor/master

SamboyCoding · Feb 26, 2024 · 90efe72 · 90efe72
2 parents 2010270 + 41a222f
commit 90efe72
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 76 deletions.
diff --git a/OpenTKAvalonia/BaseTkOpenGlControl.cs b/OpenTKAvalonia/BaseTkOpenGlControl.cs
@@ -1,14 +1,14 @@
-using System.Reflection;
+using Avalonia;
 using Avalonia.Input;
-using Avalonia.Input.Raw;
 using Avalonia.OpenGL;
 using Avalonia.OpenGL.Controls;
+using Avalonia.Rendering;
 using Avalonia.Threading;
 using OpenTK.Graphics.OpenGL;
 
 namespace OpenTKAvalonia;
 
-public abstract class BaseTkOpenGlControl : OpenGlControlBase
+public abstract class BaseTkOpenGlControl : OpenGlControlBase, ICustomHitTest
 {
     /// <summary>
     /// KeyboardState provides an easy-to-use, stateful wrapper around Avalonia's Keyboard events, as OpenTK keyboard states are not handled.
@@ -17,23 +17,6 @@ public abstract class BaseTkOpenGlControl : OpenGlControlBase
     public AvaloniaKeyboardState KeyboardState = new();
 
     private AvaloniaTkContext? _avaloniaTkContext;
-    private FieldInfo _depthBufferField = typeof(OpenGlControlBase).GetField("_depthBuffer", BindingFlags.Instance | BindingFlags.NonPublic) ?? throw new("Unable to find _depthBuffer field");
-
-    public BaseTkOpenGlControl()
-    {
-        //Hook all Avalonia keyboard events to allow us to store Keyboard State 
-        InputManager.Instance!.PreProcess.Subscribe(e =>
-        {
-            if (e is not RawKeyEventArgs keyEvent)
-                return;
-
-            if (keyEvent.Type == RawKeyEventType.KeyDown)
-                KeyPressed(keyEvent);
-            else
-                KeyReleased(keyEvent);
-        });
-    }
-
 
     /// <summary>
     /// OpenTkRender is called once a frame to draw to the control.
@@ -71,27 +54,20 @@ protected sealed override void OnOpenGlRender(GlInterface gl, int fb)
         KeyboardState.OnFrame();
 
         //Set up the aspect ratio so shapes aren't stretched.
-        //As avalonia is using this opengl instance internally to render the entire window, stuff gets messy, so we workaround that here
-        //to provide a good experience to the user.
-        var oldViewport = new int[4];
-        GL.GetInteger(GetPName.Viewport, oldViewport);
         GL.Viewport(0, 0, (int) Bounds.Width, (int) Bounds.Height);
 
         //Tell our subclass to render
-        OpenTkRender();
-
-        //Reset viewport after our fix above
-        GL.Viewport(oldViewport[0], oldViewport[1], oldViewport[2], oldViewport[3]);
-
-        //Workaround for avalonia issue #6488, set active texture back to 0
-        GL.ActiveTexture(TextureUnit.Texture0);
+        if (Bounds.Width != 0 && Bounds.Height != 0)
+        {
+            OpenTkRender();
+        }
 
         //Schedule next UI update with avalonia
-        Dispatcher.UIThread.Post(InvalidateVisual, DispatcherPriority.Background);
+        Dispatcher.UIThread.Post(RequestNextFrameRendering, DispatcherPriority.Background);
     }
 
 
-    protected sealed override void OnOpenGlInit(GlInterface gl, int fb)
+    protected sealed override void OnOpenGlInit(GlInterface gl)
     {
         //Initialize the OpenTK<->Avalonia Bridge
         _avaloniaTkContext = new(gl);
@@ -102,36 +78,26 @@ protected sealed override void OnOpenGlInit(GlInterface gl, int fb)
     }
 
     //Simply call the subclass' teardown function
-    protected sealed override void OnOpenGlDeinit(GlInterface gl, int fb)
+    protected sealed override void OnOpenGlDeinit(GlInterface gl)
     {
         OpenTkTeardown();
-
-        //Workaround an avalonia issue where the depth buffer ID is not cleared
-        //which causes depth problems (see issue #1 on this repo)
-        _depthBufferField.SetValue(this, 0);
     }
 
-    /// <summary>
-    /// Handles avalonia key down events, and sets the keyboard state
-    /// </summary>
-    /// <param name="e">The event</param>
-    private void KeyPressed(RawKeyEventArgs e)
+    protected override void OnKeyDown(KeyEventArgs e)
     {
         if (!IsEffectivelyVisible)
             return;
 
         KeyboardState.SetKey(e.Key, true);
     }
-
-    /// <summary>
-    /// Handles avalonia key up events, and sets the keyboard state
-    /// </summary>
-    /// <param name="e">The event</param>
-    private void KeyReleased(RawKeyEventArgs e)
+
+    protected override void OnKeyUp(KeyEventArgs e)
     {
         if (!IsEffectivelyVisible)
             return;
 
         KeyboardState.SetKey(e.Key, false);
     }
+
+    public bool HitTest(Point point) => Bounds.Contains(point);
 }
diff --git a/OpenTKAvalonia/OpenTKAvalonia.csproj b/OpenTKAvalonia/OpenTKAvalonia.csproj
@@ -9,11 +9,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Avalonia" Version="0.10.12" />
-      <PackageReference Include="Avalonia.Desktop" Version="0.10.12" />
-      <PackageReference Include="OpenTK.Graphics" Version="4.6.7" />
-      <PackageReference Include="OpenTK.Input" Version="4.6.7" />
-      <PackageReference Include="OpenTK.Windowing.Common" Version="4.6.7" />
+      <PackageReference Include="Avalonia" Version="11.0.9" />
+      <PackageReference Include="Avalonia.Desktop" Version="11.0.9" />
+      <PackageReference Include="OpenTK.Graphics" Version="4.8.2" />
+      <PackageReference Include="OpenTK.Input" Version="4.8.2" />
+      <PackageReference Include="OpenTK.Windowing.Common" Version="4.8.2" />
     </ItemGroup>
 
 </Project>
diff --git a/README.md b/README.md
@@ -3,8 +3,7 @@
 OpenTKAvalonia is a simple wrapper to provide OpenTK OpenGL bindings for Avalonia, and a control which handles some of 
 the heavy lifting for you.
 
-This includes setting up the OpenGL bindings, setting up the aspect ratio so anything you draw looks as expected, 
-working around avalonia bug 6488 (where failing to reset the active texture causes all controls to become invisible),
+This includes setting up the OpenGL bindings, setting up the aspect ratio so anything you draw looks as expected,
 providing events for Initialization, Teardown, and Render, and providing a KeyboardState API for detecting keyboard input.
 
 The library is somewhat work-in-progress but it currently functions for simple applications, and there is a sample included.
@@ -15,12 +14,12 @@ switching the default rendering mode, like so:
 public static AppBuilder BuildAvaloniaApp()
             => AppBuilder.Configure<App>()
                 .UsePlatformDetect()
-                .With(new Win32PlatformOptions() {UseWgl = true}) //This line is the important one.
+                .With(new Win32PlatformOptions { RenderingMode = new Collection<Win32RenderingMode> { Win32RenderingMode.Wgl } }) //This line is the important one.
                 .LogToTrace();
 ```
 Without this, your control simply will never receive any of the OpenTK events (Initialization, Teardown, and Render).
 
-The library itself is netstandard2.1, because that's what OpenTK requires, and the sample is net6.0.
+The library itself is netstandard2.1, because that's what OpenTK requires, and the sample is net7.0.
 
 ## Demonstration
 

diff --git a/Samples/BasicCubeSample/App.axaml b/Samples/BasicCubeSample/App.axaml
@@ -2,6 +2,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="BasicCubeSample.App">
     <Application.Styles>
-        <FluentTheme Mode="Light"/>
+        <FluentTheme/>
     </Application.Styles>
 </Application>
diff --git a/Samples/BasicCubeSample/BasicCubeSample.csproj b/Samples/BasicCubeSample/BasicCubeSample.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net7</TargetFramework>
         <Nullable>enable</Nullable>
     </PropertyGroup>
     <ItemGroup>
@@ -17,11 +17,12 @@
         </None>
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="0.10.12" />
-        <PackageReference Include="Avalonia.Desktop" Version="0.10.12" />
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.12" />
-        <PackageReference Include="OpenTK" Version="4.6.7" />
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.9" />
+        <PackageReference Include="Avalonia" Version="11.0.9" />
+        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.9" />
+        <PackageReference Include="OpenTK" Version="4.8.2" />
+        <PackageReference Include="OpenTK.Graphics" Version="4.8.2" />
         <PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" />
     </ItemGroup>
     <ItemGroup>

diff --git a/Samples/BasicCubeSample/Program.cs b/Samples/BasicCubeSample/Program.cs
@@ -1,7 +1,6 @@
 using System;
+using System.Collections.ObjectModel;
 using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Controls.ApplicationLifetimes;
 
 namespace BasicCubeSample
 {
@@ -18,7 +17,8 @@ public static void Main(string[] args) => BuildAvaloniaApp()
         public static AppBuilder BuildAvaloniaApp()
             => AppBuilder.Configure<App>()
                 .UsePlatformDetect()
-                .With(new Win32PlatformOptions() {UseWgl = true})
+                .With(new Win32PlatformOptions
+                    { RenderingMode = new Collection<Win32RenderingMode> { Win32RenderingMode.Wgl } })
                 .LogToTrace();
     }
 }
diff --git a/Samples/ResizableAndHidableSample/App.axaml b/Samples/ResizableAndHidableSample/App.axaml
@@ -2,6 +2,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="NonFullScreenSample.App">
     <Application.Styles>
-        <FluentTheme Mode="Light"/>
+        <FluentTheme />
     </Application.Styles>
 </Application>
diff --git a/Samples/ResizableAndHidableSample/Program.cs b/Samples/ResizableAndHidableSample/Program.cs
@@ -1,7 +1,6 @@
 using System;
+using System.Collections.ObjectModel;
 using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Controls.ApplicationLifetimes;
 
 namespace NonFullScreenSample
 {
@@ -18,7 +17,8 @@ public static void Main(string[] args) => BuildAvaloniaApp()
         public static AppBuilder BuildAvaloniaApp()
             => AppBuilder.Configure<App>()
                 .UsePlatformDetect()
-                .With(new Win32PlatformOptions() {UseWgl = true})
+                .With(new Win32PlatformOptions
+                    { RenderingMode = new Collection<Win32RenderingMode> { Win32RenderingMode.Wgl } })
                 .LogToTrace();
     }
 }
diff --git a/Samples/ResizableAndHidableSample/ResizableAndHidableSample.csproj b/Samples/ResizableAndHidableSample/ResizableAndHidableSample.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net7</TargetFramework>
         <Nullable>enable</Nullable>
         <RootNamespace>NonFullScreenSample</RootNamespace>
     </PropertyGroup>
@@ -18,11 +18,14 @@
         </None>
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="0.10.12" />
-        <PackageReference Include="Avalonia.Desktop" Version="0.10.12" />
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.12" />
-        <PackageReference Include="OpenTK" Version="4.6.7" />
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.9" />
+        <PackageReference Include="Avalonia" Version="11.0.9" />
+        <PackageReference Include="Avalonia.Desktop" Version="11.0.9" />
+        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.9" />
+        <PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
+        <PackageReference Include="OpenTK" Version="4.8.2" />
+        <PackageReference Include="OpenTK.Graphics" Version="4.8.2" />
         <PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" />
     </ItemGroup>
     <ItemGroup>