-began refractoring src

-reduced area creatures and resources spawn
-everything should be on 8 spaces now
-reorganized creatures action function to make more logical sense
-stripped out unused parts of geoshader and spritebatch

1 files changed, 108 insertions, 118 deletions

diff --git a/src/creature.cpp b/src/creature.cpp
index bf0ad43..1564fc2 100644
--- a/src/creature.cpp
+++ b/src/creature.cpp
@@ -1,19 +1,16 @@
 #include "creature.hpp"
+#include <cstdio>
 
-Creature::Creature(Rectangle t, DNA D)
+Creature::Creature(Rectangle r, DNA d)
 {
-        rect    = t;
-        myDNA   = D;
+        rect    = r;
+        myDNA   = d;
 
         if(rect.x == 0 && rect.y == 0){
-                rect.x = getRandom(50);
-                rect.y = getRandom(50);
+                rect.x = getRandom(30);
+                rect.y = getRandom(30);
         }
 
-        gfxData.sides   = 4.0;
-        gfxData.x       = rect.x;
-        gfxData.y       = rect.y;
-
         type            = CREATURE_TYPE;
         health          = myDNA.maxHealth/2;
         gender          = rand() % 2;
@@ -23,16 +20,10 @@ Creature::Creature(Rectangle t, DNA D)
         pregnate        = false;
         hasTarget       = false;
 
-        if(gender){
-                gfxData.r = 1.0;
-                gfxData.g = 0.0;
-                gfxData.b = 0.0;
-        }
-        else{
-                gfxData.r = 0.0;
-                gfxData.g = 0.0;
-                gfxData.b = 1.0;
-        }
+        if(gender)
+                gfxData = GraphicsData(rect.x, rect.y, 1, 0, 0, CREATURE_SIDES);
+        else
+                gfxData = GraphicsData(rect.x, rect.y, 0, 0, 1, CREATURE_SIDES);
 }
 
 void Creature::Behavior()
@@ -61,126 +52,125 @@ void Creature::Behavior()
 
 void Creature::Priority()
 {	 
-    if(health < myDNA.maxHealth / 2){
-        hungry = true;
-        able = false;
-    }
-    else{
-        hungry = false;
-        able = true;
-    }
+        if(health < myDNA.maxHealth / 2){
+                hungry = true;
+                able = false;
+        }
+        else{
+                hungry = false;
+                able = true;
+        }
 }
 
 void Creature::setTarget()
 {
-    std::random_shuffle(nearMe.begin(),nearMe.end());
-
-    for(std::vector <Entity*>::iterator it = nearMe.begin(); it!=nearMe.end(); it++){
-        if( (*it)->getType() == RESOURCE_TYPE && hungry){ 
-            target = *it;
-            hasTarget = true;
-            wander = false;
-            break;
-        } 
-        if( (*it)->getType() == CREATURE_TYPE && able && (*it)->getGender() != gender ){
-            target = *it;
-            hasTarget = true;
-            wander = false;
-            break;
-        }       
-    }
-
-    if(!hasTarget&&!wander){
-        wander = true;
-        float x = getRandom(50);
-        float y = getRandom(50);
-        Rectangle tmp;
-        tmp.x = x;
-        tmp.y = y;
-        wTarget = tmp;
-    }
+        std::random_shuffle(nearMe.begin(),nearMe.end());
+
+        for(std::vector <Entity*>::iterator it = nearMe.begin(); it!=nearMe.end(); it++){
+                if( (*it)->getType() == RESOURCE_TYPE && hungry){ 
+                        target = *it;
+                        hasTarget = true;
+                        wander = false;
+                        break;
+                } 
+                if( (*it)->getType() == CREATURE_TYPE && able && (*it)->getGender() != gender ){
+                        target = *it;
+                        hasTarget = true;
+                        wander = false;
+                        break;
+                }       
+        }
+
+        if(!hasTarget&&!wander){
+                wander = true;
+                Rectangle tmp;
+                tmp.x = getRandom(30);
+                tmp.y = getRandom(30);
+                wTarget = tmp;
+        }
 }
 
 void Creature::checkTarget()
 {
-    for(std::vector <Entity*>::iterator it = nearMe.begin(); it!=nearMe.end(); it++)
-        if( target == *it )
-            return;
+        for(std::vector <Entity*>::iterator it = nearMe.begin(); it!=nearMe.end(); it++)
+                if( target == *it )
+                        return;
 
-    hasTarget = false;
+        hasTarget = false;
 }
 
 
 void Creature::Action()
 {	
-    if(hasTarget){ 
-        if( Distance(rect,target->getRectangle()) < myDNA.reach && target->getType() == RESOURCE_TYPE){
-            target->eat(myDNA.bite);
-            health+=myDNA.bite;
-            amountAte++;
-            //if(rect.w <= myDNA.sizeMax && myDNA.amountToGrow <= amountAte){
-            //    amountAte = 0;
-            //    rect.w = rect.h = rect.w + 1;
-            //}
-            if(target->getAmount()<=0)
-                hasTarget = false; 
-        } 
-        else if( Distance(rect,target->getRectangle()) < myDNA.reach && target->getType() == CREATURE_TYPE && target->getGender() != gender ){
-            target->impregnate(myDNA);
-            hasTarget = false;
+        if(hasTarget){ 
+                if(Distance(rect,target->getRectangle()) < myDNA.reach){
+                        if(target->getType() == RESOURCE_TYPE){
+                                target->eat(myDNA.bite);
+                                health+=myDNA.bite;
+                                amountAte++;
+                                if(target->getAmount()<=0)
+                                        hasTarget = false;
+                        }
+                        else if (target->getType() == CREATURE_TYPE){
+                                if(target->getGender() != gender){
+                                        target->impregnate(myDNA);
+                                }
+                                hasTarget = false;
+                        }
+
+                }
+                else
+                        moveTowards(target->getRectangle());
+        }
+        else if(wander){
+                if(Distance(rect,wTarget) < myDNA.reach)
+                        wander = false;
+                else
+                        moveTowards(wTarget);
         }
-        else
-            moveTowards(target->getRectangle());    
-    }
-    else if(wander){
-        if(Distance(rect,wTarget) < myDNA.reach)
-            wander = false;
-        else
-            moveTowards(wTarget);
-    }
 }
 
 void Creature::moveTowards(Rectangle t)
 {
-    if( rect.x == t.x ){
-        if( rect.y < t.y )
-		    rect.y+=myDNA.speed;
-		else
-			rect.y-=myDNA.speed;
-	}
-	else if( rect.y == t.y ){
-		if( rect.x < t.x )
-			rect.x+=myDNA.speed;
-		else
-			rect.x-=myDNA.speed;
-	}
-	else if( rect.x < t.x ){
-		if( rect.y < t.y ){
-			rect.x+=myDNA.speed;
-			rect.y+=myDNA.speed;
-		}
-		else{
-			rect.x+=myDNA.speed;
-			rect.y-=myDNA.speed;
-		}
-	}
-	else if ( rect.x > t.x ){
-		if( rect.y < t.y ){
-			rect.x-=myDNA.speed;
-			rect.y+=myDNA.speed;
-		}
-		else{
-			rect.x-=myDNA.speed;
-			rect.y-=myDNA.speed;
-		}
-	}
+        if( rect.x == t.x ){
+                if( rect.y < t.y )
+                        rect.y+=myDNA.speed;
+                else
+                        rect.y-=myDNA.speed;
+        }
+        else if( rect.y == t.y ){
+                if( rect.x < t.x )
+                        rect.x+=myDNA.speed;
+                else
+                        rect.x-=myDNA.speed;
+        }
+        else if( rect.x < t.x ){
+                if( rect.y < t.y ){
+                        rect.x+=myDNA.speed;
+                        rect.y+=myDNA.speed;
+                }
+                else{
+                        rect.x+=myDNA.speed;
+                        rect.y-=myDNA.speed;
+                }
+        }
+        else if ( rect.x > t.x ){
+                if( rect.y < t.y ){
+                        rect.x-=myDNA.speed;
+                        rect.y+=myDNA.speed;
+                }
+                else{
+                        rect.x-=myDNA.speed;
+                        rect.y-=myDNA.speed;
+                }
+        }
 }
 
 void Creature::impregnate(DNA D)
 {
-    if(!pregnate){
-        pregnate = true;
-        pregnancyTime = 0;
-        childsDNA = myDNA.combine(D);
-    }
+        if(!pregnate){
+                pregnate = true;
+                pregnancyTime = 0;
+                childsDNA = myDNA.combine(D);
+        }
 }