Switch player side, updated controls, add to gui

Author: eros.dipede

TextureDemo/TextureDemo/Board.cpp

@@ -5,10 +5,10 @@ Board::Board(Camera* camera, ParticleSystem* particleSystem, Graph* graph, vecto
 {
 	spawnTimer = glfwGetTime() - spawnDelay;
 	srand(time(NULL));
-	createTower(0,(int)rand() % 3, 0, glm::vec3(-4.0, 0.5, 0));
-	createTower(0,(int)rand() % 3, 0, glm::vec3(-2.5, 0.5, 0));
-	createTower(1,(int)rand() % 3, 1, glm::vec3(4.0, 0.5, 0));
-	createTower(1,(int)rand() % 3, 1, glm::vec3(2.5, 0.5, 0));
+	createTower(1,(int)rand() % 3, 0, glm::vec3(-4.0, 0.5, 0));
+	createTower(1,(int)rand() % 3, 0, glm::vec3(-2.5, 0.5, 0));
+	createTower(0,(int)rand() % 3, 1, glm::vec3(4.0, 0.5, 0));
+	createTower(0,(int)rand() % 3, 1, glm::vec3(2.5, 0.5, 0));
 }
 
 const double Board::heights[] = {-0.32, -0.58, -0.84 };
@@ -34,35 +34,70 @@ void Board::update(double deltaTime)
 		castles.at(i)->update(deltaTime, (2.0f * mousePosition - cameraPosition), castles.at((i) ? 0 : 1));
 	}
 
+	//adds funds every 5 seconds
+	if ((glfwGetTime() - fundsTimer) > fundsDelay) {
+		fundsTimer = glfwGetTime();
+		for (int i = 0; i < castles.size(); i++)
+		{
+			castles.at(i)->addFunds(5);
+		}
+	}
+
+	#pragma region Enemy Spawning
 	if ((glfwGetTime() - spawnTimer) > spawnDelay)
 	{
-		spawnTimer = glfwGetTime();
-		createUnit(0,(int)rand() % 4, 0, glm::vec3(-4.92, heights[(int)rand() % 3], 0));
+		switch ((int)rand() % 4) {
+		case 0:
+			if (castles.at(0)->spendFunds(u1Cost)) {
+				createUnit(0, 0, 0, glm::vec3(4.92, heights[(int)rand() % 3], 0));
+				spawnTimer = glfwGetTime();
+			}
+			break;
+		case 1:
+			if (castles.at(0)->spendFunds(u2Cost)) {
+				createUnit(0, 1, 0, glm::vec3(4.92, heights[(int)rand() % 3], 0));
+				spawnTimer = glfwGetTime();
+			}
+			break;
+		case 2:
+			if (castles.at(0)->spendFunds(u3Cost)) {
+				createUnit(0, 2, 0, glm::vec3(4.92, heights[(int)rand() % 3], 0));
+				spawnTimer = glfwGetTime();
+			}
+			break;
+		case 3:
+			if (castles.at(0)->spendFunds(u4Cost)) {
+				createUnit(0, 3, 0, glm::vec3(4.92, heights[(int)rand() % 3], 0));
+				spawnTimer = glfwGetTime();
+			}
+			break;
+		}
 	}
+	#pragma endregion
 
 	#pragma region Key Control
 	if (((glfwGetTime() - createTimer)) > createDelay) {
 		if (glfwGetKey(Window::getWindow(), GLFW_KEY_1) == GLFW_PRESS) {
 			if (castles.at(1)->spendFunds(u1Cost)) {
-				createUnit(1, 0, 1, glm::vec3(4.92, heights[(int)rand() % 3], 0));
+				createUnit(1, 0, 1, glm::vec3(-4.92, heights[(int)rand() % 3], 0));
 				createTimer = glfwGetTime();
 			}
 		}
 		else if (glfwGetKey(Window::getWindow(), GLFW_KEY_2) == GLFW_PRESS) {
 			if (castles.at(1)->spendFunds(u2Cost)) {
-				createUnit(1, 1, 1, glm::vec3(4.92, heights[(int)rand() % 3], 0));
+				createUnit(1, 1, 1, glm::vec3(-4.92, heights[(int)rand() % 3], 0));
 				createTimer = glfwGetTime();
 			}
 		}
 		else if (glfwGetKey(Window::getWindow(), GLFW_KEY_3) == GLFW_PRESS) {
 			if (castles.at(1)->spendFunds(u3Cost)) {
-				createUnit(1, 2, 1, glm::vec3(4.92, heights[(int)rand() % 3], 0));
+				createUnit(1, 2, 1, glm::vec3(-4.92, heights[(int)rand() % 3], 0));
 				createTimer = glfwGetTime();
 			}
 		}
 		else if (glfwGetKey(Window::getWindow(), GLFW_KEY_4) == GLFW_PRESS) {
 			if (castles.at(1)->spendFunds(u4Cost)) {
-				createUnit(1, 3, 1, glm::vec3(4.92, heights[(int)rand() % 3], 0));
+				createUnit(1, 3, 1, glm::vec3(-4.92, heights[(int)rand() % 3], 0));
 				createTimer = glfwGetTime();
 			}
 		}
@@ -117,8 +152,8 @@ void Board::createUnit(int castleNumber, int type, bool playerControlled, glm::v
 							 playerControlled,
 							 movementSpeed,
 							 graph,
-							 glm::vec3((playerControlled) ? -0.1 : 0.1, 0.15, 1),
-							 (playerControlled) ? glm::vec2(-5.88, -0.32) : glm::vec2(5.88, -0.32),
+							 glm::vec3((!playerControlled) ? -0.1 : 0.1, 0.15, 1),
+							 (!playerControlled) ? glm::vec2(-5.88, -0.32) : glm::vec2(5.88, -0.32),
 							 position,
 							 castle->getUnitTextures().at(type),
 							 castle->getNumElem()));

TextureDemo/TextureDemo/Board.h

@@ -34,11 +34,13 @@ class Board
 	const static double heights[];
 	float spawnDelay = 20,
 		  spawnTimer = 0,
+		  fundsDelay = 5,
+		  fundsTimer = 0,
 	      u1Cost = 25,
-		  u2Cost = 25,
-		  u3Cost = 25,
-		  u4Cost = 25,
+		  u2Cost = 10,
+		  u3Cost = 100,
+		  u4Cost = 50,
 		  createTimer = 0,
-		  createDelay = 1;
+		  createDelay = 0.5;
 };
 

TextureDemo/TextureDemo/Camera.cpp

@@ -47,8 +47,8 @@ void Camera::update(double deltaTime)
 	shader.setUniformMat4("viewMatrix", viewMatrix);
 
 	//zooms camera in and out
-	if (glfwGetKey(Window::getWindow(), GLFW_KEY_Z) == GLFW_PRESS) zoomCamera(-zoomSpeed);
-	else if (glfwGetKey(Window::getWindow(), GLFW_KEY_X) == GLFW_PRESS) zoomCamera(zoomSpeed);
+	if (glfwGetKey(Window::getWindow(), GLFW_KEY_Q) == GLFW_PRESS) zoomCamera(-zoomSpeed);
+	else if (glfwGetKey(Window::getWindow(), GLFW_KEY_E) == GLFW_PRESS) zoomCamera(zoomSpeed);
 
 	//resets zoom scale
 	if (glfwGetKey(Window::getWindow(), GLFW_KEY_R) == GLFW_PRESS) zoom = 0.5f;

TextureDemo/TextureDemo/Castle.cpp

@@ -69,7 +69,7 @@ void Castle::update(double deltaTime, glm::vec2 mousePosition, Castle* otherCast
 	for (int i = 0; i < units.size(); i++)
 	{
 		Unit* unit = units.at(i);
-		unit->update(deltaTime, otherCastles->getUnits());
+		unit->update(deltaTime, otherCastles);
 		if (unit->getHealth() <= 0)
 		{
 			unit = NULL;

TextureDemo/TextureDemo/Castle.h

@@ -23,7 +23,10 @@ class Castle :
 	void update(double deltaTime,glm::vec2 mousePosition, Castle* otherCastles);
 	//spend funds, return if funds were spent or not
 	bool spendFunds(double funds);
+	//increase funds
 	inline void addFunds(double funds) { this->funds += funds; }
+	//takes damage
+	inline void takeDamage(double dmg) { health -= dmg;  }
 	//shooting functions
 	void shoot(glm::vec3 target, int damage);
 	void removeProjectile(int index);