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

Compass icon updates for Linux

Browse source
This commit is contained in:
Dan Paulat 2024-01-14 00:09:23 -06:00
parent dfe1695385
commit 0803a93f15
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
scwx-qt/source/scwx/qt/map/overlay_layer.cpp
View file

@ -42,12 +42,7 @@ public:
activeBoxOuter_ {std::make_shared<gl::draw::Rectangle>(context)}, activeBoxOuter_ {std::make_shared<gl::draw::Rectangle>(context)},
activeBoxInner_ {std::make_shared<gl::draw::Rectangle>(context)}, activeBoxInner_ {std::make_shared<gl::draw::Rectangle>(context)},
geoIcons_ {std::make_shared<gl::draw::GeoIcons>(context)}, geoIcons_ {std::make_shared<gl::draw::GeoIcons>(context)},
icons_ {std::make_shared<gl::draw::Icons>(context)}, icons_ {std::make_shared<gl::draw::Icons>(context)}
cardinalPointIconName_ {
types::GetTextureName(types::ImageTexture::CardinalPoint24)},
compassIconName_ {types::GetTextureName(types::ImageTexture::Compass24)},
locationIconName_ {
types::GetTextureName(types::ImageTexture::Crosshairs24)}
{ {
} }
~OverlayLayerImpl() = default; ~OverlayLayerImpl() = default;
@ -61,11 +56,14 @@ public:
std::shared_ptr<gl::draw::GeoIcons> geoIcons_; std::shared_ptr<gl::draw::GeoIcons> geoIcons_;
std::shared_ptr<gl::draw::Icons> icons_; std::shared_ptr<gl::draw::Icons> icons_;
const std::string& locationIconName_; const std::string& locationIconName_ {
types::GetTextureName(types::ImageTexture::Crosshairs24)};
std::shared_ptr<gl::draw::GeoIconDrawItem> locationIcon_ {}; std::shared_ptr<gl::draw::GeoIconDrawItem> locationIcon_ {};
const std::string& cardinalPointIconName_; const std::string& cardinalPointIconName_ {
const std::string& compassIconName_; types::GetTextureName(types::ImageTexture::CardinalPoint24)};
const std::string& compassIconName_ {
types::GetTextureName(types::ImageTexture::Compass24)};
std::shared_ptr<gl::draw::IconDrawItem> compassIcon_ {}; std::shared_ptr<gl::draw::IconDrawItem> compassIcon_ {};
bool compassIconDirty_ {false}; bool compassIconDirty_ {false};
double lastBearing_ {0.0}; double lastBearing_ {0.0};
@ -174,6 +172,9 @@ void OverlayLayer::Initialize()
} }
break; break;
} }
default:
break;
} }
}); });
p->icons_->FinishIcons(); p->icons_->FinishIcons();