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

Merge pull request #478 from dpaulat/feature/opengl-3.3-core

Browse source 
Use GLEW instead of QOpenGLFunctions
This commit is contained in:
Dan Paulat 2025-07-12 09:31:06 -05:00 • committed by GitHub
commit 01ae858906
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
35 changed files with 996 additions and 1026 deletions
Download patch file Download diff file Expand all files Collapse all files

10
scwx-qt/source/scwx/qt/ui/imgui_debug_widget.cpp
View file

@ -1,5 +1,4 @@
#include <scwx/qt/ui/imgui_debug_widget.hpp>
#include <scwx/qt/gl/gl.hpp>
#include <scwx/qt/manager/font_manager.hpp>
#include <scwx/qt/model/imgui_context_model.hpp>
@ -60,8 +59,6 @@ public:
ImGuiContext* currentContext_;
gl::OpenGLFunctions gl_;
std::set<ImGuiContext*> renderedSet_ {};
bool imGuiRendererInitialized_ {false};
std::uint64_t imGuiFontsBuildCount_ {};
@ -106,9 +103,6 @@ void ImGuiDebugWidget::initializeGL()
{
makeCurrent();
// Initialize OpenGL Functions
p->gl_.initializeOpenGLFunctions();
// Initialize ImGui OpenGL3 backend
ImGui::SetCurrentContext(p->context_);
ImGui_ImplOpenGL3_Init();
@ -119,8 +113,8 @@ void ImGuiDebugWidget::initializeGL()
void ImGuiDebugWidget::paintGL()
{
p->gl_.glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
p->gl_.glClear(GL_COLOR_BUFFER_BIT);
glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
glClear(GL_COLOR_BUFFER_BIT);
ImGui::SetCurrentContext(p->currentContext_);

2
scwx-qt/source/scwx/qt/ui/imgui_debug_widget.hpp
View file

@ -1,5 +1,7 @@
#pragma once
#include <scwx/qt/gl/gl.hpp>
#include <QOpenGLWidget>
struct ImGuiContext;