Enemy Destruction Prototyped, Directional Movement Improved

asiviero · Jul 26, 2012 · 01f1411 · 01f1411
1 parent aa296ce
commit 01f1411
Show file tree

Hide file tree

Showing 52 changed files with 355 additions and 137 deletions.
diff --git a/Box2D/Dynamics/b2World.cpp b/Box2D/Dynamics/b2World.cpp
@@ -20,6 +20,8 @@
 #include "../../inc/m_move.h"
 #include "../../inc/enemyData.h"
 #include "../../inc/constants.h"
+#include "../../inc/userInput.h"
+
 #include <GL/gl.h>
 #include <GL/glut.h>
 
@@ -982,11 +984,12 @@ void b2World::Step(float32 dt, int32 velocityIterations, int32 positionIteration
 	    MS_LEFT,
 	    MS_RIGHT,
 	  };
-	int i=0;
+
 	b2Vec2 vel;
 	b2Body *body = NULL,*mainAgent = NULL;
-	//cout << "passei2\n";
-	//cout << this->GetBodyCount() << endl;
+	performSpecialKeyOperations();
+
+
 	for(body = GetBodyList();body!=NULL;body=body->GetNext()) {
 		if(body->GetType()!=b2_dynamicBody) continue;
 	/*
@@ -1000,13 +1003,15 @@ void b2World::Step(float32 dt, int32 velocityIterations, int32 positionIteration
 				//cout << "I'm here\n";
 				m_move *t = static_cast<m_move*>(agentD->getUserData());
 				mainAgent = body;
+
+				//cout << "X: " << t->m_state[X_AXIS] << " Y: " << t->m_state[Y_AXIS] << endl;
 				switch(t->m_state[X_AXIS]) {
-					  case MS_LEFT:  vel.x = -20; break;
+					  case MS_LEFT:  vel.x = -MAIN_AGENT_SPEED; break;
 					  case MS_STOP:  vel.x =  (body->GetLinearVelocity())(X_AXIS);; break;
-					  case MS_RIGHT: vel.x =  20; break;
+					  case MS_RIGHT: vel.x =  MAIN_AGENT_SPEED; break;
 				}
 				if(t->m_state[Y_AXIS]==MS_UP) {
-					vel.y = 10;
+					vel.y = MAIN_AGENT_SPEED*2;
 				}
 				else {
 					vel.y = (body->GetLinearVelocity())(Y_AXIS);
@@ -1035,6 +1040,10 @@ void b2World::Step(float32 dt, int32 velocityIterations, int32 positionIteration
 
 
 		if(agentD->agentType == ENEMY) {
+			if(agentD->scheduledForDestruction == true) {
+				DestroyBody(body);
+				continue;
+			}
 			enemyData *eD = static_cast<enemyData*>(agentD->getUserData());
 			// Horizontal movement
 			if(eD->intMovementDirection == X_AXIS) {

diff --git a/Debug/Box2D/Dynamics/b2World.d b/Debug/Box2D/Dynamics/b2World.d
@@ -2,7 +2,8 @@ Box2D/Dynamics/b2World.d Box2D/Dynamics/b2World.o: \
  ../Box2D/Dynamics/b2World.cpp ../Box2D/Dynamics/../../inc/agentData.h \
  ../Box2D/Dynamics/../../inc/m_move.h \
  ../Box2D/Dynamics/../../inc/enemyData.h \
- ../Box2D/Dynamics/../../inc/constants.h
+ ../Box2D/Dynamics/../../inc/constants.h \
+ ../Box2D/Dynamics/../../inc/userInput.h
 
 ../Box2D/Dynamics/../../inc/agentData.h:
 
@@ -11,3 +12,5 @@ Box2D/Dynamics/b2World.d Box2D/Dynamics/b2World.o: \
 ../Box2D/Dynamics/../../inc/enemyData.h:
 
 ../Box2D/Dynamics/../../inc/constants.h:
+
+../Box2D/Dynamics/../../inc/userInput.h:
diff --git a/Debug/Box2D/Dynamics/b2World.o b/Debug/Box2D/Dynamics/b2World.o
diff --git a/Debug/Render.d b/Debug/Render.d
@@ -1,13 +1,16 @@
-Render.d Render.o: ../Render.cpp ../Render.h ../inc.h ../inc/constants.h \
- ../inc/friction.h ../inc/userInput.h ../inc/generalDrawing.h \
- ../inc/agent.h ../inc/timer.h ../inc/list.h ../inc/terrain.h \
- ../inc/../inc.h ../inc/m_move.h ../inc/directional.h ../inc/camera.h \
- ../inc/enemyData.h ../inc/agentData.h ../inc/enemy.h
+Render.d Render.o: ../Render.cpp ../Render.h ../inc.h ../Box2D/Box2D.h \
+ ../inc/constants.h ../inc/friction.h ../inc/userInput.h \
+ ../inc/generalDrawing.h ../inc/agent.h ../inc/timer.h ../inc/list.h \
+ ../inc/terrain.h ../inc/../inc.h ../inc/m_move.h ../inc/directional.h \
+ ../inc/camera.h ../inc/enemyData.h ../inc/agentData.h ../inc/enemy.h \
+ ../inc/contactListener.h
 
 ../Render.h:
 
 ../inc.h:
 
+../Box2D/Box2D.h:
+
 ../inc/constants.h:
 
 ../inc/friction.h:
@@ -37,3 +40,5 @@ Render.d Render.o: ../Render.cpp ../Render.h ../inc.h ../inc/constants.h \
 ../inc/agentData.h:
 
 ../inc/enemy.h:
+
+../inc/contactListener.h:
diff --git a/Debug/Render.o b/Debug/Render.o
diff --git a/Debug/main.d b/Debug/main.d
@@ -1,11 +1,14 @@
-main.d main.o: ../main.cpp ../inc.h ../inc/constants.h ../inc/friction.h \
- ../inc/userInput.h ../inc/generalDrawing.h ../inc/agent.h ../inc/timer.h \
- ../inc/list.h ../inc/terrain.h ../inc/../inc.h ../inc/m_move.h \
- ../inc/directional.h ../inc/camera.h ../inc/enemyData.h \
- ../inc/agentData.h ../inc/enemy.h ../Render.h
+main.d main.o: ../main.cpp ../inc.h ../Box2D/Box2D.h ../inc/constants.h \
+ ../inc/friction.h ../inc/userInput.h ../inc/generalDrawing.h \
+ ../inc/agent.h ../inc/timer.h ../inc/list.h ../inc/terrain.h \
+ ../inc/../inc.h ../inc/m_move.h ../inc/directional.h ../inc/camera.h \
+ ../inc/enemyData.h ../inc/agentData.h ../inc/enemy.h \
+ ../inc/contactListener.h ../Render.h
 
 ../inc.h:
 
+../Box2D/Box2D.h:
+
 ../inc/constants.h:
 
 ../inc/friction.h:
@@ -36,4 +39,6 @@ main.d main.o: ../main.cpp ../inc.h ../inc/constants.h ../inc/friction.h \
 
 ../inc/enemy.h:
 
+../inc/contactListener.h:
+
 ../Render.h:
diff --git a/Debug/main.o b/Debug/main.o
diff --git a/Debug/objects.mk b/Debug/objects.mk
@@ -4,4 +4,4 @@
 
 USER_OBJS :=
 
-LIBS := -lm -lGLU -lglut -lGL
+LIBS := -lm -lpthread -lGLU -lglut -lGL
diff --git a/Debug/src/agent.d b/Debug/src/agent.d
@@ -1,14 +1,17 @@
 src/agent.d src/agent.o: ../src/agent.cpp ../src/../inc.h \
- ../src/../inc/constants.h ../src/../inc/friction.h \
- ../src/../inc/userInput.h ../src/../inc/generalDrawing.h \
- ../src/../inc/agent.h ../src/../inc/timer.h ../src/../inc/list.h \
- ../src/../inc/terrain.h ../src/../inc/../inc.h ../src/../inc/m_move.h \
+ ../src/../Box2D/Box2D.h ../src/../inc/constants.h \
+ ../src/../inc/friction.h ../src/../inc/userInput.h \
+ ../src/../inc/generalDrawing.h ../src/../inc/agent.h \
+ ../src/../inc/timer.h ../src/../inc/list.h ../src/../inc/terrain.h \
+ ../src/../inc/../inc.h ../src/../inc/m_move.h \
  ../src/../inc/directional.h ../src/../inc/camera.h \
  ../src/../inc/enemyData.h ../src/../inc/agentData.h \
- ../src/../inc/enemy.h ../src/../Render.h
+ ../src/../inc/enemy.h ../src/../inc/contactListener.h ../src/../Render.h
 
 ../src/../inc.h:
 
+../src/../Box2D/Box2D.h:
+
 ../src/../inc/constants.h:
 
 ../src/../inc/friction.h:
@@ -39,4 +42,6 @@ src/agent.d src/agent.o: ../src/agent.cpp ../src/../inc.h \
 
 ../src/../inc/enemy.h:
 
+../src/../inc/contactListener.h:
+
 ../src/../Render.h:
diff --git a/Debug/src/agent.o b/Debug/src/agent.o
diff --git a/Debug/src/agentData.d b/Debug/src/agentData.d
@@ -1,14 +1,17 @@
 src/agentData.d src/agentData.o: ../src/agentData.cpp ../src/../inc.h \
- ../src/../inc/constants.h ../src/../inc/friction.h \
- ../src/../inc/userInput.h ../src/../inc/generalDrawing.h \
- ../src/../inc/agent.h ../src/../inc/timer.h ../src/../inc/list.h \
- ../src/../inc/terrain.h ../src/../inc/../inc.h ../src/../inc/m_move.h \
+ ../src/../Box2D/Box2D.h ../src/../inc/constants.h \
+ ../src/../inc/friction.h ../src/../inc/userInput.h \
+ ../src/../inc/generalDrawing.h ../src/../inc/agent.h \
+ ../src/../inc/timer.h ../src/../inc/list.h ../src/../inc/terrain.h \
+ ../src/../inc/../inc.h ../src/../inc/m_move.h \
  ../src/../inc/directional.h ../src/../inc/camera.h \
  ../src/../inc/enemyData.h ../src/../inc/agentData.h \
- ../src/../inc/enemy.h ../src/../Render.h
+ ../src/../inc/enemy.h ../src/../inc/contactListener.h ../src/../Render.h
 
 ../src/../inc.h:
 
+../src/../Box2D/Box2D.h:
+
 ../src/../inc/constants.h:
 
 ../src/../inc/friction.h:
@@ -39,4 +42,6 @@ src/agentData.d src/agentData.o: ../src/agentData.cpp ../src/../inc.h \
 
 ../src/../inc/enemy.h:
 
+../src/../inc/contactListener.h:
+
 ../src/../Render.h:
diff --git a/Debug/src/agentData.o b/Debug/src/agentData.o
diff --git a/Debug/src/bounce.d b/Debug/src/bounce.d
@@ -1,14 +1,17 @@
 src/bounce.d src/bounce.o: ../src/bounce.cpp ../src/../inc.h \
- ../src/../inc/constants.h ../src/../inc/friction.h \
- ../src/../inc/userInput.h ../src/../inc/generalDrawing.h \
- ../src/../inc/agent.h ../src/../inc/timer.h ../src/../inc/list.h \
- ../src/../inc/terrain.h ../src/../inc/../inc.h ../src/../inc/m_move.h \
+ ../src/../Box2D/Box2D.h ../src/../inc/constants.h \
+ ../src/../inc/friction.h ../src/../inc/userInput.h \
+ ../src/../inc/generalDrawing.h ../src/../inc/agent.h \
+ ../src/../inc/timer.h ../src/../inc/list.h ../src/../inc/terrain.h \
+ ../src/../inc/../inc.h ../src/../inc/m_move.h \
  ../src/../inc/directional.h ../src/../inc/camera.h \
  ../src/../inc/enemyData.h ../src/../inc/agentData.h \
- ../src/../inc/enemy.h ../src/../Render.h
+ ../src/../inc/enemy.h ../src/../inc/contactListener.h ../src/../Render.h
 
 ../src/../inc.h:
 
+../src/../Box2D/Box2D.h:
+
 ../src/../inc/constants.h:
 
 ../src/../inc/friction.h:
@@ -39,4 +42,6 @@ src/bounce.d src/bounce.o: ../src/bounce.cpp ../src/../inc.h \
 
 ../src/../inc/enemy.h:
 
+../src/../inc/contactListener.h:
+
 ../src/../Render.h:
diff --git a/Debug/src/bounce.o b/Debug/src/bounce.o
diff --git a/Debug/src/camera.d b/Debug/src/camera.d
@@ -1,14 +1,17 @@
 src/camera.d src/camera.o: ../src/camera.cpp ../src/../inc.h \
- ../src/../inc/constants.h ../src/../inc/friction.h \
- ../src/../inc/userInput.h ../src/../inc/generalDrawing.h \
- ../src/../inc/agent.h ../src/../inc/timer.h ../src/../inc/list.h \
- ../src/../inc/terrain.h ../src/../inc/../inc.h ../src/../inc/m_move.h \
+ ../src/../Box2D/Box2D.h ../src/../inc/constants.h \
+ ../src/../inc/friction.h ../src/../inc/userInput.h \
+ ../src/../inc/generalDrawing.h ../src/../inc/agent.h \
+ ../src/../inc/timer.h ../src/../inc/list.h ../src/../inc/terrain.h \
+ ../src/../inc/../inc.h ../src/../inc/m_move.h \
  ../src/../inc/directional.h ../src/../inc/camera.h \
  ../src/../inc/enemyData.h ../src/../inc/agentData.h \
- ../src/../inc/enemy.h ../src/../Render.h
+ ../src/../inc/enemy.h ../src/../inc/contactListener.h ../src/../Render.h
 
 ../src/../inc.h:
 
+../src/../Box2D/Box2D.h:
+
 ../src/../inc/constants.h:
 
 ../src/../inc/friction.h:
@@ -39,4 +42,6 @@ src/camera.d src/camera.o: ../src/camera.cpp ../src/../inc.h \
 
 ../src/../inc/enemy.h:
 
+../src/../inc/contactListener.h:
+
 ../src/../Render.h:
diff --git a/Debug/src/camera.o b/Debug/src/camera.o
diff --git a/Debug/src/contactListener.d b/Debug/src/contactListener.d
@@ -0,0 +1,47 @@
+src/contactListener.d src/contactListener.o: ../src/contactListener.cpp \
+ ../src/../inc.h ../src/../Box2D/Box2D.h ../src/../inc/constants.h \
+ ../src/../inc/friction.h ../src/../inc/userInput.h \
+ ../src/../inc/generalDrawing.h ../src/../inc/agent.h \
+ ../src/../inc/timer.h ../src/../inc/list.h ../src/../inc/terrain.h \
+ ../src/../inc/../inc.h ../src/../inc/m_move.h \
+ ../src/../inc/directional.h ../src/../inc/camera.h \
+ ../src/../inc/enemyData.h ../src/../inc/agentData.h \
+ ../src/../inc/enemy.h ../src/../inc/contactListener.h ../src/../Render.h
+
+../src/../inc.h:
+
+../src/../Box2D/Box2D.h:
+
+../src/../inc/constants.h:
+
+../src/../inc/friction.h:
+
+../src/../inc/userInput.h:
+
+../src/../inc/generalDrawing.h:
+
+../src/../inc/agent.h:
+
+../src/../inc/timer.h:
+
+../src/../inc/list.h:
+
+../src/../inc/terrain.h:
+
+../src/../inc/../inc.h:
+
+../src/../inc/m_move.h:
+
+../src/../inc/directional.h:
+
+../src/../inc/camera.h:
+
+../src/../inc/enemyData.h:
+
+../src/../inc/agentData.h:
+
+../src/../inc/enemy.h:
+
+../src/../inc/contactListener.h:
+
+../src/../Render.h:
diff --git a/Debug/src/contactListener.o b/Debug/src/contactListener.o
diff --git a/Debug/src/directional.d b/Debug/src/directional.d
@@ -1,14 +1,17 @@
 src/directional.d src/directional.o: ../src/directional.cpp \
- ../src/../inc.h ../src/../inc/constants.h ../src/../inc/friction.h \
- ../src/../inc/userInput.h ../src/../inc/generalDrawing.h \
- ../src/../inc/agent.h ../src/../inc/timer.h ../src/../inc/list.h \
- ../src/../inc/terrain.h ../src/../inc/../inc.h ../src/../inc/m_move.h \
+ ../src/../inc.h ../src/../Box2D/Box2D.h ../src/../inc/constants.h \
+ ../src/../inc/friction.h ../src/../inc/userInput.h \
+ ../src/../inc/generalDrawing.h ../src/../inc/agent.h \
+ ../src/../inc/timer.h ../src/../inc/list.h ../src/../inc/terrain.h \
+ ../src/../inc/../inc.h ../src/../inc/m_move.h \
  ../src/../inc/directional.h ../src/../inc/camera.h \
  ../src/../inc/enemyData.h ../src/../inc/agentData.h \
- ../src/../inc/enemy.h ../src/../Render.h
+ ../src/../inc/enemy.h ../src/../inc/contactListener.h ../src/../Render.h
 
 ../src/../inc.h:
 
+../src/../Box2D/Box2D.h:
+
 ../src/../inc/constants.h:
 
 ../src/../inc/friction.h:
@@ -39,4 +42,6 @@ src/directional.d src/directional.o: ../src/directional.cpp \
 
 ../src/../inc/enemy.h:
 
+../src/../inc/contactListener.h:
+
 ../src/../Render.h:
diff --git a/Debug/src/directional.o b/Debug/src/directional.o
diff --git a/Debug/src/enemy.d b/Debug/src/enemy.d
@@ -1,14 +1,17 @@
 src/enemy.d src/enemy.o: ../src/enemy.cpp ../src/../inc.h \
- ../src/../inc/constants.h ../src/../inc/friction.h \
- ../src/../inc/userInput.h ../src/../inc/generalDrawing.h \
- ../src/../inc/agent.h ../src/../inc/timer.h ../src/../inc/list.h \
- ../src/../inc/terrain.h ../src/../inc/../inc.h ../src/../inc/m_move.h \
+ ../src/../Box2D/Box2D.h ../src/../inc/constants.h \
+ ../src/../inc/friction.h ../src/../inc/userInput.h \
+ ../src/../inc/generalDrawing.h ../src/../inc/agent.h \
+ ../src/../inc/timer.h ../src/../inc/list.h ../src/../inc/terrain.h \
+ ../src/../inc/../inc.h ../src/../inc/m_move.h \
  ../src/../inc/directional.h ../src/../inc/camera.h \
  ../src/../inc/enemyData.h ../src/../inc/agentData.h \
- ../src/../inc/enemy.h ../src/../Render.h
+ ../src/../inc/enemy.h ../src/../inc/contactListener.h ../src/../Render.h
 
 ../src/../inc.h:
 
+../src/../Box2D/Box2D.h:
+
 ../src/../inc/constants.h:
 
 ../src/../inc/friction.h:
@@ -39,4 +42,6 @@ src/enemy.d src/enemy.o: ../src/enemy.cpp ../src/../inc.h \
 
 ../src/../inc/enemy.h:
 
+../src/../inc/contactListener.h:
+
 ../src/../Render.h:
diff --git a/Debug/src/enemy.o b/Debug/src/enemy.o
diff --git a/Debug/src/enemyData.d b/Debug/src/enemyData.d
@@ -1,14 +1,17 @@
 src/enemyData.d src/enemyData.o: ../src/enemyData.cpp ../src/../inc.h \
- ../src/../inc/constants.h ../src/../inc/friction.h \
- ../src/../inc/userInput.h ../src/../inc/generalDrawing.h \
- ../src/../inc/agent.h ../src/../inc/timer.h ../src/../inc/list.h \
- ../src/../inc/terrain.h ../src/../inc/../inc.h ../src/../inc/m_move.h \
+ ../src/../Box2D/Box2D.h ../src/../inc/constants.h \
+ ../src/../inc/friction.h ../src/../inc/userInput.h \
+ ../src/../inc/generalDrawing.h ../src/../inc/agent.h \
+ ../src/../inc/timer.h ../src/../inc/list.h ../src/../inc/terrain.h \
+ ../src/../inc/../inc.h ../src/../inc/m_move.h \
  ../src/../inc/directional.h ../src/../inc/camera.h \
  ../src/../inc/enemyData.h ../src/../inc/agentData.h \
- ../src/../inc/enemy.h ../src/../Render.h
+ ../src/../inc/enemy.h ../src/../inc/contactListener.h ../src/../Render.h
 
 ../src/../inc.h:
 
+../src/../Box2D/Box2D.h:
+
 ../src/../inc/constants.h:
 
 ../src/../inc/friction.h:
@@ -39,4 +42,6 @@ src/enemyData.d src/enemyData.o: ../src/enemyData.cpp ../src/../inc.h \
 
 ../src/../inc/enemy.h:
 
+../src/../inc/contactListener.h:
+
 ../src/../Render.h:
diff --git a/Debug/src/enemyData.o b/Debug/src/enemyData.o