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

Add shader programs to Geo Line class

Browse source
This commit is contained in:
Dan Paulat 2022-10-03 00:21:31 -05:00
parent 224d36bae5
commit ca9331cf7c
2 changed files with 31 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

39
scwx-qt/source/scwx/qt/gl/draw/geo_line.cpp
View file

@ -1,5 +1,6 @@
#include <scwx/qt/gl/draw/geo_line.hpp> #include <scwx/qt/gl/draw/geo_line.hpp>
#include <scwx/common/geographic.hpp> #include <scwx/common/geographic.hpp>
#include <scwx/util/logger.hpp>
#include <optional> #include <optional>
@ -13,6 +14,7 @@ namespace draw
{ {
static const std::string logPrefix_ = "scwx::qt::gl::draw::geo_line"; static const std::string logPrefix_ = "scwx::qt::gl::draw::geo_line";
static const auto logger_ = scwx::util::Logger::Create(logPrefix_);
static constexpr size_t kNumRectangles = 1; static constexpr size_t kNumRectangles = 1;
static constexpr size_t kNumTriangles = kNumRectangles * 2; static constexpr size_t kNumTriangles = kNumRectangles * 2;
@ -25,13 +27,15 @@ static constexpr size_t kBufferLength =
class GeoLine::Impl class GeoLine::Impl
{ {
public: public:
explicit Impl(OpenGLFunctions& gl) : explicit Impl(std::shared_ptr<GlContext> context) :
gl_ {gl}, context_ {context},
dirty_ {false}, dirty_ {false},
visible_ {true}, visible_ {true},
points_ {}, points_ {},
width_ {1.0f}, width_ {1.0f},
modulateColor_ {std::nullopt}, modulateColor_ {std::nullopt},
shaderProgram_ {nullptr},
uMVPMatrixLocation_(GL_INVALID_INDEX),
vao_ {GL_INVALID_INDEX}, vao_ {GL_INVALID_INDEX},
vbo_ {GL_INVALID_INDEX} vbo_ {GL_INVALID_INDEX}
{ {
@ -39,7 +43,7 @@ public:
~Impl() {} ~Impl() {}
OpenGLFunctions& gl_; std::shared_ptr<GlContext> context_;
bool dirty_; bool dirty_;
@ -51,6 +55,9 @@ public:
// TODO: Texture // TODO: Texture
std::shared_ptr<ShaderProgram> shaderProgram_;
GLint uMVPMatrixLocation_;
GLuint vao_; GLuint vao_;
GLuint vbo_; GLuint vbo_;
@ -58,8 +65,8 @@ public:
}; };
// TODO: OpenGL context with shaders // TODO: OpenGL context with shaders
GeoLine::GeoLine(OpenGLFunctions& gl) : GeoLine::GeoLine(std::shared_ptr<GlContext> context) :
DrawItem(gl), p(std::make_unique<Impl>(gl)) DrawItem(context->gl()), p(std::make_unique<Impl>(context))
{ {
} }
GeoLine::~GeoLine() = default; GeoLine::~GeoLine() = default;
@ -69,7 +76,17 @@ GeoLine& GeoLine::operator=(GeoLine&&) noexcept = default;
void GeoLine::Initialize() void GeoLine::Initialize()
{ {
gl::OpenGLFunctions& gl = p->gl_; gl::OpenGLFunctions& gl = p->context_->gl();
p->shaderProgram_ = p->context_->GetShaderProgram(":/gl/geo_line.vert",
":/gl/texture2d.frag");
p->uMVPMatrixLocation_ =
gl.glGetUniformLocation(p->shaderProgram_->id(), "uMVPMatrix");
if (p->uMVPMatrixLocation_ == -1)
{
logger_->warn("Could not find uMVPMatrix");
}
gl.glGenVertexArrays(1, &p->vao_); gl.glGenVertexArrays(1, &p->vao_);
gl.glGenBuffers(1, &p->vbo_); gl.glGenBuffers(1, &p->vbo_);
@ -118,16 +135,18 @@ void GeoLine::Initialize()
p->dirty_ = true; p->dirty_ = true;
} }
void GeoLine::Render(const QMapbox::CustomLayerRenderParameters&) void GeoLine::Render(const QMapbox::CustomLayerRenderParameters& params)
{ {
if (p->visible_) if (p->visible_)
{ {
gl::OpenGLFunctions& gl = p->gl_; gl::OpenGLFunctions& gl = p->context_->gl();
gl.glBindVertexArray(p->vao_); gl.glBindVertexArray(p->vao_);
gl.glBindBuffer(GL_ARRAY_BUFFER, p->vbo_); gl.glBindBuffer(GL_ARRAY_BUFFER, p->vbo_);
p->Update(); p->Update();
p->shaderProgram_->Use();
UseDefaultProjection(params, p->uMVPMatrixLocation_);
// Draw line // Draw line
gl.glDrawArrays(GL_TRIANGLES, 0, 6); gl.glDrawArrays(GL_TRIANGLES, 0, 6);
@ -136,7 +155,7 @@ void GeoLine::Render(const QMapbox::CustomLayerRenderParameters&)
void GeoLine::Deinitialize() void GeoLine::Deinitialize()
{ {
gl::OpenGLFunctions& gl = p->gl_; gl::OpenGLFunctions& gl = p->context_->gl();
gl.glDeleteVertexArrays(1, &p->vao_); gl.glDeleteVertexArrays(1, &p->vao_);
gl.glDeleteBuffers(1, &p->vbo_); gl.glDeleteBuffers(1, &p->vbo_);
@ -185,7 +204,7 @@ void GeoLine::Impl::Update()
{ {
if (dirty_) if (dirty_)
{ {
gl::OpenGLFunctions& gl = gl_; gl::OpenGLFunctions& gl = context_->gl();
const float lx = points_[0].latitude_; const float lx = points_[0].latitude_;
const float rx = points_[1].latitude_; const float rx = points_[1].latitude_;

4
scwx-qt/source/scwx/qt/gl/draw/geo_line.hpp
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <scwx/qt/gl/gl.hpp> #include <scwx/qt/gl/gl_context.hpp>
#include <scwx/qt/gl/draw/draw_item.hpp> #include <scwx/qt/gl/draw/draw_item.hpp>
#include <boost/gil.hpp> #include <boost/gil.hpp>
@ -17,7 +17,7 @@ namespace draw
class GeoLine : public DrawItem class GeoLine : public DrawItem
{ {
public: public:
explicit GeoLine(OpenGLFunctions& gl); explicit GeoLine(std::shared_ptr<GlContext> context);
~GeoLine(); ~GeoLine();
GeoLine(const GeoLine&) = delete; GeoLine(const GeoLine&) = delete;