Replaced in-class initialization with calls to platform-specific classes.
This commit is contained in:
parent
e05f34377b
commit
cf678dfc48
1 changed files with 26 additions and 23 deletions
|
@ -6,7 +6,7 @@
|
||||||
//
|
//
|
||||||
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
// of this software and associated documentation files (the "Software"), to deal
|
// of this software and associated documentation files (the "Software"), to deal
|
||||||
// in the Software without restriction, including without limitation the rights to
|
// in the Software without restriction, including without limitation the rights to
|
||||||
// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
||||||
// the Software, and to permit persons to whom the Software is furnished to do
|
// the Software, and to permit persons to whom the Software is furnished to do
|
||||||
// so, subject to the following conditions:
|
// so, subject to the following conditions:
|
||||||
|
@ -36,6 +36,9 @@ using OpenTK.Graphics;
|
||||||
using OpenTK.Platform;
|
using OpenTK.Platform;
|
||||||
|
|
||||||
using Gtk;
|
using Gtk;
|
||||||
|
using OpenTK.OSX;
|
||||||
|
using OpenTK.Win;
|
||||||
|
using OpenTK.X11;
|
||||||
|
|
||||||
namespace OpenTK
|
namespace OpenTK
|
||||||
{
|
{
|
||||||
|
@ -92,12 +95,12 @@ namespace OpenTK
|
||||||
public GraphicsContextFlags GraphicsContextFlags
|
public GraphicsContextFlags GraphicsContextFlags
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
return _GraphicsContextFlags;
|
return _GraphicsContextFlags;
|
||||||
}
|
}
|
||||||
set
|
set
|
||||||
{
|
{
|
||||||
_GraphicsContextFlags = value;
|
_GraphicsContextFlags = value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -108,13 +111,13 @@ namespace OpenTK
|
||||||
/// <summary>Constructs a new GLWidget.</summary>
|
/// <summary>Constructs a new GLWidget.</summary>
|
||||||
public GLWidget()
|
public GLWidget()
|
||||||
: this(GraphicsMode.Default)
|
: this(GraphicsMode.Default)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>Constructs a new GLWidget using a given GraphicsMode</summary>
|
/// <summary>Constructs a new GLWidget using a given GraphicsMode</summary>
|
||||||
public GLWidget(GraphicsMode graphicsMode)
|
public GLWidget(GraphicsMode graphicsMode)
|
||||||
: this(graphicsMode, 1, 0, GraphicsContextFlags.Default)
|
: this(graphicsMode, 1, 0, GraphicsContextFlags.Default)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>Constructs a new GLWidget</summary>
|
/// <summary>Constructs a new GLWidget</summary>
|
||||||
|
@ -136,8 +139,8 @@ namespace OpenTK
|
||||||
}
|
}
|
||||||
|
|
||||||
~GLWidget()
|
~GLWidget()
|
||||||
{
|
{
|
||||||
Dispose(false);
|
Dispose(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if GTK3
|
#if GTK3
|
||||||
|
@ -180,43 +183,43 @@ namespace OpenTK
|
||||||
static void OnGraphicsContextInitialized()
|
static void OnGraphicsContextInitialized()
|
||||||
{
|
{
|
||||||
if (GraphicsContextInitialized != null)
|
if (GraphicsContextInitialized != null)
|
||||||
GraphicsContextInitialized(null, EventArgs.Empty);
|
GraphicsContextInitialized(null, EventArgs.Empty);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Called when the first GraphicsContext is being destroyed in the case of GraphicsContext.ShareContexts == True;
|
// Called when the first GraphicsContext is being destroyed in the case of GraphicsContext.ShareContexts == True;
|
||||||
public static event EventHandler GraphicsContextShuttingDown;
|
public static event EventHandler GraphicsContextShuttingDown;
|
||||||
|
|
||||||
static void OnGraphicsContextShuttingDown()
|
static void OnGraphicsContextShuttingDown()
|
||||||
{
|
{
|
||||||
if (GraphicsContextShuttingDown != null)
|
if (GraphicsContextShuttingDown != null)
|
||||||
GraphicsContextShuttingDown(null, EventArgs.Empty);
|
GraphicsContextShuttingDown(null, EventArgs.Empty);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Called when this GLWidget has a valid GraphicsContext
|
// Called when this GLWidget has a valid GraphicsContext
|
||||||
public event EventHandler Initialized;
|
public event EventHandler Initialized;
|
||||||
|
|
||||||
protected virtual void OnInitialized()
|
protected virtual void OnInitialized()
|
||||||
{
|
{
|
||||||
if (Initialized != null)
|
if (Initialized != null)
|
||||||
Initialized(this, EventArgs.Empty);
|
Initialized(this, EventArgs.Empty);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Called when this GLWidget needs to render a frame
|
// Called when this GLWidget needs to render a frame
|
||||||
public event EventHandler RenderFrame;
|
public event EventHandler RenderFrame;
|
||||||
|
|
||||||
protected virtual void OnRenderFrame()
|
protected virtual void OnRenderFrame()
|
||||||
{
|
{
|
||||||
if (RenderFrame != null)
|
if (RenderFrame != null)
|
||||||
RenderFrame(this, EventArgs.Empty);
|
RenderFrame(this, EventArgs.Empty);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Called when this GLWidget is being Disposed
|
// Called when this GLWidget is being Disposed
|
||||||
public event EventHandler ShuttingDown;
|
public event EventHandler ShuttingDown;
|
||||||
|
|
||||||
protected virtual void OnShuttingDown()
|
protected virtual void OnShuttingDown()
|
||||||
{
|
{
|
||||||
if (ShuttingDown != null)
|
if (ShuttingDown != null)
|
||||||
ShuttingDown(this, EventArgs.Empty);
|
ShuttingDown(this, EventArgs.Empty);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
@ -291,16 +294,16 @@ namespace OpenTK
|
||||||
Console.WriteLine("OpenTK running on windows");
|
Console.WriteLine("OpenTK running on windows");
|
||||||
else if (Configuration.RunningOnMacOS)
|
else if (Configuration.RunningOnMacOS)
|
||||||
Console.WriteLine("OpenTK running on OSX");
|
Console.WriteLine("OpenTK running on OSX");
|
||||||
else
|
else
|
||||||
Console.WriteLine("OpenTK running on X11");
|
Console.WriteLine("OpenTK running on X11");
|
||||||
|
|
||||||
// IWindowInfo
|
// IWindowInfo
|
||||||
if (Configuration.RunningOnWindows)
|
if (Configuration.RunningOnWindows)
|
||||||
_WindowInfo = InitializeWindows();
|
_WindowInfo = WinWindowsInfoInitializer.Initialize(this.Window.Handle);
|
||||||
else if (Configuration.RunningOnMacOS)
|
else if (Configuration.RunningOnMacOS)
|
||||||
_WindowInfo = InitializeOSX();
|
_WindowInfo = OSXWindowInfoInitializer.Initialize(this.Window.Handle);
|
||||||
else
|
else
|
||||||
_WindowInfo = InitializeX(graphicsMode);
|
_WindowInfo = XWindowInfoInitializer.Initialize(graphicsMode, this.Display.Handle, this.Screen.Number, this.Window.Handle, this.RootWindow.Handle);
|
||||||
|
|
||||||
// GraphicsContext
|
// GraphicsContext
|
||||||
_GraphicsContext = new GraphicsContext(graphicsMode, _WindowInfo, GlVersionMajor, GlVersionMinor, _GraphicsContextFlags);
|
_GraphicsContext = new GraphicsContext(graphicsMode, _WindowInfo, GlVersionMajor, GlVersionMinor, _GraphicsContextFlags);
|
||||||
|
@ -361,7 +364,7 @@ namespace OpenTK
|
||||||
#else
|
#else
|
||||||
const string MacLibGdkName = "libgdk-quartz-2.0.0.dylib";
|
const string MacLibGdkName = "libgdk-quartz-2.0.0.dylib";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
[SuppressUnmanagedCodeSecurity, DllImport(MacLibGdkName)]
|
[SuppressUnmanagedCodeSecurity, DllImport(MacLibGdkName)]
|
||||||
static extern IntPtr gdk_quartz_window_get_nswindow(IntPtr handle);
|
static extern IntPtr gdk_quartz_window_get_nswindow(IntPtr handle);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue