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

MapContext has a GlContext instead of MapContext is a GlContext

Browse source
This commit is contained in:
Dan Paulat 2025-05-07 22:37:45 -05:00
parent 58f2609fe7
commit 2d4ad2737e
31 changed files with 147 additions and 307 deletions
Download patch file Download diff file Expand all files Collapse all files

18
scwx-qt/source/scwx/qt/map/radar_site_layer.cpp
View file

@ -13,11 +13,7 @@
#include <QGuiApplication>
namespace scwx
{
namespace qt
{
namespace map
namespace scwx::qt::map
{
static const std::string logPrefix_ = "scwx::qt::map::radar_site_layer";
@ -26,7 +22,7 @@ static const auto logger_ = scwx::util::Logger::Create(logPrefix_);
class RadarSiteLayer::Impl
{
public:
explicit Impl(RadarSiteLayer* self, std::shared_ptr<MapContext>& context) :
explicit Impl(RadarSiteLayer* self, std::shared_ptr<gl::GlContext> context) :
self_ {self}, geoLines_ {std::make_shared<gl::draw::GeoLines>(context)}
{
}
@ -54,9 +50,9 @@ public:
nullptr, nullptr};
};
RadarSiteLayer::RadarSiteLayer(std::shared_ptr<MapContext> context) :
RadarSiteLayer::RadarSiteLayer(const std::shared_ptr<MapContext>& context) :
DrawLayer(context, "RadarSiteLayer"),
p(std::make_unique<Impl>(this, context))
p(std::make_unique<Impl>(this, context->gl_context()))
{
}
@ -103,7 +99,7 @@ void RadarSiteLayer::Render(
return;
}
gl::OpenGLFunctions& gl = context()->gl();
gl::OpenGLFunctions& gl = context()->gl_context()->gl();
// Update map screen coordinate and scale information
p->mapScreenCoordLocation_ = util::maplibre::LatLongToScreenCoordinate(
@ -251,6 +247,4 @@ bool RadarSiteLayer::RunMousePicking(
return false;
}
} // namespace map
} // namespace qt
} // namespace scwx
} // namespace scwx::qt::map