From e95e00a2e2be15dd3f4bdbfeda2c1fdaae26d92c Mon Sep 17 00:00:00 2001 From: docentYT <63965954+docentYT@users.noreply.github.com> Date: Tue, 12 May 2026 18:04:50 +0200 Subject: [PATCH] Use texture id casting recommended by ImGui wiki --- launcher/scenery_list.cpp | 4 ++-- launcher/vehicle_picker.cpp | 4 ++-- rendering/opengl33renderer.cpp | 2 +- widgets/cameraview_extcam.cpp | 2 +- widgets/map.cpp | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/launcher/scenery_list.cpp b/launcher/scenery_list.cpp index c17d06a0..7a54b3e2 100644 --- a/launcher/scenery_list.cpp +++ b/launcher/scenery_list.cpp @@ -291,7 +291,7 @@ void ui::scenerylist_panel::draw_trainset(trainset_desc &trainset) glm::ivec2 size = mini->size(); float width = 30.0f / size.y * size.x; float beforeX = ImGui::GetCursorPosX(); - ImGui::Image(reinterpret_cast(mini->get()), ImVec2(width, 30), ImVec2(0, 1), ImVec2(1, 0)); + ImGui::Image((ImTextureID)(intptr_t)(mini->get()), ImVec2(width, 30), ImVec2(0, 1), ImVec2(1, 0)); float afterX = ImGui::GetCursorPosX(); ImGui::SameLine(beforeX); @@ -299,7 +299,7 @@ void ui::scenerylist_panel::draw_trainset(trainset_desc &trainset) if (ImGui::BeginDragDropSource(ImGuiDragDropFlags_SourceAutoExpirePayload)) { vehicle_moved data(trainset, dyn_desc, position - 1); - ImGui::Image(reinterpret_cast(mini->get()), ImVec2(width, 30), ImVec2(0, 1), ImVec2(1, 0)); + ImGui::Image((ImTextureID)(intptr_t)mini->get(), ImVec2(width, 30), ImVec2(0, 1), ImVec2(1, 0)); ImGui::SetDragDropPayload("vehicle_set", &data, sizeof(vehicle_moved)); ImGui::EndDragDropSource(); diff --git a/launcher/vehicle_picker.cpp b/launcher/vehicle_picker.cpp index 252993e4..43d7b198 100644 --- a/launcher/vehicle_picker.cpp +++ b/launcher/vehicle_picker.cpp @@ -274,7 +274,7 @@ bool ui::vehiclepicker_panel::selectable_image(const char *desc, bool selected, glm::ivec2 size = image->size(); float width = 30.0f / size.y * size.x; ImGui::SameLine(ImGui::GetContentRegionAvail().x - width); - ImGui::Image(reinterpret_cast(tex), ImVec2(width, 30), ImVec2(0, 1), ImVec2(1, 0)); + ImGui::Image((ImTextureID)(intptr_t)tex, ImVec2(width, 30), ImVec2(0, 1), ImVec2(1, 0)); if (pickable) { ImGui::PushID((void*)image); @@ -282,7 +282,7 @@ bool ui::vehiclepicker_panel::selectable_image(const char *desc, bool selected, ImGui::InvisibleButton(desc, ImVec2(width, 30)); if (ImGui::BeginDragDropSource(ImGuiDragDropFlags_SourceAutoExpirePayload)) { - ImGui::Image(reinterpret_cast(tex), ImVec2(width, 30), ImVec2(0, 1), ImVec2(1, 0)); + ImGui::Image((ImTextureID)(intptr_t)tex, ImVec2(width, 30), ImVec2(0, 1), ImVec2(1, 0)); ImGui::SetDragDropPayload("vehicle_pure", &pickable, sizeof(skin_set*)); ImGui::EndDragDropSource(); diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index 43fef6b4..73c667d6 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -687,7 +687,7 @@ void opengl33_renderer::draw_debug_ui() ImGui::SetNextWindowSize(ImVec2S(400, 400)); if (ImGui::Begin("Pickbuffer") && m_pick_tex) { - ImGui::Image(reinterpret_cast(m_pick_tex->id), ImGui::GetContentRegionAvail(), ImVec2(0, 1.0), ImVec2(1.0, 0)); + ImGui::Image((ImTextureID)(intptr_t)(m_pick_tex->id), ImGui::GetContentRegionAvail(), ImVec2(0, 1.0), ImVec2(1.0, 0)); } ImGui::End(); } diff --git a/widgets/cameraview_extcam.cpp b/widgets/cameraview_extcam.cpp index 1328b485..80deddbe 100644 --- a/widgets/cameraview_extcam.cpp +++ b/widgets/cameraview_extcam.cpp @@ -113,7 +113,7 @@ void ui::cameraview_panel::render_contents() } ImVec2 surface_size = ImGui::GetContentRegionAvail(); - ImGui::Image(reinterpret_cast(texture->id), surface_size); + ImGui::Image((ImTextureID)(intptr_t)(texture->id), surface_size); } void ui::cameraview_panel::capture_func() diff --git a/widgets/map.cpp b/widgets/map.cpp index 297c0351..379b0311 100644 --- a/widgets/map.cpp +++ b/widgets/map.cpp @@ -299,7 +299,7 @@ void ui::map_panel::render_contents() ImVec2 window_origin = ImGui::GetCursorPos(); ImVec2 screen_origin = ImGui::GetCursorScreenPos(); - ImGui::ImageButton(reinterpret_cast(m_tex->id), surface_size_im, ImVec2(0, surface_size.y / fb_size), ImVec2(surface_size.x / fb_size, 0), 0); + ImGui::ImageButton((ImTextureID)(intptr_t)(m_tex->id), surface_size_im, ImVec2(0, surface_size.y / fb_size), ImVec2(surface_size.x / fb_size, 0), 0); if (ImGui::IsItemHovered()) {