diff options
| author | majortom6 <tombarrett@siu.edu> | 2017-02-19 09:17:35 -0600 |
|---|---|---|
| committer | Tom Barrett <tombarrett@siu.edu> | 2017-03-07 13:23:41 -0600 |
| commit | 5c46e0f0a924989201c6784b0f956bc442f14a7e (patch) | |
| tree | 33b5889b872023bd7d414f7baec45706330813b3 /src/main.cpp | |
| parent | 2cc21176467d4501adb7bfb9ee03eb9a2a7d14f2 (diff) | |
-removed glm library, its in the debian repos
-made opengl and sdl folders in includes, moved various *hpps to them
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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);
|