From c5e84ff02e6e6d90f714c6955d96d9bc671d3864 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Thu, 18 Mar 2021 11:07:18 +1000 Subject: [PATCH] Create new project Bizware.OpenTK3 from Bizware.BizwareGL and EmuHawk --- BizHawk.sln | 6 ++++++ src/BizHawk.Bizware.BizwareGL/Art.cs | 4 ++-- .../BizHawk.Bizware.BizwareGL.csproj | 1 - .../BizHawk.Bizware.DirectX.csproj | 3 ++- src/BizHawk.Bizware.DirectX/IGL_SlimDX9.cs | 2 ++ .../BizHawk.Bizware.OpenTK3.csproj | 16 ++++++++++++++++ .../GraphicsControl_TK.cs | 4 +++- .../GuiRenderer.cs | 4 +++- .../IGL_TK.cs | 5 +++-- .../OTK_Gamepad.cs | 2 +- .../OTK_Keyboard.cs | 2 +- .../OpenALSoundOutput.cs | 2 +- .../OpenTKConfigurator.cs | 4 +--- .../OpenTKInputAdapter.cs | 2 +- .../RenderStates.cs | 4 +++- .../BizHawk.Client.EmuHawk.csproj | 1 - .../DisplayManager/DisplayManager.cs | 1 + src/BizHawk.Client.EmuHawk/GLManager.cs | 1 + .../GraphicsImplementations/IGLExtensions.cs | 1 + .../RetainedGraphicsControl.cs | 1 + src/BizHawk.Client.EmuHawk/Input/Input.cs | 1 + src/BizHawk.Client.EmuHawk/MainForm.Events.cs | 1 + src/BizHawk.Client.EmuHawk/Program.cs | 2 +- src/BizHawk.Client.EmuHawk/Sound/Sound.cs | 1 + 24 files changed, 53 insertions(+), 18 deletions(-) create mode 100644 src/BizHawk.Bizware.OpenTK3/BizHawk.Bizware.OpenTK3.csproj rename src/{BizHawk.Client.EmuHawk/GraphicsImplementations => BizHawk.Bizware.OpenTK3}/GraphicsControl_TK.cs (92%) rename src/{BizHawk.Bizware.BizwareGL => BizHawk.Bizware.OpenTK3}/GuiRenderer.cs (95%) rename src/{BizHawk.Client.EmuHawk/GraphicsImplementations => BizHawk.Bizware.OpenTK3}/IGL_TK.cs (96%) rename src/{BizHawk.Client.EmuHawk/Input => BizHawk.Bizware.OpenTK3}/OTK_Gamepad.cs (99%) rename src/{BizHawk.Client.EmuHawk/Input => BizHawk.Bizware.OpenTK3}/OTK_Keyboard.cs (99%) rename src/{BizHawk.Client.EmuHawk/Sound/Output => BizHawk.Bizware.OpenTK3}/OpenALSoundOutput.cs (95%) rename src/{BizHawk.Bizware.BizwareGL => BizHawk.Bizware.OpenTK3}/OpenTKConfigurator.cs (93%) rename src/{BizHawk.Client.EmuHawk/Input => BizHawk.Bizware.OpenTK3}/OpenTKInputAdapter.cs (96%) rename src/{BizHawk.Bizware.BizwareGL => BizHawk.Bizware.OpenTK3}/RenderStates.cs (90%) diff --git a/BizHawk.sln b/BizHawk.sln index b901eea17e..e6f0866b28 100644 --- a/BizHawk.sln +++ b/BizHawk.sln @@ -47,6 +47,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.Bizware.BizwareGL", EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Bizware.DirectX", "src\BizHawk.Bizware.DirectX\BizHawk.Bizware.DirectX.csproj", "{A914D063-9E4B-4086-B156-7B3F39E33DB2}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Bizware.OpenTK3", "src\BizHawk.Bizware.OpenTK3\BizHawk.Bizware.OpenTK3.csproj", "{1FF433CC-96E1-4F14-B673-CDA7190169C9}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.BizInvoke", "src\BizHawk.BizInvoke\BizHawk.BizInvoke.csproj", "{E5D76DC1-84A8-47AF-BE25-E76F06D2FBBC}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.WinForms.Controls", "src\BizHawk.WinForms.Controls\BizHawk.WinForms.Controls.csproj", "{B5A2214B-3CB0-48C4-8DB1-98B38D48AC4A}" @@ -101,6 +103,10 @@ Global {A914D063-9E4B-4086-B156-7B3F39E33DB2}.Debug|Any CPU.Build.0 = Debug|Any CPU {A914D063-9E4B-4086-B156-7B3F39E33DB2}.Release|Any CPU.ActiveCfg = Release|Any CPU {A914D063-9E4B-4086-B156-7B3F39E33DB2}.Release|Any CPU.Build.0 = Release|Any CPU + {1FF433CC-96E1-4F14-B673-CDA7190169C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1FF433CC-96E1-4F14-B673-CDA7190169C9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1FF433CC-96E1-4F14-B673-CDA7190169C9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1FF433CC-96E1-4F14-B673-CDA7190169C9}.Release|Any CPU.Build.0 = Release|Any CPU {E5D76DC1-84A8-47AF-BE25-E76F06D2FBBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E5D76DC1-84A8-47AF-BE25-E76F06D2FBBC}.Debug|Any CPU.Build.0 = Debug|Any CPU {E5D76DC1-84A8-47AF-BE25-E76F06D2FBBC}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/src/BizHawk.Bizware.BizwareGL/Art.cs b/src/BizHawk.Bizware.BizwareGL/Art.cs index fbfd3ea11a..d933a8a6a9 100644 --- a/src/BizHawk.Bizware.BizwareGL/Art.cs +++ b/src/BizHawk.Bizware.BizwareGL/Art.cs @@ -15,13 +15,13 @@ namespace BizHawk.Bizware.BizwareGL Height = tex.Height; } - internal Art(ArtManager owner) + public Art(ArtManager owner) { Owner = owner; } public ArtManager Owner { get; } - public Texture2d BaseTexture { get; internal set; } + public Texture2d BaseTexture { get; set; } public float Width, Height; public float u0, v0, u1, v1; diff --git a/src/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj b/src/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj index 6293786b9c..b6268e8779 100644 --- a/src/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj +++ b/src/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj @@ -11,7 +11,6 @@ - diff --git a/src/BizHawk.Bizware.DirectX/BizHawk.Bizware.DirectX.csproj b/src/BizHawk.Bizware.DirectX/BizHawk.Bizware.DirectX.csproj index 4dd9dfe238..205ba5dade 100644 --- a/src/BizHawk.Bizware.DirectX/BizHawk.Bizware.DirectX.csproj +++ b/src/BizHawk.Bizware.DirectX/BizHawk.Bizware.DirectX.csproj @@ -10,6 +10,7 @@ - + + diff --git a/src/BizHawk.Bizware.DirectX/IGL_SlimDX9.cs b/src/BizHawk.Bizware.DirectX/IGL_SlimDX9.cs index 616897460a..5af3817b9d 100644 --- a/src/BizHawk.Bizware.DirectX/IGL_SlimDX9.cs +++ b/src/BizHawk.Bizware.DirectX/IGL_SlimDX9.cs @@ -3,7 +3,9 @@ using System.IO; using System.Collections.Generic; using System.Drawing; using System.Threading; + using BizHawk.Bizware.BizwareGL; +using BizHawk.Bizware.OpenTK3; using SlimDX.Direct3D9; diff --git a/src/BizHawk.Bizware.OpenTK3/BizHawk.Bizware.OpenTK3.csproj b/src/BizHawk.Bizware.OpenTK3/BizHawk.Bizware.OpenTK3.csproj new file mode 100644 index 0000000000..40a6608407 --- /dev/null +++ b/src/BizHawk.Bizware.OpenTK3/BizHawk.Bizware.OpenTK3.csproj @@ -0,0 +1,16 @@ + + + net48 + + + + true + disable + + + + + + + + diff --git a/src/BizHawk.Client.EmuHawk/GraphicsImplementations/GraphicsControl_TK.cs b/src/BizHawk.Bizware.OpenTK3/GraphicsControl_TK.cs similarity index 92% rename from src/BizHawk.Client.EmuHawk/GraphicsImplementations/GraphicsControl_TK.cs rename to src/BizHawk.Bizware.OpenTK3/GraphicsControl_TK.cs index de4abd48e3..e1ceb5dafd 100644 --- a/src/BizHawk.Client.EmuHawk/GraphicsImplementations/GraphicsControl_TK.cs +++ b/src/BizHawk.Bizware.OpenTK3/GraphicsControl_TK.cs @@ -1,9 +1,11 @@ using System.Windows.Forms; + using BizHawk.Bizware.BizwareGL; + using OpenTK; using OpenTK.Graphics; -namespace BizHawk.Client.EmuHawk +namespace BizHawk.Bizware.OpenTK3 { internal class GLControlWrapper : GLControl, IGraphicsControl { diff --git a/src/BizHawk.Bizware.BizwareGL/GuiRenderer.cs b/src/BizHawk.Bizware.OpenTK3/GuiRenderer.cs similarity index 95% rename from src/BizHawk.Bizware.BizwareGL/GuiRenderer.cs rename to src/BizHawk.Bizware.OpenTK3/GuiRenderer.cs index a0b89b7ad5..c9729793cc 100644 --- a/src/BizHawk.Bizware.BizwareGL/GuiRenderer.cs +++ b/src/BizHawk.Bizware.OpenTK3/GuiRenderer.cs @@ -5,9 +5,11 @@ using System; using System.Diagnostics; +using BizHawk.Bizware.BizwareGL; + using sd = System.Drawing; -namespace BizHawk.Bizware.BizwareGL +namespace BizHawk.Bizware.OpenTK3 { /// /// A simple renderer useful for rendering GUI stuff. diff --git a/src/BizHawk.Client.EmuHawk/GraphicsImplementations/IGL_TK.cs b/src/BizHawk.Bizware.OpenTK3/IGL_TK.cs similarity index 96% rename from src/BizHawk.Client.EmuHawk/GraphicsImplementations/IGL_TK.cs rename to src/BizHawk.Bizware.OpenTK3/IGL_TK.cs index 2d0735e4c0..677a60b7f4 100644 --- a/src/BizHawk.Client.EmuHawk/GraphicsImplementations/IGL_TK.cs +++ b/src/BizHawk.Bizware.OpenTK3/IGL_TK.cs @@ -16,6 +16,7 @@ using BizHawk.Common; using OpenTK; using OpenTK.Graphics; using OpenTK.Graphics.OpenGL; +using OpenTK.Platform; using BizGL = BizHawk.Bizware.BizwareGL; using BlendEquationMode = OpenTK.Graphics.OpenGL.BlendEquationMode; @@ -31,7 +32,7 @@ using Vector2 = BizHawk.Bizware.BizwareGL.Vector2; using Vector4 = BizHawk.Bizware.BizwareGL.Vector4; using VertexAttribPointerType = OpenTK.Graphics.OpenGL.VertexAttribPointerType; -namespace BizHawk.Client.EmuHawk +namespace BizHawk.Bizware.OpenTK3 { /// /// OpenTK implementation of the BizwareGL.IGL interface. @@ -819,7 +820,7 @@ namespace BizHawk.Client.EmuHawk MakeContextCurrent(this.GraphicsContext,OffscreenNativeWindow.WindowInfo); } - internal void MakeContextCurrent(IGraphicsContext context, global::OpenTK.Platform.IWindowInfo windowInfo) + internal void MakeContextCurrent(IGraphicsContext context, IWindowInfo windowInfo) { context.MakeCurrent(windowInfo); PurgeStateCache(); diff --git a/src/BizHawk.Client.EmuHawk/Input/OTK_Gamepad.cs b/src/BizHawk.Bizware.OpenTK3/OTK_Gamepad.cs similarity index 99% rename from src/BizHawk.Client.EmuHawk/Input/OTK_Gamepad.cs rename to src/BizHawk.Bizware.OpenTK3/OTK_Gamepad.cs index 4612108520..b03fc8bb1c 100644 --- a/src/BizHawk.Client.EmuHawk/Input/OTK_Gamepad.cs +++ b/src/BizHawk.Bizware.OpenTK3/OTK_Gamepad.cs @@ -6,7 +6,7 @@ using OpenTK.Input; using OpenTKGamePad = OpenTK.Input.GamePad; -namespace BizHawk.Client.EmuHawk +namespace BizHawk.Bizware.OpenTK3 { /// /// Modified OpenTK Gamepad Handler
diff --git a/src/BizHawk.Client.EmuHawk/Input/OTK_Keyboard.cs b/src/BizHawk.Bizware.OpenTK3/OTK_Keyboard.cs similarity index 99% rename from src/BizHawk.Client.EmuHawk/Input/OTK_Keyboard.cs rename to src/BizHawk.Bizware.OpenTK3/OTK_Keyboard.cs index 8b84bdfd94..a50947f2e9 100644 --- a/src/BizHawk.Client.EmuHawk/Input/OTK_Keyboard.cs +++ b/src/BizHawk.Bizware.OpenTK3/OTK_Keyboard.cs @@ -7,7 +7,7 @@ using BizHawk.Client.Common; using OpenTK.Input; -namespace BizHawk.Client.EmuHawk +namespace BizHawk.Bizware.OpenTK3 { public static class OTK_Keyboard { diff --git a/src/BizHawk.Client.EmuHawk/Sound/Output/OpenALSoundOutput.cs b/src/BizHawk.Bizware.OpenTK3/OpenALSoundOutput.cs similarity index 95% rename from src/BizHawk.Client.EmuHawk/Sound/Output/OpenALSoundOutput.cs rename to src/BizHawk.Bizware.OpenTK3/OpenALSoundOutput.cs index 863a3819f0..ee93abb514 100644 --- a/src/BizHawk.Client.EmuHawk/Sound/Output/OpenALSoundOutput.cs +++ b/src/BizHawk.Bizware.OpenTK3/OpenALSoundOutput.cs @@ -7,7 +7,7 @@ using BizHawk.Client.Common; using OpenTK.Audio; using OpenTK.Audio.OpenAL; -namespace BizHawk.Client.EmuHawk +namespace BizHawk.Bizware.OpenTK3 { public class OpenALSoundOutput : ISoundOutput { diff --git a/src/BizHawk.Bizware.BizwareGL/OpenTKConfigurator.cs b/src/BizHawk.Bizware.OpenTK3/OpenTKConfigurator.cs similarity index 93% rename from src/BizHawk.Bizware.BizwareGL/OpenTKConfigurator.cs rename to src/BizHawk.Bizware.OpenTK3/OpenTKConfigurator.cs index 1ddc53bc1e..a1d9738a8b 100644 --- a/src/BizHawk.Bizware.BizwareGL/OpenTKConfigurator.cs +++ b/src/BizHawk.Bizware.OpenTK3/OpenTKConfigurator.cs @@ -1,8 +1,6 @@ -using System; - using OpenTK; -namespace BizHawk.Bizware.BizwareGL +namespace BizHawk.Bizware.OpenTK3 { public static class OpenTKConfigurator { diff --git a/src/BizHawk.Client.EmuHawk/Input/OpenTKInputAdapter.cs b/src/BizHawk.Bizware.OpenTK3/OpenTKInputAdapter.cs similarity index 96% rename from src/BizHawk.Client.EmuHawk/Input/OpenTKInputAdapter.cs rename to src/BizHawk.Bizware.OpenTK3/OpenTKInputAdapter.cs index dfb15db9db..99ddcab0c8 100644 --- a/src/BizHawk.Client.EmuHawk/Input/OpenTKInputAdapter.cs +++ b/src/BizHawk.Bizware.OpenTK3/OpenTKInputAdapter.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using BizHawk.Client.Common; -namespace BizHawk.Client.EmuHawk +namespace BizHawk.Bizware.OpenTK3 { public sealed class OpenTKInputAdapter : IHostInputAdapter { diff --git a/src/BizHawk.Bizware.BizwareGL/RenderStates.cs b/src/BizHawk.Bizware.OpenTK3/RenderStates.cs similarity index 90% rename from src/BizHawk.Bizware.BizwareGL/RenderStates.cs rename to src/BizHawk.Bizware.OpenTK3/RenderStates.cs index 3e3de5d9b9..b6280889b0 100644 --- a/src/BizHawk.Bizware.BizwareGL/RenderStates.cs +++ b/src/BizHawk.Bizware.OpenTK3/RenderStates.cs @@ -1,4 +1,6 @@ -namespace BizHawk.Bizware.BizwareGL +using BizHawk.Bizware.BizwareGL; + +namespace BizHawk.Bizware.OpenTK3 { /// /// An IBlendState token that just caches all the args needed to create a blend state diff --git a/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj index f77b6cc9d8..f608aaaefd 100755 --- a/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj +++ b/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj @@ -20,7 +20,6 @@ - diff --git a/src/BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs b/src/BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs index e1d1b40e08..d9740fc108 100644 --- a/src/BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs +++ b/src/BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs @@ -13,6 +13,7 @@ using System.Windows.Forms; using BizHawk.Bizware.BizwareGL; using BizHawk.Bizware.DirectX; +using BizHawk.Bizware.OpenTK3; using BizHawk.Client.Common; using BizHawk.Client.Common.Filters; using BizHawk.Client.Common.FilterManager; diff --git a/src/BizHawk.Client.EmuHawk/GLManager.cs b/src/BizHawk.Client.EmuHawk/GLManager.cs index 467a0a22b5..b02dcdff24 100644 --- a/src/BizHawk.Client.EmuHawk/GLManager.cs +++ b/src/BizHawk.Client.EmuHawk/GLManager.cs @@ -1,6 +1,7 @@ using System; using BizHawk.Bizware.BizwareGL; using BizHawk.Bizware.DirectX; +using BizHawk.Bizware.OpenTK3; namespace BizHawk.Client.EmuHawk { diff --git a/src/BizHawk.Client.EmuHawk/GraphicsImplementations/IGLExtensions.cs b/src/BizHawk.Client.EmuHawk/GraphicsImplementations/IGLExtensions.cs index a3a058a68b..26d32fb562 100644 --- a/src/BizHawk.Client.EmuHawk/GraphicsImplementations/IGLExtensions.cs +++ b/src/BizHawk.Client.EmuHawk/GraphicsImplementations/IGLExtensions.cs @@ -2,6 +2,7 @@ using System; using BizHawk.Bizware.BizwareGL; using BizHawk.Bizware.DirectX; +using BizHawk.Bizware.OpenTK3; namespace BizHawk.Client.EmuHawk { diff --git a/src/BizHawk.Client.EmuHawk/GraphicsImplementations/RetainedGraphicsControl.cs b/src/BizHawk.Client.EmuHawk/GraphicsImplementations/RetainedGraphicsControl.cs index 02035d13bf..646c56e5da 100644 --- a/src/BizHawk.Client.EmuHawk/GraphicsImplementations/RetainedGraphicsControl.cs +++ b/src/BizHawk.Client.EmuHawk/GraphicsImplementations/RetainedGraphicsControl.cs @@ -1,5 +1,6 @@ using System.Windows.Forms; using BizHawk.Bizware.BizwareGL; +using BizHawk.Bizware.OpenTK3; namespace BizHawk.Client.EmuHawk { diff --git a/src/BizHawk.Client.EmuHawk/Input/Input.cs b/src/BizHawk.Client.EmuHawk/Input/Input.cs index 3f86b7a59e..f89a5934e5 100644 --- a/src/BizHawk.Client.EmuHawk/Input/Input.cs +++ b/src/BizHawk.Client.EmuHawk/Input/Input.cs @@ -5,6 +5,7 @@ using System.Threading; using System.Windows.Forms; using BizHawk.Bizware.DirectX; +using BizHawk.Bizware.OpenTK3; using BizHawk.Common; using BizHawk.Client.Common; diff --git a/src/BizHawk.Client.EmuHawk/MainForm.Events.cs b/src/BizHawk.Client.EmuHawk/MainForm.Events.cs index 9c879da4b8..86257001e7 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.Events.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.Events.cs @@ -6,6 +6,7 @@ using System.Linq; using System.Windows.Forms; using BizHawk.Bizware.DirectX; +using BizHawk.Bizware.OpenTK3; using BizHawk.Client.Common; using BizHawk.Client.EmuHawk.CustomControls; using BizHawk.Client.EmuHawk.ToolExtensions; diff --git a/src/BizHawk.Client.EmuHawk/Program.cs b/src/BizHawk.Client.EmuHawk/Program.cs index 671074c07c..56f87541d9 100644 --- a/src/BizHawk.Client.EmuHawk/Program.cs +++ b/src/BizHawk.Client.EmuHawk/Program.cs @@ -8,7 +8,7 @@ using System.Windows.Forms; using BizHawk.Bizware.BizwareGL; using BizHawk.Bizware.DirectX; - +using BizHawk.Bizware.OpenTK3; using BizHawk.Common; using BizHawk.Common.PathExtensions; using BizHawk.Client.Common; diff --git a/src/BizHawk.Client.EmuHawk/Sound/Sound.cs b/src/BizHawk.Client.EmuHawk/Sound/Sound.cs index a6dfea1bd1..4c746e5e8b 100644 --- a/src/BizHawk.Client.EmuHawk/Sound/Sound.cs +++ b/src/BizHawk.Client.EmuHawk/Sound/Sound.cs @@ -2,6 +2,7 @@ using System.Threading; using BizHawk.Bizware.DirectX; +using BizHawk.Bizware.OpenTK3; using BizHawk.Emulation.Common; using BizHawk.Client.Common; using BizHawk.Common;