aboutsummaryrefslogtreecommitdiff
path: root/mwe/resource-manager/tiledMap.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'mwe/resource-manager/tiledMap.cpp')
-rw-r--r--mwe/resource-manager/tiledMap.cpp40
1 files changed, 19 insertions, 21 deletions
diff --git a/mwe/resource-manager/tiledMap.cpp b/mwe/resource-manager/tiledMap.cpp
index 659c1fa..836929c 100644
--- a/mwe/resource-manager/tiledMap.cpp
+++ b/mwe/resource-manager/tiledMap.cpp
@@ -1,7 +1,5 @@
-
-
#include "tiledMap.h"
#include "TextureMap.h"
#include "map_layer.h"
@@ -13,60 +11,60 @@
#include <tmxlite/Layer.hpp>
#include <tmxlite/Map.hpp>
-
-TiledMap::TiledMap(const std::string& content){
- if(m_TmxMap.loadFromString(content, "../../asset/tiled/")){
+TiledMap::TiledMap(const std::string & content) {
+ if (m_TmxMap.loadFromString(content, "../../asset/tiled/")) {
std::cout << "Map loaded correctly " << std::endl;
}
}
-TiledMap::~TiledMap(){
- for(const auto& r : m_MapTextures){
+TiledMap::~TiledMap() {
+ for (const auto & r : m_MapTextures) {
delete r;
}
m_MapTextures.clear();
- for(const auto& m : m_RenderLayers){
+ for (const auto & m : m_RenderLayers) {
delete m;
}
m_RenderLayers.clear();
}
-
-void TiledMap::SetRenderer(SDL_Renderer& renderer){
+void TiledMap::SetRenderer(SDL_Renderer & renderer) {
this->m_Renderer = &renderer;
this->SetMapTextures();
this->SetMapLayers();
}
-void TiledMap::draw() const{
- for(const auto& l : m_RenderLayers){
+void TiledMap::draw() const {
+ for (const auto & l : m_RenderLayers) {
l->draw(m_Renderer);
}
}
-void TiledMap::SetMapTextures(){
- const auto& tileSets = m_TmxMap.getTilesets();
+void TiledMap::SetMapTextures() {
+ const auto & tileSets = m_TmxMap.getTilesets();
assert(~tileSets.empty());
std::cout << "Processing SetMapTextures " << std::endl;
- for (const auto& ts : tileSets ) {
+ for (const auto & ts : tileSets) {
m_MapTextures.emplace_back(new TextureMap);
- if(!m_MapTextures.back()->loadFromFile(ts.getImagePath(), m_Renderer)){
+ if (!m_MapTextures.back()->loadFromFile(ts.getImagePath(),
+ m_Renderer)) {
std::cerr << "Failed opening " << ts.getImagePath() << "\n";
}
}
}
-void TiledMap::SetMapLayers(){
- const auto& mapLayers = m_TmxMap.getLayers();
+void TiledMap::SetMapLayers() {
+ const auto & mapLayers = m_TmxMap.getLayers();
std::cout << "Processing SetMapLayers " << std::endl;
- for(auto i = 0u; i < mapLayers.size(); ++i){
+ for (auto i = 0u; i < mapLayers.size(); ++i) {
if (mapLayers[i]->getType() == tmx::Layer::Type::Tile) {
- m_RenderLayers.emplace_back(new MapLayer);
- m_RenderLayers.back()->create(this->m_TmxMap, i, this->m_MapTextures);
+ m_RenderLayers.emplace_back(new MapLayer);
+ m_RenderLayers.back()->create(this->m_TmxMap, i,
+ this->m_MapTextures);
}
}
}