merge conficts fixed

1 files changed, 28 insertions, 0 deletions

diff --git a/mwe/resource-manager/tiledMap.h b/mwe/resource-manager/tiledMap.h
new file mode 100644
index 0000000..dc31705
--- /dev/null
+++ b/mwe/resource-manager/tiledMap.h
@@ -0,0 +1,28 @@
+
+
+#include "TextureMap.h"
+#include "map_layer.h"
+#include <string>
+#include <tmxlite/Map.hpp>
+#include <vector>
+
+class TiledMap {
+
+public:
+	TiledMap(const std::string &);
+	~TiledMap();
+
+	void SetRenderer(SDL_Renderer &);
+	void draw() const;
+
+private:
+	void SetMapTextures();
+	void SetMapLayers();
+
+private:
+	tmx::Map m_TmxMap;
+	std::vector<TextureMap *> m_MapTextures;
+	std::vector<MapLayer *> m_RenderLayers;
+
+	SDL_Renderer * m_Renderer;
+};