Zad2 final v2 - fix collision

2dgk_7/2dgk_7/2dgk_7.vcxproj

@@ -143,6 +143,7 @@
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <AdditionalIncludeDirectories>vcpkg_installed\x64-windows\x64-windows\include\SDL2</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>

2dgk_7/2dgk_7/KGame.cpp

@@ -135,7 +135,7 @@ namespace KapitanGame {
 					switch (line[i])
 					{
 					case '#':
-						Objects.emplace_back(std::make_shared<KWall>(position, Textures["wall.bmp"]));
+						Objects.emplace(std::make_pair(static_cast<int>(i), y), std::make_shared<KWall>(position, Textures["wall.bmp"]));
 						break;
 					case ' ':
 						FreePositions.emplace_back(position);
@@ -157,8 +157,7 @@ namespace KapitanGame {
 	{
 		Pawns.clear();
 		std::shuffle(FreePositions.begin(), FreePositions.end(), Utils::GetRandomEngine());
-		Objects.emplace_back(std::make_shared<KExit>(FreePositions.back(), Textures["exit.bmp"]));
+		Exit = Objects.emplace(std::make_pair(static_cast<int>(FreePositions.back().X / Constants::TILE_WIDTH), static_cast<int>(FreePositions.back().Y / Constants::TILE_HEIGHT)), std::make_shared<KExit>(FreePositions.back(), Textures["exit.bmp"])).first->second;
-		Exit = Objects.back();
 		FreePositions.pop_back();
 
 		Pawns.emplace_back(std::make_shared<KCirclePawn>(FreePositions.back(), Textures["P1.bmp"], PlayerControllers[static_cast<int>(KPlayer::Player1)]));
@@ -383,12 +382,12 @@ namespace KapitanGame {
 
 				if (Playing) {
 					for (const auto& object : Objects)
-						object->Render(Renderer, cameraInUse);
+						object.second->Render(Renderer, cameraInUse);
 					for (const auto& pawn : Pawns) {
 						pawn->Render(Renderer, cameraInUse);
 					}
 					if (const auto exit = Exit.lock()) {
-						const float exitX = camera.GetViewport().x + Constants::SCREEN_WIDTH / 2.f - Textures["arrow.bmp"].GetWidth() / 2.f - exit->GetPosition().X+exit->GetCollider()->GetWidth()/2.f;
+						const float exitX = camera.GetViewport().x + Constants::SCREEN_WIDTH / 2.f - Textures["arrow.bmp"].GetWidth() / 2.f - exit->GetPosition().X + exit->GetCollider()->GetWidth() / 2.f;
 						const float exitY = camera.GetViewport().y + 25.f - exit->GetPosition().Y + exit->GetCollider()->GetHeight() / 2.f;
 						const double degrees = atan2(-exitX, exitY) * (180.f / M_PI);
 						Textures["arrow.bmp"].RenderEx(Renderer, Constants::SCREEN_WIDTH / 2.f - Textures["arrow.bmp"].GetWidth() / 2.f, 25.f, degrees);

2dgk_7/2dgk_7/KGame.h

@@ -7,6 +7,7 @@
 
 #include "KFont.h"
 #include "KInput.h"
+#include "Utils.h"
 
 
 namespace KapitanGame {
@@ -29,7 +30,7 @@ namespace KapitanGame {
 
 		SDL_Renderer* Renderer = nullptr;
 
-		std::vector<std::shared_ptr<KObject>> Objects;
+		std::unordered_map<std::pair<int, int>, std::shared_ptr<KObject>, Utils::PairHash> Objects;
 		std::vector<std::shared_ptr<KPawn>> Pawns;
 		std::vector<std::shared_ptr<KPlayerController>> PlayerControllers;
 		std::unordered_map<std::string, KTexture> Textures;

2dgk_7/2dgk_7/KPawn.cpp

@@ -2,6 +2,7 @@
 
 #include <memory>
 #include <typeinfo>
+#include <unordered_map>
 
 #include "Constants.h"
 #include "KPlayerController.h"
@@ -9,21 +10,32 @@
 
 namespace KapitanGame
 {
-	void KPawn::CollisionDetectionStep(const std::vector<std::shared_ptr<KObject>>& objects)
+	void KPawn::CollisionDetectionStep(const std::unordered_map<std::pair<int, int>, std::shared_ptr<KObject>, Utils::PairHash>& objects)
 	{
 		if (GetCollider() == nullptr) return;
-		for (auto& other : objects) {
+
-			if (other->GetCollider() == nullptr) continue;
+		const auto xPos = static_cast<int>(GetPosition().X / Constants::TILE_WIDTH);
-			if (other->Id == Id) continue;
+		const auto yPos = static_cast<int>(GetPosition().Y / Constants::TILE_HEIGHT);
-			if (GetCollider()->IsCollision(other->GetCollider())) {
+
-				if (typeid(*other) == typeid(KExit)) {
+		for (const auto& [oX, oY] : std::initializer_list<std::pair<int, int>>{ {0, 0}, {-1,0}, {1,0}, {0,-1}, {0,1}, {-1,-1}, {1,1}, {1,-1}, {-1,1} })
-					if (const auto pc = PlayerController.lock()) {
+		{
-						pc->NotifyWin();
+			try {
+				const auto& other = objects.at({ xPos + oX, yPos + oY });
+				if (other->GetCollider() == nullptr) continue;
+				if (other->Id == Id) continue;
+				if (GetCollider()->IsCollision(other->GetCollider())) {
+					if (typeid(*other) == typeid(KExit)) {
+						if (const auto pc = PlayerController.lock()) {
+							pc->NotifyWin();
+						}
+						return;
 					}
-					return;
+					const auto separationVector = GetCollider()->GetSeparationVector(other->GetCollider());
+					Position += separationVector;
 				}
-				const auto separationVector = GetCollider()->GetSeparationVector(other->GetCollider());
+			}
-				Position += separationVector;
+			catch (std::out_of_range&)
+			{
 			}
 		}
 	}

2dgk_7/2dgk_7/KPawn.h

@@ -1,8 +1,9 @@
 #pragma once
 #include <memory>
-#include <vector>
+#include <unordered_map>
 
 #include "KObject.h"
+#include "Utils.h"
 
 namespace KapitanGame
 {
@@ -17,7 +18,7 @@ namespace KapitanGame
 			PlayerController(playerController)
 		{
 		}
-		void CollisionDetectionStep(const std::vector<std::shared_ptr<KObject>>& objects);
+		void CollisionDetectionStep(const std::unordered_map<std::pair<int, int>, std::shared_ptr<KObject>, Utils::PairHash>& objects);
 		void MovementStep(const float& timeStep);
 		void CollisionDetectionWithMapStep(const SDL_FRect& map);
 		void AddMovementInput(const KVector2D& input);

2dgk_7/2dgk_7/Utils.h

@@ -96,5 +96,14 @@ namespace KapitanGame {
 		}
 
 		typedef Iterator<KPlayer, KPlayer::Player1, KPlayer::Player2> KPlayerIterator;
+
+		struct PairHash {
+			template <class T1, class T2>
+			std::size_t operator () (const std::pair<T1, T2>& p) const {
+				auto h1 = std::hash<T1>{}(p.first);
+				auto h2 = std::hash<T2>{}(p.second);
+				return h1 ^ h2;
+			}
+		};
 	}
 }