games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

Refactor mapController to use precalculated obstacle set.

Browse Source
This commit is contained in:
Tomasz Zieliński 2023-05-20 10:57:05 +02:00
parent cf0515dcd3
commit ccaece9d71
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
mapeditor/mapcontroller.cpp
View File

@ -16,7 +16,6 @@
#include "../lib/mapping/CMapEditManager.h" #include "../lib/mapping/CMapEditManager.h"
#include "../lib/TerrainHandler.h" #include "../lib/TerrainHandler.h"
#include "../lib/mapObjects/CObjectClassesHandler.h" #include "../lib/mapObjects/CObjectClassesHandler.h"
#include "../lib/rmg/modificators/ObstaclePlacer.h"
#include "../lib/CSkillHandler.h" #include "../lib/CSkillHandler.h"
#include "../lib/spells/CSpellHandler.h" #include "../lib/spells/CSpellHandler.h"
#include "../lib/CHeroHandler.h" #include "../lib/CHeroHandler.h"
@ -26,7 +25,7 @@
#include "maphandler.h" #include "maphandler.h"
#include "mainwindow.h" #include "mainwindow.h"
#include "inspector/inspector.h" #include "inspector/inspector.h"
#include "VCMI_Lib.h"
MapController::MapController(MainWindow * m): main(m) MapController::MapController(MainWindow * m): main(m)
{ {
@ -217,6 +216,18 @@ void MapController::setMap(std::unique_ptr<CMap> cmap)
} }
); );
_map->getEditManager()->getUndoManager().clearAll(); _map->getEditManager()->getUndoManager().clearAll();
initObstaclePainters(_map.get());
}
void MapController::initObstaclePainters(CMap * map)
{
for (auto terrain : VLC->terrainTypeHandler->objects)
{
auto terrainId = terrain->getId();
_obstaclePainters[terrainId] = std::make_unique<EditorObstaclePlacer>(map);
_obstaclePainters[terrainId]->collectPossibleObstacles(terrainId);
}
} }
void MapController::sceneForceUpdate() void MapController::sceneForceUpdate()
@ -397,8 +408,11 @@ void MapController::commitObstacleFill(int level)
return; return;
//split by zones //split by zones
for (auto & painter : _obstaclePainters)
std::map<TerrainId, std::unique_ptr<EditorObstaclePlacer>> terrainSelected; {
painter.second->clearBlockedArea();
}
for(auto & t : selection) for(auto & t : selection)
{ {
auto tl = _map->getTile(t); auto tl = _map->getTile(t);
@ -406,14 +420,11 @@ void MapController::commitObstacleFill(int level)
continue; continue;
auto terrain = tl.terType->getId(); auto terrain = tl.terType->getId();
//FIXME: This map can be populated once at launch, not need to collect objects every time _obstaclePainters[terrain]->addBlockedTile(t);
terrainSelected[terrain] = std::make_unique<EditorObstaclePlacer>(_map.get());
terrainSelected[terrain]->addBlockedTile(t);
} }
for(auto & sel : terrainSelected) for(auto & sel : _obstaclePainters)
{ {
sel.second->collectPossibleObstacles(sel.first);
sel.second->placeObstacles(CRandomGenerator::getDefault()); sel.second->placeObstacles(CRandomGenerator::getDefault());
} }

4
mapeditor/mapcontroller.h
View File

@ -13,6 +13,7 @@
#include "maphandler.h" #include "maphandler.h"
#include "mapview.h" #include "mapview.h"
#include "../lib/mapping/CMap.h" #include "../lib/mapping/CMap.h"
#include "../lib/rmg/modificators/ObstaclePlacer.h"
class MainWindow; class MainWindow;
class MapController class MapController
@ -24,6 +25,7 @@ public:
~MapController(); ~MapController();
void setMap(std::unique_ptr<CMap>); void setMap(std::unique_ptr<CMap>);
void initObstaclePainters(CMap* map);
void repairMap(); void repairMap();
@ -72,5 +74,7 @@ private:
std::vector<std::unique_ptr<CGObjectInstance>> _clipboard; std::vector<std::unique_ptr<CGObjectInstance>> _clipboard;
int _clipboardShiftIndex = 0; int _clipboardShiftIndex = 0;
std::map<TerrainId, std::unique_ptr<EditorObstaclePlacer>> _obstaclePainters;
void connectScenes(); void connectScenes();
}; };