games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

only calc minimaps once

Browse Source
This commit is contained in:
Laserlicht
2023-09-30 23:50:27 +02:00
committed by GitHub
parent 61aae7bccc
commit 58dfc55ca3
2 changed files with 28 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
client/windows/CMapOverview.cpp
View File

@@ -99,9 +99,9 @@ Canvas CMapOverview::CMapOverviewWidget::createMinimapForLayer(std::unique_ptr<C
return canvas; return canvas;
} }
std::vector<std::shared_ptr<IImage>> CMapOverview::CMapOverviewWidget::createMinimaps(ResourcePath resource, Point size) const std::vector<Canvas> CMapOverview::CMapOverviewWidget::createMinimaps(ResourcePath resource) const
{ {
std::vector<std::shared_ptr<IImage>> ret = std::vector<std::shared_ptr<IImage>>(); std::vector<Canvas> ret = std::vector<Canvas>();
CMapService mapService; CMapService mapService;
std::unique_ptr<CMap> map; std::unique_ptr<CMap> map;
@@ -114,22 +114,15 @@ std::vector<std::shared_ptr<IImage>> CMapOverview::CMapOverviewWidget::createMin
return ret; return ret;
} }
return createMinimaps(map, size); return createMinimaps(map);
} }
std::vector<std::shared_ptr<IImage>> CMapOverview::CMapOverviewWidget::createMinimaps(std::unique_ptr<CMap> & map, Point size) const std::vector<Canvas> CMapOverview::CMapOverviewWidget::createMinimaps(std::unique_ptr<CMap> & map) const
{ {
std::vector<std::shared_ptr<IImage>> ret = std::vector<std::shared_ptr<IImage>>(); std::vector<Canvas> ret = std::vector<Canvas>();
for(int i = 0; i < (map->twoLevel ? 2 : 1); i++) for(int i = 0; i < (map->twoLevel ? 2 : 1); i++)
{ ret.push_back(createMinimapForLayer(map, i));
Canvas canvas = createMinimapForLayer(map, i);
Canvas canvasScaled = Canvas(size);
canvasScaled.drawScaled(canvas, Point(0, 0), size);
std::shared_ptr<IImage> img = GH.renderHandler().createImage(canvasScaled.getInternalSurface());
ret.push_back(img);
}
return ret; return ret;
} }
@@ -141,9 +134,23 @@ std::shared_ptr<CPicture> CMapOverview::CMapOverviewWidget::buildDrawMinimap(con
auto rect = readRect(config["rect"]); auto rect = readRect(config["rect"]);
auto id = config["id"].Integer(); auto id = config["id"].Integer();
if(!renderImage) if(id >= minimaps.size())
return nullptr; return nullptr;
Canvas canvasScaled = Canvas(Point(rect.w, rect.h));
canvasScaled.drawScaled(minimaps[id], Point(0, 0), Point(rect.w, rect.h));
std::shared_ptr<IImage> img = GH.renderHandler().createImage(canvasScaled.getInternalSurface());
return std::make_shared<CPicture>(img, Point(rect.x, rect.y));
}
CMapOverview::CMapOverviewWidget::CMapOverviewWidget(CMapOverview& parent):
InterfaceObjectConfigurable(), p(parent)
{
drawPlayerElements = p.tabType == ESelectionScreen::newGame;
renderImage = settings["lobby"]["mapPreview"].Bool();
// create minimaps
ResourcePath res = ResourcePath(p.resource.getName(), EResType::MAP); ResourcePath res = ResourcePath(p.resource.getName(), EResType::MAP);
std::unique_ptr<CMap> campaignMap = nullptr; std::unique_ptr<CMap> campaignMap = nullptr;
if(p.tabType != ESelectionScreen::newGame) if(p.tabType != ESelectionScreen::newGame)
@@ -159,26 +166,12 @@ std::shared_ptr<CPicture> CMapOverview::CMapOverviewWidget::buildDrawMinimap(con
campaignMap = startInfo->campState->getMap(*startInfo->campState->currentScenario()); campaignMap = startInfo->campState->getMap(*startInfo->campState->currentScenario());
res = ResourcePath(startInfo->fileURI, EResType::MAP); res = ResourcePath(startInfo->fileURI, EResType::MAP);
} }
std::vector<std::shared_ptr<IImage>> images;
if(!campaignMap) if(!campaignMap)
images = createMinimaps(res, Point(rect.w, rect.h)); minimaps = createMinimaps(res);
else else
images = createMinimaps(campaignMap, Point(rect.w, rect.h)); minimaps = createMinimaps(campaignMap);
if(id >= images.size())
return nullptr;
return std::make_shared<CPicture>(images[id], Point(rect.x, rect.y));
}
CMapOverview::CMapOverviewWidget::CMapOverviewWidget(CMapOverview& parent):
InterfaceObjectConfigurable(), p(parent)
{
drawPlayerElements = p.tabType == ESelectionScreen::newGame;
renderImage = settings["lobby"]["mapPreview"].Bool();
// config
const JsonNode config(JsonPath::builtin("config/widgets/mapOverview.json")); const JsonNode config(JsonPath::builtin("config/widgets/mapOverview.json"));
REGISTER_BUILDER("drawMinimap", &CMapOverview::CMapOverviewWidget::buildDrawMinimap); REGISTER_BUILDER("drawMinimap", &CMapOverview::CMapOverviewWidget::buildDrawMinimap);

6
client/windows/CMapOverview.h
View File

@@ -34,9 +34,11 @@ class CMapOverview : public CWindowObject
bool drawPlayerElements; bool drawPlayerElements;
bool renderImage; bool renderImage;
std::vector<Canvas> minimaps;
Canvas createMinimapForLayer(std::unique_ptr<CMap> & map, int layer) const; Canvas createMinimapForLayer(std::unique_ptr<CMap> & map, int layer) const;
std::vector<std::shared_ptr<IImage>> createMinimaps(ResourcePath resource, Point size) const; std::vector<Canvas> createMinimaps(ResourcePath resource) const;
std::vector<std::shared_ptr<IImage>> createMinimaps(std::unique_ptr<CMap> & map, Point size) const; std::vector<Canvas> createMinimaps(std::unique_ptr<CMap> & map) const;
std::shared_ptr<CPicture> buildDrawMinimap(const JsonNode & config) const; std::shared_ptr<CPicture> buildDrawMinimap(const JsonNode & config) const;
public: public: