aboutsummaryrefslogtreecommitdiffstats
path: root/include/common.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/common.h')
-rw-r--r--include/common.h13
1 files changed, 11 insertions, 2 deletions
diff --git a/include/common.h b/include/common.h
index 08ec73f..207b95f 100644
--- a/include/common.h
+++ b/include/common.h
@@ -14,6 +14,7 @@
#include <math.h>
#include <string>
#include <fstream>
+#include <thread>
#define GLEW_STATIC
#include <GL/glew.h>
@@ -34,7 +35,7 @@ typedef unsigned int uint;
* This flag lets the compiler know that we want to use shaders.
*/
-#define SHADERSs
+#define SHADERS
/**
* This structure contains a set of coordinates for ease of coding.
@@ -45,6 +46,12 @@ typedef struct {
float y;
} vec2;
+typedef struct {
+ float x;
+ float y;
+ float z;
+} vec3;
+
/**
* This structure contains two sets of coordinates for ray drawing.
*/
@@ -70,7 +77,7 @@ typedef struct{
* The desired width of the game window.
*/
-#define SCREEN_WIDTH 1024
+#define SCREEN_WIDTH 1280
/**
* The desired height of the game window.
@@ -141,6 +148,8 @@ extern vec2 offset;
*/
extern unsigned int loops;
+extern GLuint shaderProgram;
+
/**
* Prints a formatted debug message to the console, along with the callee's file and line
* number.