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

Inital code for per map layer ImGui contexts

Browse source
This commit is contained in:
AdenKoperczak 2025-01-04 13:49:31 -05:00
parent e641c0b0e5
commit 6d107f6c2d
7 changed files with 153 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

25
scwx-qt/source/scwx/qt/map/map_widget.cpp
View file

@ -114,6 +114,7 @@ public:
context_->set_map_provider(
GetMapProvider(generalSettings.map_provider().GetValue()));
context_->set_overlay_product_view(overlayProductView);
context_->set_widget(widget);
// Initialize map data
SetRadarSite(generalSettings.default_radar_site().GetValue());
@ -1571,21 +1572,10 @@ void MapWidget::paintGL()
// Handle hotkey updates
p->HandleHotkeyUpdates();
// Setup ImGui Frame
ImGui::SetCurrentContext(p->imGuiContext_);
// Lock ImGui font atlas prior to new ImGui frame
std::shared_lock imguiFontAtlasLock {
manager::FontManager::Instance().imgui_font_atlas_mutex()};
// Start ImGui Frame
ImGui_ImplQt_NewFrame(this);
ImGui_ImplOpenGL3_NewFrame();
p->ImGuiCheckFonts();
ImGui::NewFrame();
// Set default font
ImGui::PushFont(defaultFont->font());
// Update pixel ratio
p->context_->set_pixel_ratio(pixelRatio());
@ -1596,6 +1586,19 @@ void MapWidget::paintGL()
size() * pixelRatio());
p->map_->render();
// ImGui tool tip code
// Setup ImGui Frame
ImGui::SetCurrentContext(p->imGuiContext_);
// Start ImGui Frame
ImGui_ImplQt_NewFrame(this);
ImGui_ImplOpenGL3_NewFrame();
p->ImGuiCheckFonts();
ImGui::NewFrame();
// Set default font
ImGui::PushFont(defaultFont->font());
// Perform mouse picking
if (p->hasMouse_)
{