Cleanup of control code, enable MSAA, improvements to event handling

.editorconfig

@@ -0,0 +1,4 @@
+[*.cs]
+
+# IDE0090: Use 'new(...)'
+csharp_style_implicit_object_creation_when_type_is_apparent = false

GLWpfControl.sln

@@ -23,6 +23,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GLWpfControl", "src\GLWpfCo
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example", "src\Example\Example.csproj", "{7E12D07B-0DD6-4288-A4F8-92EB75848ECF}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{441E95E4-0A78-4121-A68C-C778C8050489}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

README.md

@@ -7,11 +7,11 @@ Supported configurations:
 - .Net Framework for OpenTK 3.x (the 3.x series NuGet packages)
 - .Net Core for OpenTK 4.x (the 4.x series NuGet packages)
 
-Since version 3.0.0, we're using full OpenGL/DirectX interop via OpenGL extensions - [NV_DX_interop](https://www.khronos.org/registry/OpenGL/extensions/NV/WGL_NV_DX_interop.txt). This should run almost everywhere with **AMAZING PERFORMANCE** and is fully supported on Intel, AMD and Nvidia graphics.
+Since version 3.0.0, we're using full OpenGL/DirectX interop via OpenGL extensions - [NV_DX_interop](https://www.khronos.org/registry/OpenGL/extensions/NV/WGL_NV_DX_interop.txt).
+This should run almost everywhere with **AMAZING PERFORMANCE** and is fully supported on Intel, AMD and Nvidia graphics.
 
-This offers a way more clean solution than embedding GLControl and totally solves [the airspace problem](https://stackoverflow.com/questions/8006092/controls-dont-show-over-winforms-host). As controls can be layered, nested and structured over your 3D view.
-
-This package is intended to supercede the legacy *GLControl* completely, and we strongly encourage upgrading to this native WPF control instead.
+This offers a way more clean solution than embedding GLControl and totally solves [the airspace problem](https://stackoverflow.com/questions/8006092/controls-dont-show-over-winforms-host).
+As controls can be layered, nested and structured over your 3D view.
 
 ## Getting started:
 
@@ -56,44 +56,14 @@ This package is intended to supercede the legacy *GLControl* completely, and we
     ```
 For additional examples, see [MainWindow.xaml](https://github.com/opentk/GLWpfControl/blob/master/src/Example/MainWindow.xaml) and [MainWindow.xaml.cs](https://github.com/opentk/GLWpfControl/blob/master/src/Example/MainWindow.xaml.cs) in the example project.
 
-### I'm having trouble with Keyboard and Mouse Input!?
-
-The current design has some issues based around polling for keyboard and mouse input due to the way the control was initially designed.
-
-If you want to handle keyboard input for the control when it is not focused, this is a feature we're currently looking into fixing. However, if you just want to handle keyboard input when the control has focus there's a little additional logic that must be implemented:
-
-1. Before calling `Start()` add the following to ensure that you can hook onto events via the control:
-
-```csharp
-this.glWpfControl.RegisterToEventsDirectly = false;
-this.glWpfControl.CanInvokeOnHandledEvents = false;
+### I can't receive keyboard input when my control doesn't have keyboard focus!
 
-this.glWpfControl.MouseDown += this.GlWpfControl_MouseDown;
-this.glWpfControl.MouseEnter += this.GlWpfControl_MouseEnter;
-this.glWpfControl.MouseLeave += this.GlWpfControl_MouseLeave;
-```
+WPF by design only sends keyboard events to the control that has keybaord focus. To be able to get keyboard focus a control needs to have `Focusable==true` (this is the default for GLWpfControl) and `IsVisible==true`.
 
-2. Next, in the mouse event handlers you want to call `Focus()` for the control:
+If you however need to get keyboard events idependent of keyboard focus you will have to use the `Keyboard.AddPreview*` functions.
+These functions allow you to register a preview event that is called before the control with keyboard focus gets the keyboard event.
 
-```csharp
-    private void GlWpfControl_MouseLeave(object sender, System.Windows.Input.MouseEventArgs e)
-    {
-        // When the mouse is leaving, lose focus so the keyboard cannot invoke events.
-        var scope = FocusManager.GetFocusScope(this.glWpfControl);
-        FocusManager.SetFocusedElement(scope, null);
-        System.Windows.Input.Keyboard.ClearFocus();
-    }
-
-    private void GlWpfControl_MouseEnter(object sender, System.Windows.Input.MouseEventArgs e)
-    {
-        this.glWpfControl.Focus();
-    }
-
-    private void GlWpfControl_MouseDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
-    {
-        this.glWpfControl.Focus();
-    }
-```
+See [Example](./src/Example/TabbedMainWindowTest.xaml.cs) for an example how to set this up.
 
 ## Build instructions
 
@@ -115,4 +85,7 @@ this.glWpfControl.MouseLeave += this.GlWpfControl_MouseLeave;
 
 #### DX-Hijacking rendering
 
-It's possible to bypass the RTT that takes place in WPF D3dImage by stealing the actual D3d handle from WPF and drawing manually. This is incredibly challenging, but would offer APEX performance as zero indirection is required. Currently more of an idea than a work in progress. Contributions welcome - Drop by the [Discord](https://discord.gg/6HqD48s) server if you want to give this a shot!
+It's possible to bypass the RTT that takes place in WPF D3dImage by stealing the actual D3d handle from WPF and drawing manually.
+This is incredibly challenging, but would offer APEX performance as zero indirection is required.
+Currently more of an idea than a work in progress.
+Contributions welcome - Drop by the [Discord](https://discord.gg/6HqD48s) server if you want to give this a shot!

src/Example/Example.csproj

@@ -1,18 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <UseWPF>true</UseWPF>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <StartupObject>Example.App</StartupObject>
+  </PropertyGroup>
 
-    <PropertyGroup>
-        <OutputType>WinExe</OutputType>
-        <TargetFramework>netcoreapp3.1-windows</TargetFramework>
-        <UseWPF>true</UseWPF>
-        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-        <StartupObject>Example.App</StartupObject>
-    </PropertyGroup>
+  <ItemGroup>
+    <None Include="..\..\.editorconfig" Link=".editorconfig" />
+  </ItemGroup>
 
-    <ItemGroup>
-      <ProjectReference Include="..\GLWpfControl\GLWpfControl.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\GLWpfControl\GLWpfControl.csproj" />
+  </ItemGroup>
 
-    <ItemGroup>
-      <PackageReference Include="OpenTK" Version="4.7.5" />
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="OpenTK" Version="4.8.2" />
+  </ItemGroup>
 </Project>

src/Example/ExampleScene.cs

@@ -1,40 +1,132 @@
 using System;
 using System.Diagnostics;
+using System.Runtime.CompilerServices;
 using OpenTK.Graphics.OpenGL;
 using OpenTK.Mathematics;
 
 namespace Example {
     /// Example class handling the rendering for OpenGL.
-    public static class ExampleScene {
+    public class ExampleScene {
 
         private static readonly Stopwatch _stopwatch = Stopwatch.StartNew();
 
-        public static void Ready() {
-            Console.WriteLine("GlWpfControl is now ready");
-            GL.Enable(EnableCap.Blend);
-            GL.Enable(EnableCap.DepthTest);
-            GL.Enable(EnableCap.ScissorTest);
+        private int Program;
+
+        private int VAO;
+        private int VBO;
+
+        struct Vertex
+        {
+            public Vector2 Position;
+            public Color4 Color;
+
+            public Vertex(Vector2 position, Color4 color)
+            {
+                Position = position;
+                Color = color;
+            }
+        }
+
+        private static readonly Vertex[] vertices =
+        {
+            new Vertex((0.0f, 0.5f), Color4.Red),
+            new Vertex((0.58f, -0.5f), Color4.Green),
+            new Vertex((-0.58f, -0.5f), Color4.Blue),
+        };
+
+        private static readonly string VertexShaderSource = 
+@"#version 330 core
+
+in vec2 vPosition;
+in vec4 vColor;
+
+out vec4 fColor;
+
+void main()
+{
+    gl_Position = vec4(vPosition, 0, 1);
+    fColor = vColor;
+}
+";
+
+        private static readonly string FragmentShaderSource =
+@"#version 330 core
+
+in vec4 fColor;
+
+out vec4 oColor;
+
+void main()
+{
+    oColor = fColor;
+}
+";
+
+        public void Initialize()
+        {
+            Program = GL.CreateProgram();
+
+            int vertexShader = GL.CreateShader(ShaderType.VertexShader);
+            GL.ShaderSource(vertexShader, VertexShaderSource);
+            GL.CompileShader(vertexShader);
+            GL.GetShader(vertexShader, ShaderParameter.CompileStatus, out int success);
+            if (success == 0)
+            {
+                string log = GL.GetShaderInfoLog(vertexShader);
+                Debug.WriteLine($"Vertex shader compile error: {log}");
+            }
+
+            int fragmentShader = GL.CreateShader(ShaderType.FragmentShader);
+            GL.ShaderSource(fragmentShader, FragmentShaderSource);
+            GL.CompileShader(fragmentShader);
+            GL.GetShader(fragmentShader, ShaderParameter.CompileStatus, out success);
+            if (success == 0)
+            {
+                string log = GL.GetShaderInfoLog(fragmentShader);
+                Debug.WriteLine($"Fragment shader compile error: {log}");
+            }
+
+            GL.AttachShader(Program, vertexShader);
+            GL.AttachShader(Program, fragmentShader);
+            GL.LinkProgram(Program);
+            GL.GetProgram(Program, GetProgramParameterName.LinkStatus, out success);
+            if (success == 0)
+            {
+                string log = GL.GetProgramInfoLog(Program);
+                Debug.WriteLine($"Program link error: {log}");
+            }
+
+            GL.DetachShader(Program, vertexShader);
+            GL.DetachShader(Program, fragmentShader);
+
+            GL.DeleteShader(vertexShader);
+            GL.DeleteShader(fragmentShader);
+
+            int positionLocation = GL.GetAttribLocation(Program, "vPosition");
+            int colorLocation = GL.GetAttribLocation(Program, "vColor");
+
+            VAO = GL.GenVertexArray();
+            GL.BindVertexArray(VAO);
+
+            VBO = GL.GenBuffer();
+            GL.BindBuffer(BufferTarget.ArrayBuffer, VBO);
+            GL.BufferData(BufferTarget.ArrayBuffer, vertices.Length * Unsafe.SizeOf<Vertex>(), vertices, BufferUsageHint.StaticDraw);
+
+            GL.EnableVertexAttribArray(positionLocation);
+            GL.VertexAttribPointer(positionLocation, 2, VertexAttribPointerType.Float, false, Unsafe.SizeOf<Vertex>(), 0);
+
+            GL.EnableVertexAttribArray(colorLocation);
+            GL.VertexAttribPointer(colorLocation, 4, VertexAttribPointerType.Float, false, Unsafe.SizeOf<Vertex>(), Unsafe.SizeOf<Vector2>());
         }
 
-        public static void Render(float alpha = 1.0f) {
+        public void Render(float alpha = 1.0f) {
             var hue = (float) _stopwatch.Elapsed.TotalSeconds * 0.15f % 1;
             var c = Color4.FromHsv(new Vector4(alpha * hue, alpha * 0.75f, alpha * 0.75f, alpha));
             GL.ClearColor(c);
             GL.Clear(ClearBufferMask.ColorBufferBit | ClearBufferMask.DepthBufferBit);
-            GL.LoadIdentity();
-            GL.Begin(PrimitiveType.Triangles);
-
-            GL.Color4(Color4.Red);
-            GL.Vertex2(0.0f, 0.5f);
-
-            GL.Color4(Color4.Green);
-            GL.Vertex2(0.58f, -0.5f);
-
-            GL.Color4(Color4.Blue);
-            GL.Vertex2(-0.58f, -0.5f);
 
-            GL.End();
-            GL.Finish();
+            GL.UseProgram(Program);
+            GL.DrawArrays(PrimitiveType.Triangles, 0, 3);
         }
     }
 }

src/Example/MainWindow.xaml

@@ -15,8 +15,8 @@
             Render="OpenTkControl_OnRender">
 
             <glWpfControl:GLWpfControl.Settings>
-                <glWpfControl:GLWpfControlSettings MajorVersion="2"
-                                                   MinorVersion="1"/>
+                <glWpfControl:GLWpfControlSettings MajorVersion="3"
+                                                   MinorVersion="3"/>
             </glWpfControl:GLWpfControl.Settings>
 
         </glWpfControl:GLWpfControl>

src/Example/MainWindow.xaml.cs

@@ -7,11 +7,16 @@ namespace Example {
     ///     Interaction logic for MainWindow.xaml
     /// </summary>
     public sealed partial class MainWindow {
+
+        ExampleScene mainScene = new ExampleScene();
+        ExampleScene insetScene = new ExampleScene();
+
         public MainWindow() {
             InitializeComponent();
 
             // You can start and rely on the Settings property that may be set in XAML or elsewhere in the codebase.
             OpenTkControl.Start();
+            mainScene.Initialize();
 
             // Or, you can suppy a settings object directly.
             InsetControl.Start(new GLWpfControlSettings()
@@ -20,14 +25,15 @@ public MainWindow() {
                 MinorVersion = 1,
                 RenderContinuously = false,
             });
+            insetScene.Initialize();
         }
 
         private void OpenTkControl_OnRender(TimeSpan delta) {
-            ExampleScene.Render();
+            mainScene.Render();
         }
 
         private void InsetControl_OnRender(TimeSpan delta) {
-            ExampleScene.Render();
+            insetScene.Render();
         }
 
         private void RedrawButton_OnClick(object sender, RoutedEventArgs e) {