blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 02:40:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update placefile text data outside of render loop, polygon cleanup

Browse source
This commit is contained in:
Dan Paulat 2023-08-19 21:43:57 -05:00
parent 8f2b87790a
commit b159540215
6 changed files with 60 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

25
scwx-qt/source/scwx/qt/map/placefile_layer.cpp
View file

@ -59,6 +59,8 @@ PlacefileLayer::PlacefileLayer(std::shared_ptr<MapContext> context,
AddDrawItem(p->placefileIcons_);
AddDrawItem(p->placefilePolygons_);
AddDrawItem(p->placefileText_);
ReloadData();
}
PlacefileLayer::~PlacefileLayer() = default;
@ -128,19 +130,10 @@ void PlacefileLayer::Render(
p->placefileIcons_->SetIconFiles(placefile->icon_files(),
placefile->name());
// Reset Placefile Text
p->placefileText_->Reset();
for (auto& drawItem : placefile->GetDrawItems())
{
switch (drawItem->itemType_)
{
case gr::Placefile::ItemType::Text:
p->placefileText_->AddText(
std::static_pointer_cast<gr::Placefile::TextDrawItem>(
drawItem));
break;
case gr::Placefile::ItemType::Icon:
p->placefileIcons_->AddIcon(
std::static_pointer_cast<gr::Placefile::IconDrawItem>(
@ -168,7 +161,7 @@ void PlacefileLayer::Deinitialize()
void PlacefileLayer::ReloadData()
{
// TODO: No longer needed after moving Icon and Text Render items here
// TODO: No longer needed after moving Icon Render items here
p->dirty_ = true;
boost::asio::post(
@ -188,15 +181,18 @@ void PlacefileLayer::ReloadData()
return;
}
// Reset Placefile Polygons
// Start draw items
p->placefilePolygons_->StartPolygons();
p->placefileText_->StartText();
for (auto& drawItem : placefile->GetDrawItems())
{
switch (drawItem->itemType_)
{
case gr::Placefile::ItemType::Text:
// TODO
p->placefileText_->AddText(
std::static_pointer_cast<gr::Placefile::TextDrawItem>(
drawItem));
break;
case gr::Placefile::ItemType::Icon:
@ -214,8 +210,11 @@ void PlacefileLayer::ReloadData()
}
}
// Finish Placefile Polygons
// Finish draw items
p->placefilePolygons_->FinishPolygons();
p->placefileText_->FinishText();
Q_EMIT DataReloaded();
});
}