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

Move texture binding to layer, and reference atlas coordinates in draw item

Browse source
This commit is contained in:
Dan Paulat 2022-10-06 00:35:22 -05:00
parent d3f7347be0
commit 0fa6ef01f0
2 changed files with 34 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
scwx-qt/source/scwx/qt/map/draw_layer.cpp
View file

@ -15,10 +15,15 @@ static const auto logger_ = scwx::util::Logger::Create(logPrefix_);
class DrawLayerImpl
{
public:
explicit DrawLayerImpl(std::shared_ptr<MapContext> context) {}
explicit DrawLayerImpl(std::shared_ptr<MapContext> context) :
context_ {context}, drawList_ {}, textureAtlas_ {GL_INVALID_INDEX}
{
}
~DrawLayerImpl() {}
std::shared_ptr<MapContext> context_;
std::vector<std::shared_ptr<gl::draw::DrawItem>> drawList_;
GLuint textureAtlas_;
};
DrawLayer::DrawLayer(std::shared_ptr<MapContext> context) :
@ -29,6 +34,8 @@ DrawLayer::~DrawLayer() = default;
void DrawLayer::Initialize()
{
p->textureAtlas_ = p->context_->GetTextureAtlas();
for (auto& item : p->drawList_)
{
item->Initialize();
@ -37,6 +44,11 @@ void DrawLayer::Initialize()
void DrawLayer::Render(const QMapbox::CustomLayerRenderParameters& params)
{
gl::OpenGLFunctions& gl = p->context_->gl();
gl.glActiveTexture(GL_TEXTURE0);
gl.glBindTexture(GL_TEXTURE_2D, p->textureAtlas_);
for (auto& item : p->drawList_)
{
item->Render(params);
@ -45,6 +57,8 @@ void DrawLayer::Render(const QMapbox::CustomLayerRenderParameters& params)
void DrawLayer::Deinitialize()
{
p->textureAtlas_ = GL_INVALID_INDEX;
for (auto& item : p->drawList_)
{
item->Deinitialize();