From 379803180921534a42743c1c5fb40647015c3dba Mon Sep 17 00:00:00 2001
From: majortom6 <tombarrett@siu.edu>
Date: Sun, 19 Feb 2017 11:13:04 -0600
Subject: -removed rectdrawer -removed unused shader -cleaned up main and
 window

---
 src/main.cpp | 97 ++++++++++++++++++++++++++----------------------------------
 1 file changed, 42 insertions(+), 55 deletions(-)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index 1033651..d5a192d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2,78 +2,65 @@
 
 int main()
 {
-    srand(time(NULL));
+        srand(time(NULL));
 
-	Window      main(WINDOW_X, WINDOW_Y, "natures");
+        Window      main(WINDOW_X, WINDOW_Y, "natures");
 	List        L;
 	Event       e;
 
-    //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/shaders/theshader");
-    GeoShader   shader2("./inc/opengl/shaders/basicshader");
-    Rectdrawer  rectrenderer(shader2);
-    SpriteBatch _spriteBatch(shader);
+        Transform   transform;
+        Camera      camera(glm::vec3(0,0,70), 70.0f, (float)800/(float)600, 0.01f, 1000.0f);
+        GeoShader   shader("./inc/opengl/shaders/theshader");
+        SpriteBatch _spriteBatch(shader);
 
-    _spriteBatch.init();
-    shader.Bind();
+        _spriteBatch.init();
+        shader.Bind();
 
-    int uniModel = glGetUniformLocation(shader.m_program, "MVP");
-    glUniformMatrix4fv(uniModel, 1, false, &transform.GetMVP(camera)[0][0]);
-    shader2.Bind();
+        int uniModel = glGetUniformLocation(shader.m_program, "MVP");
+        glUniformMatrix4fv(uniModel, 1, false, &transform.GetMVP(camera)[0][0]);
 
-    int uniModel2 = glGetUniformLocation(shader2.m_program, "MPV");
-    glUniformMatrix4fv(uniModel2, 1, false, &transform.GetMVP(camera)[0][0]);
-    int countedFrames = 0;
+        Timer       fps;
+        int         speed = 60;
+        bool        pause = false;
 
-    Timer       fps;
-    int         speed = 60;
-    bool        pause = false;
-
-	while(e.gRun()){
-        //fps.Start();
+        while(e.gRun()){
+                fps.Start();
 		while(e.Poll()){
 			if(e.gEventType() == SDL_QUIT)
 				e.off();
 			else if(e.gEventType() == SDL_KEYDOWN)
-                switch(e.gEvent().key.keysym.sym){
-                    case SDLK_q:        e.off();                    break;
-                    case SDLK_EQUALS:   speed+=30;                  break;
-                    case SDLK_MINUS:    if(speed >30) speed-=30;    break;
-                    case SDLK_SPACE:    pause=(pause)?(0):(1);      break;
-                }
+                                switch(e.gEvent().key.keysym.sym){
+                                        case SDLK_q:        e.off();                    break;
+                                        case SDLK_EQUALS:   speed+=30;                  break;
+                                        case SDLK_MINUS:    if(speed >30) speed-=30;    break;
+                                        case SDLK_SPACE:    pause=(pause)?(0):(1);      break;
+                                }
 		}
 
-        if(!pause){
-            main.Clear(0.0f,0.0f,0.0f,1.0f);
+                if(!pause){
+                        main.Clear();
             
-            L.Remove();
-            L.Behavior();
-            L.Place();
-
-            shader.Bind();
-            _spriteBatch.begin();
-            for(std::list<Creature>::iterator it = L.creatures.begin(); it != L.creatures.end(); it++)
-                _spriteBatch.draw(it->getGFXD());;
+                        L.Remove();
+                        L.Behavior();
+                        L.Place();
 
-            for(std::list<Resource>::iterator it = L.resources.begin(); it != L.resources.end(); it++)
-                _spriteBatch.draw(it->getGFXD());;
+                        shader.Bind();
+                        _spriteBatch.begin();
+                        
+                        for(std::list<Creature>::iterator it = L.creatures.begin(); it != L.creatures.end(); it++)
+                                _spriteBatch.draw(it->getGFXD());
 
-            _spriteBatch.end();
-            _spriteBatch.renderBatch();
+                        for(std::list<Resource>::iterator it = L.resources.begin(); it != L.resources.end(); it++)
+                                _spriteBatch.draw(it->getGFXD());
+                        
+                        _spriteBatch.end();
+                        _spriteBatch.renderBatch();
+                        main.swapBuffers();
+                }
 
-            main.swapBuffers();
-        }
-		
-        float avgFPS = countedFrames / ( fps.getTicks() / 1000.f );
-        if( avgFPS > 200000 ){
-            avgFPS = 0;
+                if(fps.getTicks() < (1000 / speed))
+                        SDL_Delay((1000 / speed) - fps.getTicks());
+                
         }
-        ++countedFrames;
-        //if(fps.getTicks() < (1000 / speed))
-        //    SDL_Delay((1000 / speed) - fps.getTicks());
-	}
-
-	return 0;
+        return 0;
 }
-- 
cgit v1.2.3