From dfe1d7c335a4b3870787714e62f55a417c17fdbd Mon Sep 17 00:00:00 2001 From: the_fiddler Date: Sun, 23 Sep 2007 12:49:38 +0000 Subject: [PATCH] Updated update and render frequencies for all examples. --- Source/Examples/Tutorial/T01_Simple_Window.cs | 2 +- .../Tutorial/T03_Immediate_Mode_Cube.cs | 24 ++++++++------- Source/Examples/Tutorial/T04_Lit_Cube.cs | 2 +- .../Tutorial/T07_Display_Lists_Flower.cs | 30 +++++++++---------- Source/Examples/Tutorial/T08_VBO.cs | 6 +--- Source/Examples/Tutorial/T10_GLSL_Cube.cs | 24 ++++++++------- 6 files changed, 44 insertions(+), 44 deletions(-) diff --git a/Source/Examples/Tutorial/T01_Simple_Window.cs b/Source/Examples/Tutorial/T01_Simple_Window.cs index ab285d03..5b2224f9 100644 --- a/Source/Examples/Tutorial/T01_Simple_Window.cs +++ b/Source/Examples/Tutorial/T01_Simple_Window.cs @@ -77,7 +77,7 @@ namespace Examples.Tutorial public void Launch() { - this.Run(); + this.Run(1.0, 5.0); } #endregion diff --git a/Source/Examples/Tutorial/T03_Immediate_Mode_Cube.cs b/Source/Examples/Tutorial/T03_Immediate_Mode_Cube.cs index 7d1f1105..701af134 100644 --- a/Source/Examples/Tutorial/T03_Immediate_Mode_Cube.cs +++ b/Source/Examples/Tutorial/T03_Immediate_Mode_Cube.cs @@ -99,16 +99,9 @@ namespace Examples.Tutorial Fullscreen = !Fullscreen; } - GL.MatrixMode(GL.Enums.MatrixMode.MODELVIEW); - GL.LoadIdentity(); - Glu.LookAt( - 0.0, 5.0, 5.0, - 0.0, 0.0, 0.0, - 0.0, 1.0, 0.0 - ); - - GL.Rotate(angle, 0.0f, 1.0f, 0.0f); - angle += 0.5f; + angle += 3.0f; + if (angle > 720.0f) + angle -= 720.0f; } #endregion @@ -122,6 +115,15 @@ namespace Examples.Tutorial { GL.Clear(GL.Enums.ClearBufferMask.COLOR_BUFFER_BIT | GL.Enums.ClearBufferMask.DEPTH_BUFFER_BIT); + GL.MatrixMode(GL.Enums.MatrixMode.MODELVIEW); + GL.LoadIdentity(); + Glu.LookAt( + 0.0, 5.0, 5.0, + 0.0, 0.0, 0.0, + 0.0, 1.0, 0.0 + ); + GL.Rotate(angle, 0.0f, 1.0f, 0.0f); + DrawCube(); Context.SwapBuffers(); @@ -188,7 +190,7 @@ namespace Examples.Tutorial /// public void Launch() { - Run(); + Run(60.0, 60.0); } #endregion diff --git a/Source/Examples/Tutorial/T04_Lit_Cube.cs b/Source/Examples/Tutorial/T04_Lit_Cube.cs index 9f4f1b11..52056b60 100644 --- a/Source/Examples/Tutorial/T04_Lit_Cube.cs +++ b/Source/Examples/Tutorial/T04_Lit_Cube.cs @@ -31,7 +31,7 @@ namespace Examples.Tutorial public void Launch() { - this.Run(); + this.Run(60.0, 60.0); } #endregion diff --git a/Source/Examples/Tutorial/T07_Display_Lists_Flower.cs b/Source/Examples/Tutorial/T07_Display_Lists_Flower.cs index 578e06b4..ac0702cb 100644 --- a/Source/Examples/Tutorial/T07_Display_Lists_Flower.cs +++ b/Source/Examples/Tutorial/T07_Display_Lists_Flower.cs @@ -81,21 +81,6 @@ namespace Examples.Tutorial #endregion - #region public void Launch() - - /// - /// Launches this example. - /// - /// - /// Provides a simple way for the example launcher to launch the examples. - /// - public void Launch() - { - Run(); - } - - #endregion - #region --- Event Handlers --- #region OnResize @@ -165,5 +150,20 @@ namespace Examples.Tutorial #endregion #endregion --- Event Handlers --- + + #region public void Launch() + + /// + /// Launches this example. + /// + /// + /// Provides a simple way for the example launcher to launch the examples. + /// + public void Launch() + { + this.Run(1.0, 5.0); + } + + #endregion } } \ No newline at end of file diff --git a/Source/Examples/Tutorial/T08_VBO.cs b/Source/Examples/Tutorial/T08_VBO.cs index 166a6232..c8bdcf60 100644 --- a/Source/Examples/Tutorial/T08_VBO.cs +++ b/Source/Examples/Tutorial/T08_VBO.cs @@ -239,11 +239,7 @@ namespace Examples.Tutorial /// public void Launch() { - //using (T08_VBO ex = new T08_VBO()) - { - //ex.Run(); - Run(); - } + Run(60.0, 60.0); } #endregion diff --git a/Source/Examples/Tutorial/T10_GLSL_Cube.cs b/Source/Examples/Tutorial/T10_GLSL_Cube.cs index 90fb2164..dccf3268 100644 --- a/Source/Examples/Tutorial/T10_GLSL_Cube.cs +++ b/Source/Examples/Tutorial/T10_GLSL_Cube.cs @@ -157,15 +157,9 @@ namespace Examples.Tutorial this.Exit(); } - GL.MatrixMode(GL.Enums.MatrixMode.MODELVIEW); - GL.LoadIdentity(); - Glu.LookAt( - 0.0, 5.0, 5.0, - 0.0, 0.0, 0.0, - 0.0, 1.0, 0.0 - ); - GL.Rotate(angle, 0.0f, 1.0f, 0.0f); - angle += 0.05f; + angle += 3.0f; + if (angle > 720.0f) + angle -= 720.0f; } #endregion @@ -178,10 +172,18 @@ namespace Examples.Tutorial GL.Clear(GL.Enums.ClearBufferMask.COLOR_BUFFER_BIT | GL.Enums.ClearBufferMask.DEPTH_BUFFER_BIT); + GL.MatrixMode(GL.Enums.MatrixMode.MODELVIEW); + GL.LoadIdentity(); + Glu.LookAt( + 0.0, 5.0, 5.0, + 0.0, 0.0, 0.0, + 0.0, 1.0, 0.0 + ); + GL.Rotate(angle, 0.0f, 1.0f, 0.0f); + DrawCube(); Context.SwapBuffers(); - Thread.Sleep(0); } #endregion @@ -244,7 +246,7 @@ namespace Examples.Tutorial /// public void Launch() { - Run(); + Run(60.0, 60.0); } #endregion