From 5c46e0f0a924989201c6784b0f956bc442f14a7e Mon Sep 17 00:00:00 2001
From: majortom6 <tombarrett@siu.edu>
Date: Sun, 19 Feb 2017 09:17:35 -0600
Subject: -removed glm library, its in the debian repos -made opengl and sdl
 folders in includes, moved various *hpps to them

---
 src/event.cpp       | 2 +-
 src/geoshader.cpp   | 2 +-
 src/main.cpp        | 4 ++--
 src/rectdrawer.cpp  | 2 +-
 src/spritebatch.cpp | 2 +-
 src/timer.cpp       | 2 +-
 src/window.cpp      | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/event.cpp b/src/event.cpp
index 56c4951..15358c7 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -1,4 +1,4 @@
-#include "event.hpp"
+#include "sdl/event.hpp"
 
 Event::Event()
 {
diff --git a/src/geoshader.cpp b/src/geoshader.cpp
index b870313..3bd172b 100644
--- a/src/geoshader.cpp
+++ b/src/geoshader.cpp
@@ -1,4 +1,4 @@
-#include "geoshader.hpp"
+#include "opengl/geoshader.hpp"
 #include <iostream>
 #include <fstream>
 
diff --git a/src/main.cpp b/src/main.cpp
index eb4438f..c7ce9e7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -11,8 +11,8 @@ int main()
     //New opengl stuff
     Transform   transform;
     Camera      camera(glm::vec3(0,0,70), 70.0f, (float)800/(float)600, 0.01f, 1000.0f);
-    GeoShader   shader("./inc/opengl/theshader");
-    GeoShader   shader2("./inc/opengl/basicshader");
+    GeoShader   shader("./inc/opengl/shaders/theshader");
+    GeoShader   shader2("./inc/opengl/shaders/basicshader");
     Rectdrawer  rectrenderer(shader2);
     SpriteBatch _spriteBatch(shader);
 
diff --git a/src/rectdrawer.cpp b/src/rectdrawer.cpp
index 980f348..8714471 100644
--- a/src/rectdrawer.cpp
+++ b/src/rectdrawer.cpp
@@ -1,4 +1,4 @@
-#include "rectdrawer.hpp"
+#include "opengl/rectdrawer.hpp"
 
 Rectdrawer::Rectdrawer(GeoShader theshader) : _vbo(0), _vao(0), shader(theshader){
     // Generate the VAO if it isn't already generated
diff --git a/src/spritebatch.cpp b/src/spritebatch.cpp
index 91e04ba..2dd5463 100644
--- a/src/spritebatch.cpp
+++ b/src/spritebatch.cpp
@@ -1,4 +1,4 @@
-#include "spritebatch.hpp"
+#include "opengl/spritebatch.hpp"
 
 SpriteBatch::SpriteBatch(GeoShader theshader) : _vbo(0), _vao(0), shader(theshader)
 {
diff --git a/src/timer.cpp b/src/timer.cpp
index 3a0b55e..9a8e7c8 100644
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -1,4 +1,4 @@
-#include "timer.hpp"
+#include "sdl/timer.hpp"
 
 Timer::Timer()
 {
diff --git a/src/window.cpp b/src/window.cpp
index 28af6bf..77d9549 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -1,4 +1,4 @@
-#include "window.hpp"
+#include "sdl/window.hpp"
 
 Window::Window(int width, int height, const std::string& title) 
 {
-- 
cgit v1.2.3