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

Placefile polygon looping

Browse source
This commit is contained in:
Dan Paulat 2023-09-05 23:32:22 -05:00
parent e5d18ecc4d
commit 1a4b064214
4 changed files with 82 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

65
scwx-qt/source/scwx/qt/gl/draw/placefile_polygons.cpp
View file

@ -26,6 +26,9 @@ static const auto logger_ = scwx::util::Logger::Create(logPrefix_);
static constexpr std::size_t kVerticesPerTriangle = 3;
static constexpr std::size_t kPointsPerVertex = 8;
// Threshold, start time, end time
static constexpr std::size_t kIntegersPerVertex_ = 3;
static constexpr std::size_t kTessVertexScreenX_ = 0;
static constexpr std::size_t kTessVertexScreenY_ = 1;
static constexpr std::size_t kTessVertexScreenZ_ = 2;
@ -49,6 +52,7 @@ public:
uMapMatrixLocation_(GL_INVALID_INDEX),
uMapScreenCoordLocation_(GL_INVALID_INDEX),
uMapDistanceLocation_(GL_INVALID_INDEX),
uSelectedTimeLocation_(GL_INVALID_INDEX),
vao_ {GL_INVALID_INDEX},
vbo_ {GL_INVALID_INDEX},
numVertices_ {0}
@ -97,9 +101,9 @@ public:
std::mutex bufferMutex_ {};
std::vector<GLfloat> currentBuffer_ {};
std::vector<GLint> currentThresholdBuffer_ {};
std::vector<GLint> currentIntegerBuffer_ {};
std::vector<GLfloat> newBuffer_ {};
std::vector<GLint> newThresholdBuffer_ {};
std::vector<GLint> newIntegerBuffer_ {};
GLUtesselator* tessellator_;
@ -108,13 +112,16 @@ public:
GLint uMapMatrixLocation_;
GLint uMapScreenCoordLocation_;
GLint uMapDistanceLocation_;
GLint uSelectedTimeLocation_;
GLuint vao_;
std::array<GLuint, 2> vbo_;
GLsizei numVertices_;
GLint currentThreshold_;
GLint currentThreshold_ {};
GLint currentStartTime_ {};
GLint currentEndTime_ {};
};
PlacefilePolygons::PlacefilePolygons(
@ -154,6 +161,8 @@ void PlacefilePolygons::Initialize()
p->shaderProgram_->GetUniformLocation("uMapScreenCoord");
p->uMapDistanceLocation_ =
p->shaderProgram_->GetUniformLocation("uMapDistance");
p->uSelectedTimeLocation_ =
p->shaderProgram_->GetUniformLocation("uSelectedTime");
gl.glGenVertexArrays(1, &p->vao_);
gl.glGenBuffers(2, p->vbo_.data());
@ -196,10 +205,18 @@ void PlacefilePolygons::Initialize()
gl.glVertexAttribIPointer(3, //
1,
GL_INT,
0,
kIntegersPerVertex_ * sizeof(GLint),
static_cast<void*>(0));
gl.glEnableVertexAttribArray(3);
// aTimeRange
gl.glVertexAttribIPointer(4, //
2,
GL_INT,
kIntegersPerVertex_ * sizeof(GLint),
reinterpret_cast<void*>(1 * sizeof(GLint)));
gl.glEnableVertexAttribArray(4);
p->dirty_ = true;
}
@ -231,6 +248,17 @@ void PlacefilePolygons::Render(
gl.glUniform1f(p->uMapDistanceLocation_, 0.0f);
}
// Selected time
std::chrono::system_clock::time_point selectedTime =
(p->selectedTime_ == std::chrono::system_clock::time_point {}) ?
std::chrono::system_clock::now() :
p->selectedTime_;
gl.glUniform1i(
p->uSelectedTimeLocation_,
static_cast<GLint>(std::chrono::duration_cast<std::chrono::minutes>(
selectedTime.time_since_epoch())
.count()));
// Draw icons
gl.glDrawArrays(GL_TRIANGLES, 0, p->numVertices_);
}
@ -247,14 +275,14 @@ void PlacefilePolygons::Deinitialize()
// Clear the current buffers
p->currentBuffer_.clear();
p->currentThresholdBuffer_.clear();
p->currentIntegerBuffer_.clear();
}
void PlacefilePolygons::StartPolygons()
{
// Clear the new buffers
p->newBuffer_.clear();
p->newThresholdBuffer_.clear();
p->newIntegerBuffer_.clear();
}
void PlacefilePolygons::AddPolygon(
@ -272,11 +300,11 @@ void PlacefilePolygons::FinishPolygons()
// Swap buffers
p->currentBuffer_.swap(p->newBuffer_);
p->currentThresholdBuffer_.swap(p->newThresholdBuffer_);
p->currentIntegerBuffer_.swap(p->newIntegerBuffer_);
// Clear the new buffers
p->newBuffer_.clear();
p->newThresholdBuffer_.clear();
p->newIntegerBuffer_.clear();
// Mark the draw item dirty
p->dirty_ = true;
@ -300,8 +328,8 @@ void PlacefilePolygons::Impl::Update()
// Buffer threshold data
gl.glBindBuffer(GL_ARRAY_BUFFER, vbo_[1]);
gl.glBufferData(GL_ARRAY_BUFFER,
sizeof(GLint) * currentThresholdBuffer_.size(),
currentThresholdBuffer_.data(),
sizeof(GLint) * currentIntegerBuffer_.size(),
currentIntegerBuffer_.data(),
GL_DYNAMIC_DRAW);
numVertices_ =
@ -324,6 +352,16 @@ void PlacefilePolygons::Impl::Tessellate(
units::length::nautical_miles<double> threshold = di->threshold_;
currentThreshold_ = static_cast<GLint>(std::round(threshold.value()));
// Start and end time
currentStartTime_ =
static_cast<GLint>(std::chrono::duration_cast<std::chrono::minutes>(
di->startTime_.time_since_epoch())
.count());
currentEndTime_ =
static_cast<GLint>(std::chrono::duration_cast<std::chrono::minutes>(
di->endTime_.time_since_epoch())
.count());
gluTessBeginPolygon(tessellator_, this);
for (auto& contour : di->contours_)
@ -370,7 +408,7 @@ void PlacefilePolygons::Impl::Tessellate(
while (newBuffer_.size() % kVerticesPerTriangle != 0)
{
newBuffer_.pop_back();
newThresholdBuffer_.pop_back();
newIntegerBuffer_.pop_back();
}
}
@ -431,7 +469,10 @@ void PlacefilePolygons::Impl::TessellateVertexCallback(void* vertexData,
static_cast<float>(data[kTessVertexG_]),
static_cast<float>(data[kTessVertexB_]),
static_cast<float>(data[kTessVertexA_])});
self->newThresholdBuffer_.push_back(self->currentThreshold_);
self->newIntegerBuffer_.insert(self->newIntegerBuffer_.end(),
{self->currentThreshold_,
self->currentStartTime_,
self->currentEndTime_});
}
void PlacefilePolygons::Impl::TessellateErrorCallback(GLenum errorCode)