Changeset 92bc4fe in opengl-game for common/controls-new.cpp

Timestamp:

Jun 25, 2017, 7:15:12 PM (7 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

fe70cd3

Parents:

8a6d19d

Message:

Make the game window fullscreen, hide the mouse cursor, and change the view to an overhead one as the player moves around the scene

File:

• common/controls-new.cpp (modified) (7 diffs)

common/controls-new.cpp

@@ -2 +2 @@
 #include <GLFW/glfw3.h>
 extern GLFWwindow* window; // The "extern" keyword here is to access the variable "window" declared in tutorialXXX.cpp. This is a hack to keep the tutorials simple. Please avoid this.
+
+#include <iostream>
+
+using namespace std;
 
 // Include GLM
@@ -22 +26 @@
 
 // Initial position : on +Z
-glm::vec3 position = glm::vec3(4,3,-3); //glm::vec3( 0, 0, 5 );
+glm::vec3 position = glm::vec3(4,6,-3); //glm::vec3( 0, 0, 5 );
 // Initial horizontal angle : toward -Z
 float horizontalAngleBase = 3.14f * 3.0f / 2.0f; // 3.14f;
@@ -36 +40 @@
 
 
-void computeMatricesFromInputs(){
+void computeMatricesFromInputs(int windowWidth, int windowHeight) {
 
         // glfwGetTime is called only once, the first time this function is called
@@ -52 +56 @@
   // The call has no effect the first several times it's called
   if (centeredCount < 100) {
-    glfwSetCursorPos(window, 1024/2, 768/2);
+    glfwSetCursorPos(window, windowWidth/2, windowHeight/2);
     centeredCount++;
   }
@@ -58 +62 @@
         // Compute new orientation
   /* STOP ROTATION FOR NOW */
-  float horizontalAngle = horizontalAngleBase + mouseSpeed * float(1024/2 - xpos );
-  // verticalAngle   += mouseSpeed * float( 768/2 - ypos );
+  float horizontalAngle = horizontalAngleBase + mouseSpeed * float(windowWidth/2 - xpos );
+  // verticalAngle   += mouseSpeed * float( windowHeight/2 - ypos );
 
         // Direction : Spherical coordinates to Cartesian coordinates conversion
@@ -67 +71 @@
                 cos(verticalAngle) * cos(horizontalAngle)
         );
+  glm::vec3 lookDirection(
+    0.0f,
+    -3.0f,
+    0.0f
+  );
+  lookDirection = lookDirection + 3.0f * direction;
 
         // Right vector
@@ -105 +115 @@
                 // and looks here : at the same position, plus "direction"
                                                                 // position+glm::vec3(-4,0,0), // position+glm::vec3(-4,-3,3),
-                                                                position+direction,
+                                                                position+lookDirection,
                                                                 glm::vec3(0,1,0) //up                  // Head is up (set to 0,-1,0 to look upside-down)
                                                    );