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

Connecting signals and slots for radar updates

Browse source
This commit is contained in:
Dan Paulat 2021-07-30 22:01:18 -05:00
parent c06230ed6c
commit 817a59f741
6 changed files with 137 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

87
scwx-qt/source/scwx/qt/map/radar_layer.cpp
View file

@ -37,7 +37,9 @@ public:
vbo_ {GL_INVALID_INDEX},
vao_ {GL_INVALID_INDEX},
texture_ {GL_INVALID_INDEX},
numVertices_ {0}
numVertices_ {0},
colorTableUpdated_(false),
plotUpdated_(false)
{
}
~RadarLayerImpl() = default;
@ -53,6 +55,9 @@ public:
GLuint texture_;
GLsizeiptr numVertices_;
bool colorTableUpdated_;
bool plotUpdated_;
};
RadarLayer::RadarLayer(std::shared_ptr<view::RadarView> radarView,
@ -62,17 +67,12 @@ RadarLayer::RadarLayer(std::shared_ptr<view::RadarView> radarView,
}
RadarLayer::~RadarLayer() = default;
RadarLayer::RadarLayer(RadarLayer&&) noexcept = default;
RadarLayer& RadarLayer::operator=(RadarLayer&&) noexcept = default;
void RadarLayer::initialize()
{
BOOST_LOG_TRIVIAL(debug) << logPrefix_ << "initialize()";
OpenGLFunctions& gl = p->gl_;
boost::timer::cpu_timer timer;
// Load and configure radar shader
p->shaderProgram_.Load(":/gl/radar.vert", ":/gl/radar.frag");
@ -91,12 +91,45 @@ void RadarLayer::initialize()
<< logPrefix_ << "Could not find uMapScreenCoord";
}
// Generate a vertex array object
gl.glGenVertexArrays(1, &p->vao_);
// Generate vertex buffer objects
gl.glGenBuffers(2, p->vbo_.data());
// Update radar plot
UpdatePlot();
// Create color table
gl.glGenTextures(1, &p->texture_);
UpdateColorTable();
gl.glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
connect(p->radarView_.get(),
&view::RadarView::ColorTableLoaded,
this,
&RadarLayer::ReceiveColorTableUpdate);
connect(p->radarView_.get(),
&view::RadarView::PlotUpdated,
this,
&RadarLayer::ReceivePlotUpdate);
}
void RadarLayer::UpdatePlot()
{
BOOST_LOG_TRIVIAL(debug) << logPrefix_ << "UpdatePlot()";
p->plotUpdated_ = false;
OpenGLFunctions& gl = p->gl_;
boost::timer::cpu_timer timer;
const std::vector<float>& vertices = p->radarView_->vertices();
const std::vector<uint8_t>& dataMoments8 = p->radarView_->data_moments8();
const std::vector<uint16_t>& dataMoments16 = p->radarView_->data_moments16();
// Generate and bind a vertex array object
gl.glGenVertexArrays(1, &p->vao_);
// Bind a vertex array object
gl.glBindVertexArray(p->vao_);
// Generate vertex buffer objects
@ -145,17 +178,22 @@ void RadarLayer::initialize()
gl.glEnableVertexAttribArray(1);
p->numVertices_ = vertices.size() / 2;
// Create color table
gl.glGenTextures(1, &p->texture_);
UpdateColorTable();
gl.glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
}
void RadarLayer::render(const QMapbox::CustomLayerRenderParameters& params)
{
OpenGLFunctions& gl = p->gl_;
if (p->colorTableUpdated_)
{
UpdateColorTable();
}
if (p->plotUpdated_)
{
UpdatePlot();
}
p->shaderProgram_.Use();
const float scale = p->radarView_->scale() * 2.0f * mbgl::util::tileSize /
@ -196,10 +234,23 @@ void RadarLayer::deinitialize()
p->vao_ = GL_INVALID_INDEX;
p->vbo_ = {GL_INVALID_INDEX};
p->texture_ = GL_INVALID_INDEX;
disconnect(p->radarView_.get(),
&view::RadarView::ColorTableLoaded,
this,
&RadarLayer::ReceiveColorTableUpdate);
disconnect(p->radarView_.get(),
&view::RadarView::PlotUpdated,
this,
&RadarLayer::ReceivePlotUpdate);
}
void RadarLayer::UpdateColorTable()
{
BOOST_LOG_TRIVIAL(debug) << logPrefix_ << "UpdateColorTable()";
p->colorTableUpdated_ = false;
OpenGLFunctions& gl = p->gl_;
const std::vector<boost::gil::rgba8_pixel_t>& colorTable =
@ -218,6 +269,16 @@ void RadarLayer::UpdateColorTable()
gl.glGenerateMipmap(GL_TEXTURE_1D);
}
void RadarLayer::ReceiveColorTableUpdate()
{
p->colorTableUpdated_ = true;
}
void RadarLayer::ReceivePlotUpdate()
{
p->plotUpdated_ = true;
}
static glm::vec2
LatLongToScreenCoordinate(const QMapbox::Coordinate& coordinate)
{

18
scwx-qt/source/scwx/qt/map/radar_layer.hpp
View file

@ -12,23 +12,25 @@ namespace qt
class RadarLayerImpl;
class RadarLayer : public QMapbox::CustomLayerHostInterface
class RadarLayer : public QObject, public QMapbox::CustomLayerHostInterface
{
Q_OBJECT
public:
explicit RadarLayer(std::shared_ptr<view::RadarView> radarView, OpenGLFunctions& gl);
explicit RadarLayer(std::shared_ptr<view::RadarView> radarView,
OpenGLFunctions& gl);
~RadarLayer();
RadarLayer(const RadarLayer&) = delete;
RadarLayer& operator=(const RadarLayer&) = delete;
RadarLayer(RadarLayer&&) noexcept;
RadarLayer& operator=(RadarLayer&&) noexcept;
void initialize() override final;
void render(const QMapbox::CustomLayerRenderParameters&) override final;
void deinitialize() override final;
void UpdateColorTable();
void UpdatePlot();
public slots:
void ReceiveColorTableUpdate();
void ReceivePlotUpdate();
private:
std::unique_ptr<RadarLayerImpl> p;