From 442020f271c856cf1e10a36f742dcb1c0a4656d5 Mon Sep 17 00:00:00 2001 From: Teo-CD Date: Tue, 29 Oct 2019 18:20:36 +0100 Subject: [PATCH] Cleaned some includes Replace glu include by glut in order to compile on Windows --- .gitignore | 2 ++ src/Camera.h | 2 +- src/InputStatus.cpp | 1 - src/InputStatus.h | 1 + src/Vectors.h | 1 - src/main.cpp | 4 ++-- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 822dd55..661358a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ cmake-build-*/ .idea/ +out/ +.vs/ \ No newline at end of file diff --git a/src/Camera.h b/src/Camera.h index 46c674e..61c4089 100644 --- a/src/Camera.h +++ b/src/Camera.h @@ -6,7 +6,7 @@ #define TESTS_OPENGL_CAMERA_H #include -#include +#include #include "Quaternion.h" #include "Vectors.h" diff --git a/src/InputStatus.cpp b/src/InputStatus.cpp index 1b11198..38a52d9 100644 --- a/src/InputStatus.cpp +++ b/src/InputStatus.cpp @@ -3,7 +3,6 @@ // #include "InputStatus.h" -#include // Initialize static members diff --git a/src/InputStatus.h b/src/InputStatus.h index 0346356..600195d 100644 --- a/src/InputStatus.h +++ b/src/InputStatus.h @@ -6,6 +6,7 @@ #define TESTS_OPENGL_INPUTSTATUS_H #include +#include #include #include "Vectors.h" diff --git a/src/Vectors.h b/src/Vectors.h index 029a883..d2a9698 100644 --- a/src/Vectors.h +++ b/src/Vectors.h @@ -6,7 +6,6 @@ #define TESTS_OPENGL_VECTORS_H #include -#include #include /// Group of coordinates with the input operator overloaded. diff --git a/src/main.cpp b/src/main.cpp index ecde2e4..44e89e1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,5 +1,5 @@ -#include "GL/glut.h" -#include "GL/gl.h" +#include +#include #include "displayers.h" #include "DataHandling/Texture.h"