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

General GCC compilation fixes

Browse source
This commit is contained in:
Dan Paulat 2023-04-17 18:37:23 -05:00
parent c7aba95233
commit 023688b746
19 changed files with 57 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

5
scwx-qt/source/scwx/qt/map/color_table_layer.cpp
View file

@ -26,12 +26,13 @@ static const auto logger_ = scwx::util::Logger::Create(logPrefix_);
class ColorTableLayerImpl
{
public:
explicit ColorTableLayerImpl(std::shared_ptr<MapContext> context) :
explicit ColorTableLayerImpl() :
shaderProgram_(nullptr),
uMVPMatrixLocation_(GL_INVALID_INDEX),
vbo_ {GL_INVALID_INDEX},
vao_ {GL_INVALID_INDEX},
texture_ {GL_INVALID_INDEX},
colorTable_ {},
colorTableNeedsUpdate_ {true}
{
}
@ -50,7 +51,7 @@ public:
};
ColorTableLayer::ColorTableLayer(std::shared_ptr<MapContext> context) :
GenericLayer(context), p(std::make_unique<ColorTableLayerImpl>(context))
GenericLayer(context), p(std::make_unique<ColorTableLayerImpl>())
{
}
ColorTableLayer::~ColorTableLayer() = default;

7
scwx-qt/source/scwx/qt/map/map_widget.cpp
View file

@ -502,8 +502,8 @@ void MapWidget::SetMapLocation(double latitude,
double longitude,
bool updateRadarSite)
{
if (p->map_ != nullptr && p->prevLatitude_ != latitude ||
p->prevLongitude_ != longitude)
if (p->map_ != nullptr &&
(p->prevLatitude_ != latitude || p->prevLongitude_ != longitude))
{
// Update the map location
p->map_->setCoordinate({latitude, longitude});
@ -787,6 +787,9 @@ void MapWidget::mapChanged(QMapLibreGL::Map::MapChange mapChange)
case QMapLibreGL::Map::MapChangeDidFinishLoadingStyle:
AddLayers();
break;
default:
break;
}
}

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

@ -112,11 +112,6 @@ void OverlayLayer::Render(
p->sweepTimeNeedsUpdate_ = false;
}
glm::mat4 projection = glm::ortho(0.0f,
static_cast<float>(params.width),
0.0f,
static_cast<float>(params.height));
// Active Box
p->activeBoxOuter_->SetVisible(settings.isActive_);
p->activeBoxInner_->SetVisible(settings.isActive_);
@ -139,7 +134,7 @@ void OverlayLayer::Render(
nullptr,
ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize |
ImGuiWindowFlags_AlwaysAutoResize);
ImGui::Text(productName.c_str());
ImGui::TextUnformatted(productName.c_str());
ImGui::End();
}
}
@ -154,7 +149,7 @@ void OverlayLayer::Render(
nullptr,
ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize |
ImGuiWindowFlags_AlwaysAutoResize);
ImGui::Text(p->sweepTimeString_.c_str());
ImGui::TextUnformatted(p->sweepTimeString_.c_str());
ImGui::End();
}

4
scwx-qt/source/scwx/qt/map/radar_product_layer.cpp
View file

@ -37,7 +37,7 @@ LatLongToScreenCoordinate(const QMapLibreGL::Coordinate& coordinate);
class RadarProductLayerImpl
{
public:
explicit RadarProductLayerImpl(std::shared_ptr<MapContext> context) :
explicit RadarProductLayerImpl() :
shaderProgram_(nullptr),
uMVPMatrixLocation_(GL_INVALID_INDEX),
uMapScreenCoordLocation_(GL_INVALID_INDEX),
@ -75,7 +75,7 @@ public:
};
RadarProductLayer::RadarProductLayer(std::shared_ptr<MapContext> context) :
GenericLayer(context), p(std::make_unique<RadarProductLayerImpl>(context))
GenericLayer(context), p(std::make_unique<RadarProductLayerImpl>())
{
}
RadarProductLayer::~RadarProductLayer() = default;