Changeset 92bc4fe in opengl-game

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

Files:

• common/controls-new.cpp (modified) (7 diffs)
• common/controls.cpp (modified) (1 diff)
• common/controls.hpp (modified) (1 diff)
• mygame.cpp (modified) (5 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)
                                                    );

common/controls.cpp

@@ -35 +35 @@
 
 
-void computeMatricesFromInputs(){
+void computeMatricesFromInputs(int windowWidth, int windowHeight) {
 
         // glfwGetTime is called only once, the first time this function is called

common/controls.hpp

@@ -2 +2 @@
 #define CONTROLS_HPP
 
-void computeMatricesFromInputs();
+void computeMatricesFromInputs(int windowWidth, int windowHeight);
 glm::mat4 getViewMatrix();
 glm::mat4 getProjectionMatrix();

mygame.cpp

@@ -2 +2 @@
 #include <stdio.h>
 #include <stdlib.h>
+
+#include <iostream>
+using namespace std;
 
 // Include GLEW
@@ -34 +37 @@
         glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
 
-        // Open a window and create its OpenGL context
-        window = glfwCreateWindow( 1024, 768, "Tutorial 04 - Colored Cube", NULL, NULL);
+  const GLFWvidmode* mode = glfwGetVideoMode(glfwGetPrimaryMonitor());
+
+  // Open a window and create its OpenGL context
+  window = glfwCreateWindow(mode->width, mode->height, "My Space Game", glfwGetPrimaryMonitor(), NULL);
         if( window == NULL ){
                 fprintf( stderr, "Failed to open GLFW window. If you have an Intel GPU, they are not 3.3 compatible. Try the 2.1 version of the tutorials.\n" );
@@ -43 +48 @@
         }
         glfwMakeContextCurrent(window);
+  glfwSetInputMode(window, GLFW_CURSOR, GLFW_CURSOR_HIDDEN);
 
         // Initialize GLEW
@@ -213 +219 @@
         glBufferData(GL_ARRAY_BUFFER, sizeof(g_color_buffer_data), g_color_buffer_data, GL_STATIC_DRAW);
 
-        do {
-
-                // Clear the screen
-                glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-                // Use our shader
-                glUseProgram(programID);
-
-                computeMatricesFromInputs();
+  do {
+
+    // Clear the screen
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+    // Use our shader
+    glUseProgram(programID);
+
+    computeMatricesFromInputs(mode->width, mode->height);
 
     // Projection matrix : 45� Field of View, 4:3 ratio, display range : 0.1 unit <-> 100 units
@@ -239 +245 @@
 
     // Remember, matrix multiplication is the other way around
-          glm::mat4 MVP = Projection * View * Model;
+    glm::mat4 MVP = Projection * View * Model;
 
     // Send our transformation to the currently bound shader,
-                // in the "MVP" uniform
-                glUniformMatrix4fv(MatrixID, 1, GL_FALSE, &MVP[0][0]);
-
-                // 1rst attribute buffer : vertices
-                glEnableVertexAttribArray(0);
-                glBindBuffer(GL_ARRAY_BUFFER, vertexbuffer);
-                glVertexAttribPointer(
-                        0,                  // attribute. No particular reason for 0, but must match the layout in the shader.
-                        3,                  // size
-                        GL_FLOAT,           // type
-                        GL_FALSE,           // normalized?
-                        0,                  // stride
-                        (void*)0            // array buffer offset
-                );
-
-                // 2nd attribute buffer : colors
-                glEnableVertexAttribArray(1);
-                glBindBuffer(GL_ARRAY_BUFFER, colorbuffer);
-                glVertexAttribPointer(
-                        1,                                // attribute. No particular reason for 1, but must match the layout in the shader.
-                        3,                                // size
-                        GL_FLOAT,                         // type
-                        GL_FALSE,                         // normalized?
-                        0,                                // stride
-                        (void*)0                          // array buffer offset
-                );
-
-                // Draw the triangle !
-                glDrawArrays(GL_TRIANGLES, 0, 12*3+18); // 12*3 indices starting at 0 -> 12 triangles
-
-                glDisableVertexAttribArray(0);
-                glDisableVertexAttribArray(1);
-
-                // Swap buffers
-                glfwSwapBuffers(window);
-                glfwPollEvents();
-
-        } // Check if the ESC key was pressed or the window was closed
-        while( glfwGetKey(window, GLFW_KEY_ESCAPE ) != GLFW_PRESS &&
-                   glfwWindowShouldClose(window) == 0 );
+    // in the "MVP" uniform
+    glUniformMatrix4fv(MatrixID, 1, GL_FALSE, &MVP[0][0]);
+
+    // 1rst attribute buffer : vertices
+    glEnableVertexAttribArray(0);
+    glBindBuffer(GL_ARRAY_BUFFER, vertexbuffer);
+    glVertexAttribPointer(
+      0,                  // attribute. No particular reason for 0, but must match the layout in the shader.
+      3,                  // size
+      GL_FLOAT,           // type
+      GL_FALSE,           // normalized?
+      0,                  // stride
+      (void*)0            // array buffer offset
+    );
+
+    // 2nd attribute buffer : colors
+    glEnableVertexAttribArray(1);
+    glBindBuffer(GL_ARRAY_BUFFER, colorbuffer);
+    glVertexAttribPointer(
+      1,                                // attribute. No particular reason for 1, but must match the layout in the shader.
+      3,                                // size
+      GL_FLOAT,                         // type
+      GL_FALSE,                         // normalized?
+      0,                                // stride
+      (void*)0                          // array buffer offset
+    );
+
+    // Draw the triangle !
+    glDrawArrays(GL_TRIANGLES, 0, 12*3+18); // 12*3 indices starting at 0 -> 12 triangles
+
+    glDisableVertexAttribArray(0);
+    glDisableVertexAttribArray(1);
+
+    // Swap buffers
+    glfwSwapBuffers(window);
+    glfwPollEvents();
+
+  // Check if the ESC key was pressed or the window was closed
+  } while( glfwGetKey(window, GLFW_KEY_ESCAPE ) != GLFW_PRESS && glfwWindowShouldClose(window) == 0 );
 
         // Cleanup VBO and shader