From e1a30509cb119f4c37f94d630481225b25a79caa Mon Sep 17 00:00:00 2001 From: the_fiddler Date: Mon, 24 Mar 2008 13:15:25 +0000 Subject: [PATCH] Updated some licenses. Remove a couple of DisplayMode warnings. --- Source/Examples/ExampleLauncher.cs | 23 +++++++++++++++---- Source/Examples/OpenAL/TestAudioContext.cs | 14 +++++------ .../Tutorial/T03_Immediate_Mode_Cube.cs | 13 ++++++----- Source/Examples/Tutorial/T10_GLSL_Cube.cs | 18 ++++++++------- 4 files changed, 42 insertions(+), 26 deletions(-) diff --git a/Source/Examples/ExampleLauncher.cs b/Source/Examples/ExampleLauncher.cs index cb59324b..45d6ab81 100644 --- a/Source/Examples/ExampleLauncher.cs +++ b/Source/Examples/ExampleLauncher.cs @@ -1,6 +1,8 @@ #region --- License --- -/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos - * See license.txt for license info +/* Licensed under the MIT/X11 license. + * Copyright (c) 2006-2008 the OpenTK Team. + * This notice may not be removed from any source distribution. + * See license.txt for licensing details. */ #endregion @@ -229,10 +231,21 @@ namespace Examples [STAThread] static void Main() { - using (Form exampleLauncher = new ExampleLauncher()) + try { - Application.EnableVisualStyles(); - Application.Run(exampleLauncher); + //FileIOPermission fileIO = new FileIOPermission(FileIOPermissionAccess.AllAccess, "."); + //fileIO.Demand(); + + using (Form exampleLauncher = new ExampleLauncher()) + { + Application.EnableVisualStyles(); + Application.Run(exampleLauncher); + } + + } + catch (System.Security.SecurityException e) + { + } } } diff --git a/Source/Examples/OpenAL/TestAudioContext.cs b/Source/Examples/OpenAL/TestAudioContext.cs index b4d40e0d..2d9e6cf0 100644 --- a/Source/Examples/OpenAL/TestAudioContext.cs +++ b/Source/Examples/OpenAL/TestAudioContext.cs @@ -40,13 +40,13 @@ namespace Examples Trace.WriteLine("Testing AudioContext functions."); Trace.Indent(); - Trace.WriteLine("Suspend()..."); - context.Suspend(); - Trace.Assert(!context.IsProcessing); - - Trace.WriteLine("Process()..."); - context.Process(); - Trace.Assert(context.IsProcessing); +// Trace.WriteLine("Suspend()..."); +// context.Suspend(); +// Trace.Assert(!context.IsProcessing); +// +// Trace.WriteLine("Process()..."); +// context.Process(); +// Trace.Assert(context.IsProcessing); //Trace.WriteLine("MakeCurrent()..."); //context.MakeCurrent(); diff --git a/Source/Examples/Tutorial/T03_Immediate_Mode_Cube.cs b/Source/Examples/Tutorial/T03_Immediate_Mode_Cube.cs index 9303688e..ae6c9e46 100644 --- a/Source/Examples/Tutorial/T03_Immediate_Mode_Cube.cs +++ b/Source/Examples/Tutorial/T03_Immediate_Mode_Cube.cs @@ -1,6 +1,8 @@ #region --- License --- -/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos - * See license.txt for license info +/* Licensed under the MIT/X11 license. + * 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 @@ -12,10 +14,9 @@ using System.Windows.Forms; using System.Threading; using System.Drawing; -using OpenTK; +using OpenTK; +using OpenTK.Graphics; using OpenTK.Graphics.OpenGL; -using OpenTK.Graphics.OpenGL.Enums; -using OpenTK.Platform; #endregion @@ -36,7 +37,7 @@ namespace Examples.Tutorial #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 diff --git a/Source/Examples/Tutorial/T10_GLSL_Cube.cs b/Source/Examples/Tutorial/T10_GLSL_Cube.cs index 87d0e546..0b40c11c 100644 --- a/Source/Examples/Tutorial/T10_GLSL_Cube.cs +++ b/Source/Examples/Tutorial/T10_GLSL_Cube.cs @@ -1,6 +1,8 @@ #region --- License --- -/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos - * See license.txt for license info +/* Licensed under the MIT/X11 license. + * 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 @@ -12,13 +14,13 @@ using System.ComponentModel; using System.Drawing; using System.Text; using System.Windows.Forms; -using System.Threading; - -using OpenTK.Graphics.OpenGL; -using OpenTK; +using System.Threading; using System.Diagnostics; using System.IO; -using OpenTK.Graphics.OpenGL.Enums; + +using OpenTK; +using OpenTK.Graphics; +using OpenTK.Graphics.OpenGL; #endregion --- Using Directives --- @@ -43,7 +45,7 @@ namespace Examples.Tutorial #region --- Constructors --- public T10_GLSL_Cube() - : base(new DisplayMode(800, 600)) + : base(800, 600, GraphicsMode.Default) { } #endregion