Give 8-2 better fixes

Author: neokabuto

OpenTKTutorial8-2/OpenTKTutorial8-2/Game.cs

@@ -44,6 +44,7 @@ void initProgram()
         {
             lastMousePos = new Vector2(Mouse.X, Mouse.Y);
             CursorVisible = false;
+            cam.MouseSensitivity = 0.0025f;
 
             GL.GenBuffers(1, out ibo_elements);
 
@@ -73,9 +74,7 @@ void initProgram()
 
             // Move camera away from origin
             cam.Position += new Vector3(0f, 0f, 3f);
-
-            cam.MouseSensitivity = 0.0025f;
-
+            
             textures.Add("earth.png", loadImage("earth.png"));
             ObjVolume earth = ObjVolume.LoadFromFile("earth.obj");
             earth.TextureID = textures["earth.png"];
@@ -228,6 +227,8 @@ protected override void OnUpdateFrame(FrameEventArgs e)
         {
             base.OnUpdateFrame(e);
 
+            ProcessInput();
+
             List<Vector3> verts = new List<Vector3>();
             List<int> inds = new List<int>();
             List<Vector3> colors = new List<Vector3>();
@@ -307,63 +308,72 @@ protected override void OnUpdateFrame(FrameEventArgs e)
             // Buffer index data
             GL.BindBuffer(BufferTarget.ElementArrayBuffer, ibo_elements);
             GL.BufferData(BufferTarget.ElementArrayBuffer, (IntPtr)(indicedata.Length * sizeof(int)), indicedata, BufferUsageHint.StaticDraw);
+            
+            view = cam.GetViewMatrix();
+        }
 
-
-            // Reset mouse position
-            if (Focused)
+        /// <summary>
+        /// Handles keyboard and mouse input
+        /// </summary>
+        private void ProcessInput()
+        {
+            /* We'll use the escape key to make the program easy to exit from.
+             * Otherwise it's annoying since the mouse cursor is trapped inside.*/
+            if (Keyboard.GetState().IsKeyDown(Key.Escape))
             {
-                Vector2 delta = lastMousePos - new Vector2(OpenTK.Input.Mouse.GetState().X, OpenTK.Input.Mouse.GetState().Y);
-                lastMousePos += delta;
+                Exit();
+            }
 
-                cam.AddRotation(delta.X, delta.Y);
-                lastMousePos = new Vector2(OpenTK.Input.Mouse.GetState().X, OpenTK.Input.Mouse.GetState().Y);
+            /** Let's start by adding WASD input (feel free to change the keys if you want,
+             * hopefully a later tutorial will have a proper input manager) for translating the camera. */
+            if (Keyboard.GetState().IsKeyDown(Key.W))
+            {
+                cam.Move(0f, 0.1f, 0f);
             }
 
-            view = cam.GetViewMatrix();
-        }
+            if (Keyboard.GetState().IsKeyDown(Key.S))
+            {
+                cam.Move(0f, -0.1f, 0f);
+            }
 
-        protected override void OnKeyPress(KeyPressEventArgs e)
-        {
-            base.OnKeyPress(e);
+            if (Keyboard.GetState().IsKeyDown(Key.A))
+            {
+                cam.Move(-0.1f, 0f, 0f);
+            }
 
-            if (e.KeyChar == 27)
+            if (Keyboard.GetState().IsKeyDown(Key.D))
             {
-                Exit();
+                cam.Move(0.1f, 0f, 0f);
             }
 
-            switch (e.KeyChar)
+            if (Keyboard.GetState().IsKeyDown(Key.Q))
             {
-                case 'w':
-                    cam.Move(0f, 0.1f, 0f);
-                    break;
-                case 'a':
-                    cam.Move(-0.1f, 0f, 0f);
-                    break;
-                case 's':
-                    cam.Move(0f, -0.1f, 0f);
-                    break;
-                case 'd':
-                    cam.Move(0.1f, 0f, 0f);
-                    break;
-                case 'q':
-                    cam.Move(0f, 0f, 0.1f);
-                    break;
-                case 'e':
-                    cam.Move(0f, 0f, -0.1f);
-                    break;
+                cam.Move(0f, 0f, 0.1f);
             }
-        }
 
-        protected override void OnFocusedChanged(EventArgs e)
-        {
-            base.OnFocusedChanged(e);
+            if (Keyboard.GetState().IsKeyDown(Key.E))
+            {
+                cam.Move(0f, 0f, -0.1f);
+            }
 
             if (Focused)
             {
+                Vector2 delta = lastMousePos - new Vector2(OpenTK.Input.Mouse.GetState().X, OpenTK.Input.Mouse.GetState().Y);
+                lastMousePos += delta;
+
+                cam.AddRotation(delta.X, delta.Y);
                 lastMousePos = new Vector2(OpenTK.Input.Mouse.GetState().X, OpenTK.Input.Mouse.GetState().Y);
             }
         }
 
+
+        protected override void OnFocusedChanged(EventArgs e)
+        {
+            base.OnFocusedChanged(e);
+            lastMousePos = new Vector2(OpenTK.Input.Mouse.GetState().X, OpenTK.Input.Mouse.GetState().Y);
+        }
+
+
         int loadImage(Bitmap image)
         {
             int texID = GL.GenTexture();
@@ -389,7 +399,7 @@ int loadImage(string filename)
                 Bitmap file = new Bitmap(filename);
                 return loadImage(file);
             }
-            catch (FileNotFoundException e)
+            catch (FileNotFoundException)
             {
                 return -1;
             }

OpenTKTutorial8-2/OpenTKTutorial8-2/ObjVolume.cs

@@ -138,7 +138,7 @@ public static ObjVolume LoadFromFile(string filename)
                     obj = LoadFromString(reader.ReadToEnd());
                 }
             }
-            catch (FileNotFoundException e)
+            catch (FileNotFoundException)
             {
                 Console.WriteLine("File not found: {0}", filename);
             }