Add simple multitile placement

zpervan · Mar 9, 2023 · cd7ec11 · cd7ec11
1 parent 2dcebe0
commit cd7ec11
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 21 deletions.
diff --git a/MapEditor/Core/src/map_editor_events.h b/MapEditor/Core/src/map_editor_events.h
@@ -5,6 +5,7 @@ enum class MapEditorEvent
 {
     None = 0,
     Add,
+    Set,
     Edit,
     Delete,
     Saving,

diff --git a/MapEditor/Core/src/map_editor_window.cpp b/MapEditor/Core/src/map_editor_window.cpp
@@ -54,6 +54,11 @@ void MapEditorWindow::Update()
         }
 
         if ((map_editor_event_system_.Poll() == MapEditorEvent::Add) && (event_.type == sf::Event::MouseButtonPressed))
+        {
+            map_editor_event_system_.Set(MapEditorEvent::Set);
+        }
+
+        if ((map_editor_event_system_.Poll() == MapEditorEvent::Add) && (event_.key.code == sf::Keyboard::Escape))
         {
             map_editor_event_system_.Set(MapEditorEvent::None);
         }

diff --git a/MapEditor/Map/src/tiles_service.cpp b/MapEditor/Map/src/tiles_service.cpp
@@ -46,3 +46,13 @@ Tile* TilesService::GetTemporaryTile()
 {
     return temporary_tile_;
 }
+
+void TilesService::DeleteTemporaryTile()
+{
+    if(temporary_tile_)
+    {
+        spdlog::debug("Deleting temporary tile");
+        delete temporary_tile_;
+        temporary_tile_ = nullptr;
+    }
+}
diff --git a/MapEditor/Map/src/tiles_service.h b/MapEditor/Map/src/tiles_service.h
@@ -20,6 +20,7 @@ class TilesService
     const std::vector<std::shared_ptr<Tile>>& GetTiles() const;
     std::vector<std::shared_ptr<Tile>> CloneTiles() const;
     Tile* GetTemporaryTile();
+    void DeleteTemporaryTile();
 
   private:
     MapEditorEventSystem& map_editor_event_system_;

diff --git a/MapEditor/main.cpp b/MapEditor/main.cpp
@@ -45,24 +45,41 @@ int main()
 
         window.BeginDraw();
 
-        if(map_editor_event_system.Poll() == MapEditorEvent::Add)
+        if (tiles_service.GetTemporaryTile())
         {
-            for (auto & e : grid.GetGridShapes())
+            switch (map_editor_event_system.Poll())
             {
-                if(e->getGlobalBounds().contains(window.GetMousePosition().x, window.GetMousePosition().y))
-                {
-                    tiles_service.GetTemporaryTile()->first.setPosition(e->getPosition());
-                }
+                case MapEditorEvent::None:
+                    tiles_service.DeleteTemporaryTile();
+                    break;
+
+                case MapEditorEvent::Add:
+                    for (auto& e : grid.GetGridShapes())
+                    {
+                        if (e->getGlobalBounds().contains(window.GetMousePosition().x, window.GetMousePosition().y))
+                        {
+                            tiles_service.GetTemporaryTile()->first.setPosition(e->getPosition());
+                        }
+                    }
+                    window.Draw(tiles_service.GetTemporaryTile()->first);
+                    break;
+
+                // Multitile placement
+                case MapEditorEvent::Set:
+                    auto asset_type = tiles_service.GetTemporaryTile()->second;
+                    tiles_service.FinishPlacement();
+                    map_editor_event_system.Set(MapEditorEvent::Add);
+                    tiles_service.BeginPlacement(asset_type);
+                    break;
             }
-            window.Draw(tiles_service.GetTemporaryTile()->first);
         }
 
-        if(map_editor_event_system.Poll() == MapEditorEvent::Saving)
+        if (map_editor_event_system.Poll() == MapEditorEvent::Saving)
         {
             save_dialog.Show("Save", "Please select a path to save your map.");
         }
 
-        if(map_editor_event_system.Poll() == MapEditorEvent::SavingConfirmed)
+        if (map_editor_event_system.Poll() == MapEditorEvent::SavingConfirmed)
         {
             if (!serialization_result.valid())
             {
@@ -77,26 +94,18 @@ int main()
             }
         }
 
-        if(map_editor_event_system.Poll() == MapEditorEvent::Loading)
+        if (map_editor_event_system.Poll() == MapEditorEvent::Loading)
         {
             load_dialog.Show("Load map", "Please select a map to load.");
         }
 
-        if(map_editor_event_system.Poll() == MapEditorEvent::LoadingConfirmed)
+        if (map_editor_event_system.Poll() == MapEditorEvent::LoadingConfirmed)
         {
             spdlog::debug("TODO: Implement loading functionality");
         }
 
-        if(map_editor_event_system.Poll() == MapEditorEvent::None)
-        {
-            if(tiles_service.GetTemporaryTile())
-            {
-                tiles_service.FinishPlacement();
-            }
-        }
-
         // Draw all placed tiles
-        for (const auto & tile : tiles_service.GetTiles())
+        for (const auto& tile : tiles_service.GetTiles())
         {
             if (!tile)
             {
@@ -106,7 +115,7 @@ int main()
             window.Draw(tile->first);
         }
 
-        for (const auto & grid_line : grid.GetGridShapes())
+        for (const auto& grid_line : grid.GetGridShapes())
         {
             window.Draw(*grid_line);
         }