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

Update vertices for smoothing

Browse source
This commit is contained in:
Dan Paulat 2024-12-01 00:41:01 -06:00
parent 84f0003bef
commit 1c8d7f5be9
1 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

26
scwx-qt/source/scwx/qt/view/level2_product_view.cpp
View file

@ -540,7 +540,7 @@ void Level2ProductView::ComputeSweep()
// When there is missing data, insert another empty vertex radial at the end // When there is missing data, insert another empty vertex radial at the end
// to avoid stretching // to avoid stretching
const bool isRadarDataIncomplete = Impl::IsRadarDataIncomplete(radarData); const bool isRadarDataIncomplete = Impl::IsRadarDataIncomplete(radarData);
if (isRadarDataIncomplete) if (isRadarDataIncomplete && !smoothingEnabled)
{ {
++vertexRadials; ++vertexRadials;
} }
@ -654,9 +654,13 @@ void Level2ProductView::ComputeSweep()
const std::int32_t gateSize = const std::int32_t gateSize =
std::max<std::int32_t>(1, dataMomentInterval / gateSizeMeters); std::max<std::int32_t>(1, dataMomentInterval / gateSizeMeters);
// TODO: Does startGate need to increase by 1 when smoothing? What about
// gate 1840? Does last gate need extended?
// Compute gate range [startGate, endGate) // Compute gate range [startGate, endGate)
const std::int32_t gateOffset = (smoothingEnabled) ? 1 : 0;
const std::int32_t startGate = const std::int32_t startGate =
(dataMomentRange - dataMomentIntervalH) / gateSizeMeters; (dataMomentRange - dataMomentIntervalH) / gateSizeMeters + gateOffset;
const std::int32_t numberOfDataMomentGates = const std::int32_t numberOfDataMomentGates =
std::min<std::int32_t>(momentData->number_of_data_moment_gates(), std::min<std::int32_t>(momentData->number_of_data_moment_gates(),
static_cast<std::int32_t>(gates)); static_cast<std::int32_t>(gates));
@ -732,6 +736,14 @@ void Level2ProductView::ComputeSweep()
// Store vertices // Store vertices
if (gate > 0) if (gate > 0)
{ {
// Draw two triangles per gate
//
// 2 +---+ 4
// | /|
// | / |
// |/ |
// 1 +---+ 3
const std::uint16_t baseCoord = gate - 1; const std::uint16_t baseCoord = gate - 1;
std::size_t offset1 = ((startRadial + radial) % vertexRadials * std::size_t offset1 = ((startRadial + radial) % vertexRadials *
@ -752,8 +764,11 @@ void Level2ProductView::ComputeSweep()
vertices[vIndex++] = coordinates[offset2]; vertices[vIndex++] = coordinates[offset2];
vertices[vIndex++] = coordinates[offset2 + 1]; vertices[vIndex++] = coordinates[offset2 + 1];
vertices[vIndex++] = coordinates[offset3]; vertices[vIndex++] = coordinates[offset4];
vertices[vIndex++] = coordinates[offset3 + 1]; vertices[vIndex++] = coordinates[offset4 + 1];
vertices[vIndex++] = coordinates[offset1];
vertices[vIndex++] = coordinates[offset1 + 1];
vertices[vIndex++] = coordinates[offset3]; vertices[vIndex++] = coordinates[offset3];
vertices[vIndex++] = coordinates[offset3 + 1]; vertices[vIndex++] = coordinates[offset3 + 1];
@ -761,9 +776,6 @@ void Level2ProductView::ComputeSweep()
vertices[vIndex++] = coordinates[offset4]; vertices[vIndex++] = coordinates[offset4];
vertices[vIndex++] = coordinates[offset4 + 1]; vertices[vIndex++] = coordinates[offset4 + 1];
vertices[vIndex++] = coordinates[offset2];
vertices[vIndex++] = coordinates[offset2 + 1];
vertexCount = 6; vertexCount = 6;
} }
else else