Merge branch 'master' of https://github.com/tcsullivan/gamedev

2 files changed, 41 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();
 	}
 	
 	/**************************
diff --git a/src/windowClass.cpp b/src/windowClass.cpp
new file mode 100644
index 0000000..942ba86
--- /dev/null
+++ b/src/windowClass.cpp
@@ -0,0 +1,38 @@
+#include <windowClass.h>
+
+void Window::setupRender(){
+	glClearColor(0,0,0,0); //set the background color
+	
+}
+
+void Window::render(){
+
+	glMatrixMode(GL_PROJECTION); //set the matrix mode as projection so we can set the ortho size and the camera settings later on
+    glPushMatrix(); //load the settings into the matrix
+    glLoadIdentity(); //save the matrix
+
+	glOrtho(0,SCREEN_WIDTH, 0,SCREEN_HEIGHT, -1,1); //set the the size of the screen
+
+    glMatrixMode(GL_MODELVIEW); //set the matrix to modelview so we can draw objects
+    glPushMatrix(); //load
+    glLoadIdentity(); //save
+
+	glPushMatrix(); //start a new matrix
+	glClear(GL_COLOR_BUFFER_BIT); //clear the screen
+
+	/**************************
+	**** RENDER STUFF HERE ****
+	**************************/
+	glColor3f(1.0f, 0.0f, 0.0f);
+	glRectf(0,0, 50,50); //draw a test rectangle
+	glColor3f(0.0f, 1.0f, 0.0f);
+	glRectf(50,0, 100,50);
+	glColor3f(0.0f, 0.0f, 1.0f);
+	glRectf(100,0,150,50);
+	/**************************
+	****  CLOSE THE LOOP   ****
+	**************************/
+
+	glPopMatrix(); //see ya' matrix
+	SDL_GL_SwapWindow(window); //give the render to SDL to display it
+}
\ No newline at end of file