From c2cb8f9fc6606e3aca045ed9bfd95c55247af186 Mon Sep 17 00:00:00 2001
From: ineslelin <ines.l.lintner@gmail.com>
Date: Sun, 28 Jan 2024 16:49:08 +0100
Subject: [PATCH] fixed collision interaction with player

---
 extern/libpng               |  1 -
 extern/zlib                 |  1 -
 include/ColliderComponent.h |  5 +++++
 include/Game.h              |  2 --
 src/ColliderComponent.cpp   | 17 +++++++++++++++++
 src/Game.cpp                | 31 ++++++++++++++++---------------
 6 files changed, 38 insertions(+), 19 deletions(-)
 delete mode 160000 extern/libpng
 delete mode 160000 extern/zlib

diff --git a/extern/libpng b/extern/libpng
deleted file mode 160000
index 71b9b5e..0000000
--- a/extern/libpng
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 71b9b5e16ef751d973a3935284382bc344ff9941
diff --git a/extern/zlib b/extern/zlib
deleted file mode 160000
index 09155ea..0000000
--- a/extern/zlib
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 09155eaa2f9270dc4ed1fa13e2b4b2613e6e4851
diff --git a/include/ColliderComponent.h b/include/ColliderComponent.h
index 7c587ae..ef4d5c8 100644
--- a/include/ColliderComponent.h
+++ b/include/ColliderComponent.h
@@ -3,6 +3,7 @@
 #include <SDL.h>
 
 #include "Component.h"
+#include "Vector2D.h"
 
 class TransformComponent;
 
@@ -15,10 +16,14 @@ public:
 	bool hasCollision; //added for removing collision of destroyed projectiles
 	float hitboxScale; //adds a seperate variable for the scale of the hitbox (not the sprite) so each sprite can have a different hitbox size if needed
 
+	bool isProjectile = false;
+
 	ColliderComponent(const char* tag);
 	ColliderComponent(const char* tag, float hitboxScale);
 
 	void init() override;
 	void update() override;
     void removeCollision();
+
+	void handleCollision(Vector2D& characterPos, SDL_Rect& characterCollider, SDL_Rect& componentCollider);
 };
\ No newline at end of file
diff --git a/include/Game.h b/include/Game.h
index 64f2ce2..a6fe7ab 100644
--- a/include/Game.h
+++ b/include/Game.h
@@ -31,8 +31,6 @@ public:
     
     bool getWinner();
 
-	void handleCollision(Vector2D& characterPos, SDL_Rect& characterCollider, SDL_Rect& componentCollider);
-
 private:
 	int counter = 0;
 	bool isRunning = false;
diff --git a/src/ColliderComponent.cpp b/src/ColliderComponent.cpp
index d1c59c0..5ba9ad5 100644
--- a/src/ColliderComponent.cpp
+++ b/src/ColliderComponent.cpp
@@ -25,6 +25,10 @@ void ColliderComponent::init()
 		entity->addComponent<TransformComponent>();
 	}
 
+	if (strcmp(this->tag, "projectile") == 0) {
+		this->isProjectile = true;
+	}
+
 	transform = &entity->getComponent<TransformComponent>();
 	Game::colliders.push_back(this);
 }
@@ -43,3 +47,16 @@ void ColliderComponent::removeCollision()
 {
 	this->hasCollision = false;
 }
+
+void ColliderComponent::handleCollision(Vector2D& entityPos, SDL_Rect& entityCollider, SDL_Rect& componentCollider)
+{
+	// collision to right of character
+	if (entityPos.x < componentCollider.x)
+	{
+		entityPos.x = componentCollider.x - entityCollider.w;
+	}
+	else // collision to left of character
+	{
+		entityPos.x = componentCollider.x + componentCollider.w;
+	}
+}
\ No newline at end of file
diff --git a/src/Game.cpp b/src/Game.cpp
index 0c55e37..5afe1e3 100644
--- a/src/Game.cpp
+++ b/src/Game.cpp
@@ -158,11 +158,25 @@ void Game::update()
 	{
 		if (SDL_HasIntersection(&player.getComponent<ColliderComponent>().collider, &cc->collider) && strcmp(cc->tag, "player") && cc->hasCollision)
 		{
-			handleCollision(player.getComponent<TransformComponent>().position, player.getComponent<ColliderComponent>().collider, cc->collider);
+			if (!cc->isProjectile)
+			{
+				player.getComponent<ColliderComponent>().handleCollision(player.getComponent<TransformComponent>().position, player.getComponent<ColliderComponent>().collider, cc->collider);
+			}
+			else
+			{
+				player.getComponent<TransformComponent>().position = playerPos;
+			}
 		}
 		if (SDL_HasIntersection(&enemy.getComponent<ColliderComponent>().collider, &cc->collider) && strcmp(cc->tag, "enemy") && cc->hasCollision)
 		{
-			handleCollision(enemy.getComponent<TransformComponent>().position, enemy.getComponent<ColliderComponent>().collider, cc->collider);
+			if (!cc->isProjectile)
+			{
+				enemy.getComponent<ColliderComponent>().handleCollision(enemy.getComponent<TransformComponent>().position, enemy.getComponent<ColliderComponent>().collider, cc->collider);
+			}
+			else
+			{
+				enemy.getComponent<TransformComponent>().position = enemyPos;
+			}
 		}
 	}
 
@@ -261,17 +275,4 @@ bool Game::running() const
 
 bool Game::getWinner() {
 	return this->winner;
-}
-
-void Game::handleCollision(Vector2D& characterPos, SDL_Rect& characterCollider, SDL_Rect& componentCollider)
-{
-	// collision to right of character
-	if (characterPos.x < componentCollider.x)
-	{
-		characterPos.x = componentCollider.x - characterCollider.w;
-	}
-	else // collision to left of character
-	{
-		characterPos.x = componentCollider.x + componentCollider.w;
-	}
 }
\ No newline at end of file