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

Calculate coordinates in parallel and eliminate duplication, in advance of vertices

Browse source
This commit is contained in:
Dan Paulat 2021-07-22 21:52:58 -05:00
parent aad37f9e01
commit c6a323247d
2 changed files with 81 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

1
scwx-qt/scwx-qt.cmake
View file

@ -103,6 +103,7 @@ target_include_directories(scwx-qt PRIVATE ${scwx-qt_SOURCE_DIR}/source
target_link_libraries(scwx-qt PRIVATE Qt${QT_VERSION_MAJOR}::Widgets target_link_libraries(scwx-qt PRIVATE Qt${QT_VERSION_MAJOR}::Widgets
Qt${QT_VERSION_MAJOR}::OpenGLWidgets Qt${QT_VERSION_MAJOR}::OpenGLWidgets
Boost::log Boost::log
Boost::timer
qmapboxgl qmapboxgl
opengl32 opengl32
GeographicLib::GeographicLib GeographicLib::GeographicLib

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

@ -1,9 +1,13 @@
#include <scwx/qt/map/radar_layer.hpp> #include <scwx/qt/map/radar_layer.hpp>
#include <scwx/qt/util/shader_program.hpp> #include <scwx/qt/util/shader_program.hpp>
#include <execution>
#include <QOpenGLFunctions_3_3_Core> #include <QOpenGLFunctions_3_3_Core>
#include <boost/log/trivial.hpp> #include <boost/log/trivial.hpp>
#include <boost/range/irange.hpp>
#include <boost/timer/timer.hpp>
#include <GeographicLib/Geodesic.hpp> #include <GeographicLib/Geodesic.hpp>
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <glm/gtc/matrix_transform.hpp> #include <glm/gtc/matrix_transform.hpp>
@ -15,6 +19,9 @@ namespace scwx
namespace qt namespace qt
{ {
static constexpr uint32_t MAX_RADIALS = 720;
static constexpr uint32_t MAX_DATA_MOMENT_GATES = 1840;
static const std::string logPrefix_ = "[scwx::qt::map::radar_layer] "; static const std::string logPrefix_ = "[scwx::qt::map::radar_layer] ";
static glm::vec2 static glm::vec2
@ -70,6 +77,9 @@ void RadarLayer::initialize()
QOpenGLFunctions_3_3_Core& gl = p->gl_; QOpenGLFunctions_3_3_Core& gl = p->gl_;
boost::timer::cpu_timer timer;
// Load and configure radar shader
p->shaderProgram_.Load(":/gl/radar.vert", ":/gl/radar.frag"); p->shaderProgram_.Load(":/gl/radar.vert", ":/gl/radar.frag");
p->uMVPMatrixLocation_ = p->uMVPMatrixLocation_ =
@ -87,82 +97,95 @@ void RadarLayer::initialize()
<< logPrefix_ << "Could not find uMapScreenCoord"; << logPrefix_ << "Could not find uMapScreenCoord";
} }
constexpr uint16_t MAX_RADIALS = 720; // Calculate coordinates
constexpr uint16_t MAX_DATA_MOMENT_GATES = 1840; static std::array<GLfloat, MAX_RADIALS * MAX_DATA_MOMENT_GATES * 2>
coordinates;
const QMapbox::Coordinate radar(38.6986, -90.6828);
const QPointF radarScreen = p->map_->pixelForCoordinate(radar);
static std::array<GLfloat, MAX_RADIALS * MAX_DATA_MOMENT_GATES * 6 * 2>
vertices;
constexpr float angleDelta = 0.5f;
constexpr float angleDeltaH = angleDelta / 2.0f;
float angle1 = -angleDeltaH;
float angle2 = angleDeltaH;
GLsizeiptr index = 0;
GeographicLib::Geodesic geodesic(GeographicLib::Constants::WGS84_a(), GeographicLib::Geodesic geodesic(GeographicLib::Constants::WGS84_a(),
GeographicLib::Constants::WGS84_f()); GeographicLib::Constants::WGS84_f());
p->scale_ = p->map_->scale(); const QMapbox::Coordinate radar(38.6986, -90.6828);
p->bearing_ = p->map_->bearing(); auto radialGates =
boost::irange<uint32_t>(0, MAX_RADIALS * MAX_DATA_MOMENT_GATES);
for (uint16_t azimuth = 0; azimuth < 720; ++azimuth) timer.start();
std::for_each(
std::execution::par_unseq,
radialGates.begin(),
radialGates.end(),
[&](uint32_t radialGate) {
const uint16_t gate =
static_cast<uint16_t>(radialGate % MAX_DATA_MOMENT_GATES);
const uint16_t radial =
static_cast<uint16_t>(radialGate / MAX_DATA_MOMENT_GATES);
const float angle = radial * 0.5f - 0.25f;
const float range = (gate + 1) * 250.0f;
const size_t offset = radialGate * 2;
double latitude;
double longitude;
geodesic.Direct(
radar.first, radar.second, angle, range, latitude, longitude);
coordinates[offset] = latitude;
coordinates[offset + 1] = longitude;
});
timer.stop();
BOOST_LOG_TRIVIAL(debug)
<< "Coordinates calculated in " << timer.format(6, "%ws");
// Calculate vertices
static std::array<GLfloat, MAX_RADIALS * MAX_DATA_MOMENT_GATES * 6 * 2>
vertices;
GLsizeiptr index = 0;
timer.start();
for (uint16_t radial = 0; radial < 720; ++radial)
{ {
const float dataMomentRange = 2.125f * 1000.0f; const float dataMomentRange = 2.125f * 1000.0f;
const float dataMomentInterval = 0.25f * 1000.0f; const float dataMomentInterval = 0.25f * 1000.0f;
const float dataMomentIntervalH = dataMomentInterval * 0.5f; const float dataMomentIntervalH = dataMomentInterval * 0.5f;
const float snrThreshold = 2.0f; const float snrThreshold = 2.0f;
const uint16_t startGate = 7;
const uint16_t numberOfDataMomentGates = 1832; const uint16_t numberOfDataMomentGates = 1832;
const uint16_t endGate = std::min<uint16_t>(
numberOfDataMomentGates + startGate, MAX_DATA_MOMENT_GATES - 1);
float range1 = dataMomentRange - dataMomentIntervalH; for (uint16_t gate = startGate; gate < endGate; ++gate)
float range2 = range1 + dataMomentInterval;
for (uint16_t gate = 0; gate < numberOfDataMomentGates; ++gate)
{ {
double lat[4]; size_t offset1 = (radial * MAX_DATA_MOMENT_GATES + gate) * 2;
double lon[4]; size_t offset2 = offset1 + 2;
size_t offset3 =
(((radial + 1) % MAX_RADIALS) * MAX_DATA_MOMENT_GATES + gate) * 2;
size_t offset4 = offset3 + 2;
// TODO: Optimize vertices[index++] = coordinates[offset1];
geodesic.Direct( vertices[index++] = coordinates[offset1 + 1];
radar.first, radar.second, angle1, range1, lat[0], lon[0]);
geodesic.Direct(
radar.first, radar.second, angle1, range2, lat[1], lon[1]);
geodesic.Direct(
radar.first, radar.second, angle2, range1, lat[2], lon[2]);
geodesic.Direct(
radar.first, radar.second, angle2, range2, lat[3], lon[3]);
vertices[index++] = lat[0]; vertices[index++] = coordinates[offset2];
vertices[index++] = lon[0]; vertices[index++] = coordinates[offset2 + 1];
vertices[index++] = lat[1]; vertices[index++] = coordinates[offset3];
vertices[index++] = lon[1]; vertices[index++] = coordinates[offset3 + 1];
vertices[index++] = lat[2]; vertices[index++] = coordinates[offset3];
vertices[index++] = lon[2]; vertices[index++] = coordinates[offset3 + 1];
vertices[index++] = lat[2]; vertices[index++] = coordinates[offset4];
vertices[index++] = lon[2]; vertices[index++] = coordinates[offset4 + 1];
vertices[index++] = lat[3]; vertices[index++] = coordinates[offset2];
vertices[index++] = lon[3]; vertices[index++] = coordinates[offset2 + 1];
vertices[index++] = lat[1];
vertices[index++] = lon[1];
range1 += dataMomentInterval;
range2 += dataMomentInterval;
} }
angle1 += angleDelta;
angle2 += angleDelta;
break; break;
} }
timer.stop();
BOOST_LOG_TRIVIAL(debug)
<< "Vertices calculated in " << timer.format(6, "%ws");
// Generate a vertex buffer object // Generate a vertex buffer object
gl.glGenBuffers(1, &p->vbo_); gl.glGenBuffers(1, &p->vbo_);
@ -175,10 +198,14 @@ void RadarLayer::initialize()
// Copy vertices array in a buffer for OpenGL to use // Copy vertices array in a buffer for OpenGL to use
gl.glBindBuffer(GL_ARRAY_BUFFER, p->vbo_); gl.glBindBuffer(GL_ARRAY_BUFFER, p->vbo_);
timer.start();
gl.glBufferData(GL_ARRAY_BUFFER, gl.glBufferData(GL_ARRAY_BUFFER,
index * sizeof(GLfloat), index * sizeof(GLfloat),
vertices.data(), vertices.data(),
GL_STATIC_DRAW); GL_STATIC_DRAW);
timer.stop();
BOOST_LOG_TRIVIAL(debug)
<< "Vertices buffered in " << timer.format(6, "%ws");
// Set the vertex attributes pointers // Set the vertex attributes pointers
gl.glVertexAttribPointer( gl.glVertexAttribPointer(
@ -186,6 +213,7 @@ void RadarLayer::initialize()
gl.glEnableVertexAttribArray(0); gl.glEnableVertexAttribArray(0);
p->numVertices_ = index; p->numVertices_ = index;
p->bearing_ = p->map_->bearing();
} }
void RadarLayer::render(const QMapbox::CustomLayerRenderParameters& params) void RadarLayer::render(const QMapbox::CustomLayerRenderParameters& params)