aboutsummaryrefslogtreecommitdiffstats
path: root/src/main.cpp
diff options
context:
space:
mode:
authorClyne Sullivan <tullivan99@gmail.com>2015-09-08 18:29:24 -0400
committerClyne Sullivan <tullivan99@gmail.com>2015-09-08 18:29:24 -0400
commitf135a4a380b5ea56a876dcfef1448e01f1bebdec (patch)
tree0519d8e3507f2b439ef220413e10fca37fcd6971 /src/main.cpp
parent9e842f5cb8a2ab5f3774333bfa868e9982ec4bd6 (diff)
parent2a0df74f8a73427b1fe2b96ec7840e7f39178569 (diff)
Merge branch 'master' of https://github.com/tcsullivan/gamedev
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 78163db..9ce98a1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -7,6 +7,7 @@ SDL_GLContext mainGLContext = NULL;
bool gameRunning = true;
UIClass ui;
+Window win;
int main(int argc,char **argv){
//runs start-up procedures
@@ -38,12 +39,10 @@ int main(int argc,char **argv){
**** GAMELOOP ****
**************************/
- glClearColor(1,1,1,0);
+ win.setupRender();
while(gameRunning){
- glClear(GL_COLOR_BUFFER_BIT);
- SDL_GL_SwapWindow(window);
-
ui.handleEvents();
+ win.render();
}
/**************************