Merge branch 'ref/sara' into separation-refactor

include/Game.h

@@ -40,7 +40,6 @@ public:
 	void clean();
 	bool running() const;
 
-	void addTile(unsigned long id, int x, int y);
 	/* static */ SDL_Renderer* renderer = nullptr;
 	/* static */ SDL_Event event;
 	/* static */ CollisionHandler* collisionHandler;

include/Map.h

@@ -1,5 +1,8 @@
 #pragma once
 
+#include <map>
+#include <string>
+
 class Game;
 class Map
 {
@@ -18,5 +21,6 @@ public:
 	 * \return Boolean for success
 	 * 
 	 */
-	static bool loadMap(const char* path, int sizeX, int sizeY, Game* game /* backreference */);
+	static void loadMap(const char* path, int sizeX, int sizeY, Game* game, const std::map<int, std::pair<std::string, bool>>* textureDict /* backreference */);
+	static void addTile(unsigned long id, int x, int y, Game* game, const std::map<int, std::pair<std::string, bool>>* textureDict);
 };

include/TextureDict.h

@@ -1,24 +0,0 @@
-#pragma once
-
-#include <map>
-#include <string>
-#include "AssetManager.h"
-
-class TextureDict
-{
-public:
-	const std::map<int, std::string> tileDictionary = {
-		{1, "assets/water.png"},
-		{2, "assets/dirt.png"},
-		{3, "assets/grass.png"},
-		{7, "assets/grass_water_left.png"},
-		{9, "assets/grass_water_right.png"}
-	};
-
-
-	std::map<PowerupType, std::string> powerupDictionary = {
-		{PowerupType::HEART, "assets/heart_powerup.png"},
-		{PowerupType::WALKINGSPEED, "assets/movement_speed_powerup.png"},
-		{PowerupType::SHOOTINGSPEED, "assets/atk_speed_powerup.png"}
-	};
-};

include/TileComponent.h

@@ -1,9 +1,10 @@
 #pragma once
 
 #include <SDL.h>
+#include <string>
+#include <map>
 
 #include "Component.h"
-#include "TextureDict.h"
 
 class SpriteComponent;
 class TransformComponent;
@@ -13,15 +14,20 @@ class TileComponent : public Component
 public:
 	TransformComponent* transform;
 	SpriteComponent* sprite;
-	TextureDict textureDict;
 
 	SDL_Rect tileRect;
 	int tileID;
 	const char* path;
 
 	TileComponent() = default;
-	TileComponent(int x, int y, int w, int h, int id);
+	TileComponent(int x, int y, int w, int h, int id, const std::map<int, std::pair<std::string, bool>>* textureDict);
 	~TileComponent() = default;
 
 	void init() override;
+
+	bool hasCollision(){return this->collision;}
+	std::string getName(){return this->tileName;}
+private:
+	bool collision;
+	std::string tileName;
 };

src/AssetManager.cpp

@@ -4,7 +4,6 @@
 #include "SoundManager.h"
 #include "ProjectileComponent.h"
 #include "Game.h"
-#include "TextureDict.h"
 
 #include "TransformComponent.h"
 
@@ -50,7 +49,6 @@ void AssetManager::createProjectile(Vector2D pos, Vector2D velocity, int scale,
 }
 
 void AssetManager::createPowerup(Vector2D pos, std::function<void (Entity*)> pickupFunc, std::string texturePath) {
-    TextureDict textureDict;
 
     auto& powerups(man->addEntity());
     powerups.addComponent<TransformComponent>(pos.x, pos.y, 32, 32, 1); //32x32 is standard size for objects

src/Game.cpp

@@ -145,10 +145,6 @@ void Game::init(const char* title, int xpos, int ypos, int width, int height, bo
 	if (this->isRunning == false) return;
 
 	map = new Map();
-	if (!map->loadMap("assets/SDL_map_test.txt", 25, 20, this)) {
-		std::cout << "ERROR: Map couldnt be loaded! " << SDL_GetError() << std::endl;
-		SDL_ClearError();
-	};
 
 
 	//adding textures to the library in AssetManager
@@ -336,14 +332,6 @@ void Game::clean()
 	std::cout << "Game Cleaned!" << std::endl;
 }
 
-void Game::addTile(unsigned long id, int x, int y) // tile entity
-{
-	auto& tile(manager.addEntity());
-	tile.addComponent<TileComponent>(x, y, TILE_SIZE, TILE_SIZE, id);
-	if (id == 1) tile.addComponent<ColliderComponent>("water");
-	tile.addGroup((size_t)Entity::GroupLabel::MAPTILES);
-}
-
 bool Game::running() const
 {
 	return isRunning;

src/Map.cpp

@@ -3,13 +3,14 @@
 #include <cctype>
 #include <iostream>
 #include <fstream>
-#include <string>
+#include <utility>
 
 #include "Constants.h"
 #include "Game.h"
 #include "SDL_error.h"
+#include "TileComponent.h"
 
-bool Map::loadMap(const char* path, int sizeX, int sizeY, Game* game /* backreference */)
+void Map::loadMap(const char* path, int sizeX, int sizeY, Game* game, const std::map<int, std::pair<std::string, bool>>* textureDict /* backreference */)
 {
 	std::string tileIDstr;
 	char singleChar = 0;
@@ -18,23 +19,24 @@ bool Map::loadMap(const char* path, int sizeX, int sizeY, Game* game /* backrefe
 
 	if (!mapFile.is_open()) {
 		SDL_SetError("Error loading map: Couldn't open map file!");
-		return false;
+		std::cout << "ERROR: Map couldnt be loaded! " << SDL_GetError() << std::endl;
+		SDL_ClearError();
 	}
 
 	int x = 0, y = 0; // needed outside for-loop for error handling
-	bool success = true;
 	for (; !mapFile.eof(); mapFile.get(singleChar))
 	{
 		if (singleChar == ',' || singleChar == '\n') {
 			if (tileIDstr.empty())
 				continue;
-			game->addTile(std::stoi(tileIDstr), x * TILE_SIZE, y * TILE_SIZE);
+			Map::addTile(std::stoi(tileIDstr), x * TILE_SIZE, y * TILE_SIZE, game, textureDict);
 			tileIDstr.clear();
 			x++;
 			if (singleChar == '\n') {
 				if (x != sizeX) {
 					SDL_SetError("Error loading map: specified x size doesn't match map file!");
-					success = false;
+					std::cout << "ERROR: Map couldnt be loaded! " << SDL_GetError() << std::endl;
+		SDL_ClearError();
 				}
 				x = 0;
 				y++;
@@ -47,10 +49,18 @@ bool Map::loadMap(const char* path, int sizeX, int sizeY, Game* game /* backrefe
 	}
 	if (y != sizeY) {
 		SDL_SetError("Error loading map: specified y size doesn't match map file!");
-		success = false;
+		std::cout << "ERROR: Map couldnt be loaded! " << SDL_GetError() << std::endl;
+		SDL_ClearError();
 	}
 
 	mapFile.close();
-
+}
-	return success;
+
+void Map::addTile(unsigned long id, int x, int y, Game* game, const std::map<int, std::pair<std::string, bool>>* textureDict) // tile entity
+{
+	auto& tile(game->manager.addEntity());
+	tile.addComponent<TileComponent>(x, y, TILE_SIZE, TILE_SIZE, id, textureDict);
+	
+	if(tile.getComponent<TileComponent>().hasCollision()) tile.addComponent<ColliderComponent>(tile.getComponent<TileComponent>().getName().data());
+	tile.addGroup((size_t)Entity::GroupLabel::MAPTILES);
 }

src/TileComponent.cpp

@@ -7,7 +7,7 @@
 #include "SpriteComponent.h"
 #include "TileComponent.h"
 
-TileComponent::TileComponent(int x, int y, int w, int h, int id)
+TileComponent::TileComponent(int x, int y, int w, int h, int id, const std::map<int, std::pair<std::string, bool>>* textureDict)
 {
 	this->tileRect.x = x;
 	this->tileRect.y = y;
@@ -15,12 +15,15 @@ TileComponent::TileComponent(int x, int y, int w, int h, int id)
 	this->tileRect.h = h;
 	tileID = id;
 
-	auto it = textureDict.tileDictionary.find(tileID); //every id has its own distinct texture (in texturedict.h)
+	auto it = textureDict->find(tileID); //every id has its own distinct texture (in texturedict.h)
-	if (it == textureDict.tileDictionary.end()) {
+	if (it == textureDict->end()) {
 		std::cout << "it end" << std::endl;
 		return;
 	}
-	this->path = it->second.data();
+	
+	this->collision = it->second.second;
+	this->tileName = it->second.first;
+	this->path = it->second.first.data();
 }
 
 void TileComponent::init()