Skip to content

Commit

Permalink
Fixed partial rename to OpenTK.GLControl.
Browse files Browse the repository at this point in the history
  • Loading branch information
NogginBops committed Sep 4, 2024
1 parent ffe344b commit ee1a8bc
Show file tree
Hide file tree
Showing 25 changed files with 29 additions and 29 deletions.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using OpenTK.Graphics.OpenGL4;
using OpenTK.Mathematics;

namespace OpenTK.WinForms.InputTest
namespace OpenTK.GLControl.InputTest
{
public partial class Form1 : Form
{
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\OpenTK.WinForms\OpenTK.GLControl.csproj" />
<ProjectReference Include="..\OpenTK.GLControl\OpenTK.GLControl.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Threading.Tasks;
using System.Windows.Forms;

namespace OpenTK.WinForms.InputTest
namespace OpenTK.GLControl.InputTest
{
static class Program
{
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using OpenTK.Graphics.OpenGL4;
using OpenTK.Mathematics;

namespace OpenTK.WinForms.MultiControlTest
namespace OpenTK.GLControl.MultiControlTest
{
public partial class Form1 : Form
{
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\OpenTK.WinForms\OpenTK.GLControl.csproj" />
<ProjectReference Include="..\OpenTK.GLControl\OpenTK.GLControl.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Threading.Tasks;
using System.Windows.Forms;

namespace OpenTK.WinForms.MultiControlTest
namespace OpenTK.GLControl.MultiControlTest
{
static class Program
{
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using OpenTK.Graphics.OpenGL4;
using OpenTK.Mathematics;

namespace OpenTK.WinForms.TestForm
namespace OpenTK.GLControl.TestForm
{
public partial class Form1 : Form
{
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\OpenTK.WinForms\OpenTK.GLControl.csproj" />
<ProjectReference Include="..\OpenTK.GLControl\OpenTK.GLControl.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Threading.Tasks;
using System.Windows.Forms;

namespace OpenTK.WinForms.TestForm
namespace OpenTK.GLControl.TestForm
{
static class Program
{
Expand Down
8 changes: 4 additions & 4 deletions OpenTK.WinForms.sln → OpenTK.GLControl.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.11.35219.272
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTK.WinForms.TestForm", "OpenTK.WinForms.TestForm\OpenTK.WinForms.TestForm.csproj", "{95E422AB-9DC7-4E2A-B13F-A26A52EF1BBA}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTK.GLControl.TestForm", "OpenTK.GLControl.TestForm\OpenTK.GLControl.TestForm.csproj", "{95E422AB-9DC7-4E2A-B13F-A26A52EF1BBA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTK.GLControl", "OpenTK.WinForms\OpenTK.GLControl.csproj", "{7CB8414E-9A16-4171-B3CA-ED3E3D82C3A4}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTK.GLControl", "OpenTK.GLControl\OpenTK.GLControl.csproj", "{7CB8414E-9A16-4171-B3CA-ED3E3D82C3A4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTK.WinForms.MultiControlTest", "OpenTK.WinForms.MultiControlTest\OpenTK.WinForms.MultiControlTest.csproj", "{0B625ED5-86A7-4C38-AB6B-1833F2FA8C5A}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTK.GLControl.MultiControlTest", "OpenTK.GLControl.MultiControlTest\OpenTK.GLControl.MultiControlTest.csproj", "{0B625ED5-86A7-4C38-AB6B-1833F2FA8C5A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTK.WinForms.InputTest", "OpenTK.WinForms.InputTest\OpenTK.WinForms.InputTest.csproj", "{65839490-2DE7-4823-AC53-C210A805A982}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTK.GLControl.InputTest", "OpenTK.GLControl.InputTest\OpenTK.GLControl.InputTest.csproj", "{65839490-2DE7-4823-AC53-C210A805A982}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "_build", "build\_build.csproj", "{7F8678E7-2F0E-44B1-903D-80FBA892D6A0}"
EndProject
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using OpenTK.Windowing.Desktop;

namespace OpenTK.WinForms
namespace OpenTK.GLControl
{
/// <summary>
/// At design-time, we don't have a real GLFW graphics context.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using OpenTK.Windowing.GraphicsLibraryFramework;
using NativeWindow = OpenTK.Windowing.Desktop.NativeWindow;

namespace OpenTK.WinForms
namespace OpenTK.GLControl
{
/// <summary>
/// OpenGL-capable WinForms control that is a specialized wrapper around
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Windows.Forms;
using OpenTK.Mathematics;

namespace OpenTK.WinForms
namespace OpenTK.GLControl
{
/// <summary>
/// At design-time, we really can't load OpenGL and GLFW and render with it
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using OpenTK.Windowing.Common;
using OpenTK.Windowing.Desktop;

namespace OpenTK.WinForms
namespace OpenTK.GLControl
{
/// <summary>
/// Configuration settings for a GLControl. The properties here are a subset
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using OpenTK.Windowing.Common;
using OpenTK.Windowing.GraphicsLibraryFramework;

namespace OpenTK.WinForms
namespace OpenTK.GLControl
{
/// <summary>
/// Abstract access to native-input properties, methods, and events.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using OpenTK.Windowing.Desktop;
using OpenTK.Windowing.GraphicsLibraryFramework;

namespace OpenTK.WinForms
namespace OpenTK.GLControl
{
/// <summary>
/// This proxy class provides access to the native input methods and properties
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion OpenTK.WinForms/Win32.cs → OpenTK.GLControl/Win32.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using System.Runtime.InteropServices;

namespace OpenTK.WinForms
namespace OpenTK.GLControl
{
/// <summary>
/// P/Invoke functions and declarations for Microsoft Windows (32-bit and 64-bit).
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ into something WinForms can easily use. It is designed and built for
## Building it

- Clone the repo.
- Build the solution (or at least the `OpenTK.WinForms.csproj`).
- The `OpenTK.WinForms` project exposes the new `GLControl`. Add this project
- Build the solution (or at least the `OpenTK.GLControl.csproj`).
- The `OpenTK.GLControl` project exposes the new `GLControl`. Add this project
(or its compiled DLL) as a dependency of your own projects. This directly
depends on the WinForms and OpenTK Nuget packages but has no other dependencies.
- `OpenTK.WinForms.TestForm` contains a test program that demonstrates that the
- `OpenTK.GLControl.TestForm` contains a test program that demonstrates that the
new `GLControl` works. Try it first and make sure it works for you. You should
see a spinning cube under a standard menubar.

## Usage

The new `GLControl` is reasonably-well documented in its [source code](OpenTK.WinForms/GLControl.cs). It has a
The new `GLControl` is reasonably-well documented in its [source code](OpenTK.GLControl/GLControl.cs). It has a
similar (but not identical) API to the 3.x `GLControl`. In general, you do this
to use it:

Expand All @@ -44,7 +44,7 @@ to use it:

## Example Resize/Paint handlers

A complete example can be found in [OpenTK.WinForms.TestForm](OpenTK.WinForms.TestForm/Form1.cs),
A complete example can be found in [OpenTK.GLControl.TestForm](OpenTK.GLControl.TestForm/Form1.cs),
but the basics of implementing Resize and Paint handlers look like this:

```c#
Expand Down

0 comments on commit ee1a8bc

Please sign in to comment.