From 3aea3487fbcf445bcf02dfcc4925a603e8bbca0a Mon Sep 17 00:00:00 2001 From: the_fiddler Date: Wed, 26 Sep 2007 15:39:32 +0000 Subject: [PATCH] Added general documentation to Tutorials. --- .../Tutorial/T02_Vertex_Array_Cube.cs | 3 +++ .../Tutorial/T03_Immediate_Mode_Cube.cs | 3 +++ Source/Examples/Tutorial/T04_Lit_Cube.cs | 21 ++++++++++--------- .../Tutorial/T07_Display_Lists_Flower.cs | 2 +- Source/Examples/Tutorial/T10_GLSL_Cube.cs | 2 +- 5 files changed, 19 insertions(+), 12 deletions(-) diff --git a/Source/Examples/Tutorial/T02_Vertex_Array_Cube.cs b/Source/Examples/Tutorial/T02_Vertex_Array_Cube.cs index 17c5ed05..1715ce8c 100644 --- a/Source/Examples/Tutorial/T02_Vertex_Array_Cube.cs +++ b/Source/Examples/Tutorial/T02_Vertex_Array_Cube.cs @@ -15,6 +15,9 @@ using OpenTK.OpenGL; namespace Examples.Tutorial { + /// + /// Demonstrates Vertex Arrays (in system memory). Example is incomplete (documentation). + /// class T02_Vertex_Array_Cube : GameWindow, IExample { float angle; diff --git a/Source/Examples/Tutorial/T03_Immediate_Mode_Cube.cs b/Source/Examples/Tutorial/T03_Immediate_Mode_Cube.cs index 3b204532..9e2c5ffe 100644 --- a/Source/Examples/Tutorial/T03_Immediate_Mode_Cube.cs +++ b/Source/Examples/Tutorial/T03_Immediate_Mode_Cube.cs @@ -20,6 +20,9 @@ using OpenTK.Platform; namespace Examples.Tutorial { + /// + /// Demonstrates immediate mode rendering. Example is incomplete, and will probably go away in the future. + /// public class T03_Immediate_Mode_Cube : OpenTK.GameWindow, IExample { #region --- Fields --- diff --git a/Source/Examples/Tutorial/T04_Lit_Cube.cs b/Source/Examples/Tutorial/T04_Lit_Cube.cs index 7c08ae4f..661cf389 100644 --- a/Source/Examples/Tutorial/T04_Lit_Cube.cs +++ b/Source/Examples/Tutorial/T04_Lit_Cube.cs @@ -16,7 +16,7 @@ using Examples.Shapes; namespace Examples.Tutorial { /// - /// Demonstrates fixed-function OpenGL lighting. Tutorial is incomplete! + /// Demonstrates fixed-function OpenGL lighting. Example is incomplete (documentation). /// class T04_Lit_Cube : GameWindow, IExample { @@ -53,8 +53,9 @@ namespace Examples.Tutorial GL.Lightv(GL.Enums.LightName.LIGHT0, GL.Enums.LightParameter.DIFFUSE, new float[] { 1.0f, 1.0f, 1.0f, 1.0f }); GL.Lightv(GL.Enums.LightName.LIGHT0, GL.Enums.LightParameter.SPECULAR, new float[] { 1.0f, 1.0f, 1.0f, 1.0f }); GL.LightModelv(GL.Enums.LightModelParameter.LIGHT_MODEL_AMBIENT, new float[] { 0.2f, 0.2f, 0.2f, 1.0f }); - //GL.Enable(GL.Enums.EnableCap.LIGHTING); - //GL.Enable(GL.Enums.EnableCap.LIGHT0); + GL.LightModel(GL.Enums.LightModelParameter.LIGHT_MODEL_TWO_SIDE, 1); + GL.Enable(GL.Enums.EnableCap.LIGHTING); + GL.Enable(GL.Enums.EnableCap.LIGHT0); // Use GL.Material to set your object's material parameters.. GL.Materialv(GL.Enums.MaterialFace.FRONT, GL.Enums.MaterialParameter.AMBIENT, new float[] { 0.3f, 0.3f, 0.3f, 1.0f }); @@ -113,17 +114,17 @@ namespace Examples.Tutorial } if (Mouse[OpenTK.Input.MouseButton.Left]) - x_angle += Mouse.XDelta * 2; + x_angle += Mouse.XDelta; else x_angle += 0.5f; - if (Mouse[OpenTK.Input.MouseButton.Right]) - zoom += Mouse.YDelta * 0.5f; + zoom = Mouse.Wheel * 0.5f; - if (x_angle > 720.0f) - x_angle -= 720.0f; - else if (x_angle < -720.0f) - x_angle += 720.0f; + // Do not leave x_angle drift too far away, as this will cause inaccuracies. + if (x_angle > 360.0f) + x_angle -= 360.0f; + else if (x_angle < -360.0f) + x_angle += 360.0f; } #endregion diff --git a/Source/Examples/Tutorial/T07_Display_Lists_Flower.cs b/Source/Examples/Tutorial/T07_Display_Lists_Flower.cs index c73a0fcc..83448ced 100644 --- a/Source/Examples/Tutorial/T07_Display_Lists_Flower.cs +++ b/Source/Examples/Tutorial/T07_Display_Lists_Flower.cs @@ -23,7 +23,7 @@ using System.Threading; namespace Examples.Tutorial { - public partial class T07_Display_Lists_Flower : GameWindow, IExample + public class T07_Display_Lists_Flower : GameWindow, IExample { #region --- Variables --- diff --git a/Source/Examples/Tutorial/T10_GLSL_Cube.cs b/Source/Examples/Tutorial/T10_GLSL_Cube.cs index dd76eaa4..44f68eb4 100644 --- a/Source/Examples/Tutorial/T10_GLSL_Cube.cs +++ b/Source/Examples/Tutorial/T10_GLSL_Cube.cs @@ -22,7 +22,7 @@ using OpenTK; namespace Examples.Tutorial { /// - /// Demonstrates how to load and use a simple OpenGL shader program. + /// Demonstrates how to load and use a simple OpenGL shader program. Example is incomplete (documentation). /// public class T10_GLSL_Cube : GameWindow, IExample {