Updated some licenses. Remove a couple of DisplayMode warnings.
This commit is contained in:
parent
ef16998dca
commit
0a5c962c51
4 changed files with 42 additions and 26 deletions
|
@ -1,6 +1,8 @@
|
||||||
#region --- License ---
|
#region --- License ---
|
||||||
/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
|
/* Licensed under the MIT/X11 license.
|
||||||
* See license.txt for license info
|
* Copyright (c) 2006-2008 the OpenTK Team.
|
||||||
|
* This notice may not be removed from any source distribution.
|
||||||
|
* See license.txt for licensing details.
|
||||||
*/
|
*/
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
@ -229,10 +231,21 @@ namespace Examples
|
||||||
[STAThread]
|
[STAThread]
|
||||||
static void Main()
|
static void Main()
|
||||||
{
|
{
|
||||||
using (Form exampleLauncher = new ExampleLauncher())
|
try
|
||||||
{
|
{
|
||||||
Application.EnableVisualStyles();
|
//FileIOPermission fileIO = new FileIOPermission(FileIOPermissionAccess.AllAccess, ".");
|
||||||
Application.Run(exampleLauncher);
|
//fileIO.Demand();
|
||||||
|
|
||||||
|
using (Form exampleLauncher = new ExampleLauncher())
|
||||||
|
{
|
||||||
|
Application.EnableVisualStyles();
|
||||||
|
Application.Run(exampleLauncher);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
catch (System.Security.SecurityException e)
|
||||||
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,13 +40,13 @@ namespace Examples
|
||||||
Trace.WriteLine("Testing AudioContext functions.");
|
Trace.WriteLine("Testing AudioContext functions.");
|
||||||
Trace.Indent();
|
Trace.Indent();
|
||||||
|
|
||||||
Trace.WriteLine("Suspend()...");
|
// Trace.WriteLine("Suspend()...");
|
||||||
context.Suspend();
|
// context.Suspend();
|
||||||
Trace.Assert(!context.IsProcessing);
|
// Trace.Assert(!context.IsProcessing);
|
||||||
|
//
|
||||||
Trace.WriteLine("Process()...");
|
// Trace.WriteLine("Process()...");
|
||||||
context.Process();
|
// context.Process();
|
||||||
Trace.Assert(context.IsProcessing);
|
// Trace.Assert(context.IsProcessing);
|
||||||
|
|
||||||
//Trace.WriteLine("MakeCurrent()...");
|
//Trace.WriteLine("MakeCurrent()...");
|
||||||
//context.MakeCurrent();
|
//context.MakeCurrent();
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
#region --- License ---
|
#region --- License ---
|
||||||
/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
|
/* Licensed under the MIT/X11 license.
|
||||||
* See license.txt for license info
|
* Copyright (c) 2006-2008 the OpenTK Team.
|
||||||
|
* This notice may not be removed from any source distribution.
|
||||||
|
* See license.txt for licensing detailed licensing details.
|
||||||
*/
|
*/
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
@ -12,10 +14,9 @@ using System.Windows.Forms;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Drawing;
|
using System.Drawing;
|
||||||
|
|
||||||
using OpenTK;
|
using OpenTK;
|
||||||
|
using OpenTK.Graphics;
|
||||||
using OpenTK.Graphics.OpenGL;
|
using OpenTK.Graphics.OpenGL;
|
||||||
using OpenTK.Graphics.OpenGL.Enums;
|
|
||||||
using OpenTK.Platform;
|
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
@ -36,7 +37,7 @@ namespace Examples.Tutorial
|
||||||
|
|
||||||
#region --- Constructor ---
|
#region --- Constructor ---
|
||||||
|
|
||||||
public T03_Immediate_Mode_Cube() : base(new DisplayMode(800, 600))
|
public T03_Immediate_Mode_Cube() : base(800, 600, new GraphicsMode(16, 16))
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
#region --- License ---
|
#region --- License ---
|
||||||
/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
|
/* Licensed under the MIT/X11 license.
|
||||||
* See license.txt for license info
|
* Copyright (c) 2006-2008 the OpenTK Team.
|
||||||
|
* This notice may not be removed from any source distribution.
|
||||||
|
* See license.txt for licensing detailed licensing details.
|
||||||
*/
|
*/
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
@ -12,13 +14,13 @@ using System.ComponentModel;
|
||||||
using System.Drawing;
|
using System.Drawing;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Windows.Forms;
|
using System.Windows.Forms;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
|
|
||||||
using OpenTK.Graphics.OpenGL;
|
|
||||||
using OpenTK;
|
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using OpenTK.Graphics.OpenGL.Enums;
|
|
||||||
|
using OpenTK;
|
||||||
|
using OpenTK.Graphics;
|
||||||
|
using OpenTK.Graphics.OpenGL;
|
||||||
|
|
||||||
#endregion --- Using Directives ---
|
#endregion --- Using Directives ---
|
||||||
|
|
||||||
|
@ -43,7 +45,7 @@ namespace Examples.Tutorial
|
||||||
#region --- Constructors ---
|
#region --- Constructors ---
|
||||||
|
|
||||||
public T10_GLSL_Cube()
|
public T10_GLSL_Cube()
|
||||||
: base(new DisplayMode(800, 600))
|
: base(800, 600, GraphicsMode.Default)
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
Loading…
Reference in a new issue