merge conficts fixed

1 files changed, 23 insertions, 0 deletions

diff --git a/mwe/resource-manager/map_layer.h b/mwe/resource-manager/map_layer.h
new file mode 100644
index 0000000..fb656ed
--- /dev/null
+++ b/mwe/resource-manager/map_layer.h
@@ -0,0 +1,23 @@
+#pragma once
+
+#include "TextureMap.h"
+#include <SDL_render.h>
+#include <tmxlite/Map.hpp>
+
+class MapLayer final {
+
+public:
+	explicit MapLayer();
+	~MapLayer();
+
+	bool create(const tmx::Map &, std::uint32_t index,
+				const std::vector<TextureMap *> & textures);
+	void draw(SDL_Renderer *) const;
+
+private:
+	struct subset final {
+		std::vector<SDL_Vertex> vertexData;
+		SDL_Texture * texture = nullptr;
+	};
+	std::vector<subset> m_subsets;
+};