merge, particles

1 files changed, 12 insertions, 2 deletions

diff --git a/include/common.h b/include/common.h
index fa7356a..0df6533 100644
--- a/include/common.h
+++ b/include/common.h
@@ -30,14 +30,22 @@ typedef unsigned int uint;
 #undef near
 #endif
 
-#include <Texture.h>
-
 /**
  * This flag lets the compiler know that we want to use shaders.
  */
 
 #define SHADERS
 
+template<typename N>
+N abso(N v){
+	if(v < 0.0){
+		return v * -1;
+	}else
+		return v;
+}
+
+extern GLuint colorIndex;
+
 /**
  * This structure contains a set of coordinates for ease of coding.
  */
@@ -68,6 +76,8 @@ typedef struct{
 	float blue;
 } Color;
 
+#include <Texture.h>
+
 /**
  * Define the game's name (displayed in the window title).
  */