Changes in / [c40990d:772d8c7] in opengl-game

Files:

• new-game.cpp (modified) (5 diffs)
• test.frag (deleted)
• test.vert (deleted)

new-game.cpp

@@ -6 +6 @@
 #include <cstdio>
 #include <iostream>
-#include <fstream>
 
 using namespace std;
 
-GLuint loadShader(GLenum type, string file);
-
-const bool FULLSCREEN = false;
+const bool FULLSCREEN = true;
 
 void glfw_error_callback(int error, const char* description) {
@@ -41 +38 @@
    GLFWwindow* window = NULL;
 
-   int width = 640;
-   int height = 480;
-
    if (FULLSCREEN) {
       GLFWmonitor* mon = glfwGetPrimaryMonitor();
       const GLFWvidmode* vmode = glfwGetVideoMode(mon);
-
-      cout << "Fullscreen resolution " << vmode->width << "x" << vmode->height << endl;
       window = glfwCreateWindow(vmode->width, vmode->height, "Extended GL Init", mon, NULL);
-
-      width = vmode->width;
-      height = vmode->height;
    } else {
-      window = glfwCreateWindow(width, height, "Hello Triangle", NULL, NULL);
+      window = glfwCreateWindow(640, 480, "Hello Triangle", NULL, NULL);
    }
 
@@ -65 +54 @@
    glewExperimental = GL_TRUE;
    glewInit();
-
-   // glViewport(0, 0, width*2, height*2);
 
    const GLubyte* renderer = glGetString(GL_RENDERER);
@@ -93 +80 @@
    glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, NULL);
 
-   //string vertexShaderString = loadShader();
+   const char* vertex_shader =
+   "#version 410\n"
+   "in vec3 vp;"
+   "void main() {"
+   "   gl_Position = vec4(vp, 1.0);"
+   "}";
 
-   GLuint vs = loadShader(GL_VERTEX_SHADER, "./test.vert");
-   GLuint fs = loadShader(GL_FRAGMENT_SHADER, "./test.frag");
+   GLuint vs = glCreateShader(GL_VERTEX_SHADER);
+   glShaderSource(vs, 1, &vertex_shader, NULL);
+   glCompileShader(vs);
+
+   const char* fragment_shader =
+   "#version 410\n"
+   "out vec4 frag_color;"
+   "void main() {"
+   "   frag_color = vec4(0.5, 0.0, 0.5, 1.0);"
+   "}";
+
+   GLuint fs = glCreateShader(GL_FRAGMENT_SHADER);
+   glShaderSource(fs, 1, &fragment_shader, NULL);
+   glCompileShader(fs);
 
    GLuint shader_program = glCreateProgram();
@@ -120 +124 @@
    return 0;
 }
-
-GLuint loadShader(GLenum type, string file) {
-  cout << "Loading shader from file " << file << endl;
-
-  ifstream shaderFile(file);
-  GLuint shaderId = 0;
-
-  if (shaderFile.is_open()) {
-    string line, shaderString;
-
-    while(getline(shaderFile, line)) {
-      shaderString += line + "\n";
-    }
-    shaderFile.close();
-    const char* shaderCString = shaderString.c_str();
-
-    shaderId = glCreateShader(type);
-    glShaderSource(shaderId, 1, &shaderCString, NULL);
-    glCompileShader(shaderId);
-
-    cout << "Loaded successfully" << endl;
-  } else {
-    cout << "Failed to loade the file" << endl;
-  }
-
-  return shaderId;
-}