Skip to content

update imgui to v1.91.9b #338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nmwsharp merged 1 commit into from
Apr 30, 2025
Merged

update imgui to v1.91.9b #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deps/imgui/imgui
Open in desktop
Submodule imgui updated 139 files
5 changes: 3 additions & 2 deletions src/color_image_quantity.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,10 @@ void ColorImageQuantity::showInImGuiWindow() {

// since we are showing directly from the user's texture, we need to resposect the upper left ordering
if (imageOrigin == ImageOrigin::LowerLeft) {
ImGui::Image(colors.getRenderTextureBuffer()->getNativeHandle(), ImVec2(w, h), ImVec2(0, 1), ImVec2(1, 0));
ImGui::Image((ImTextureID)(intptr_t)colors.getRenderTextureBuffer()->getNativeHandle(), ImVec2(w, h), ImVec2(0, 1),
ImVec2(1, 0));
} else if (imageOrigin == ImageOrigin::UpperLeft) {
ImGui::Image(colors.getRenderTextureBuffer()->getNativeHandle(), ImVec2(w, h));
ImGui::Image((ImTextureID)(intptr_t)colors.getRenderTextureBuffer()->getNativeHandle(), ImVec2(w, h));
}
render::engine->preserveResourceUntilImguiFrameCompletes(colors.getRenderTextureBuffer());

Expand Down
2 changes: 1 addition & 1 deletion src/histogram.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ void Histogram::buildUI(float width) {
float h = w / aspect;

// Render image
ImGui::Image(texture->getNativeHandle(), ImVec2(w, h), ImVec2(0, 1), ImVec2(1, 0));
ImGui::Image((ImTextureID)(intptr_t)texture->getNativeHandle(), ImVec2(w, h), ImVec2(0, 1), ImVec2(1, 0));
render::engine->preserveResourceUntilImguiFrameCompletes(texture);

// Helpful info for drawing annotations below
Expand Down
2 changes: 1 addition & 1 deletion src/imgui_config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ void configureImGuiStyle() {
colors[ImGuiCol_DragDropTarget] = ImVec4(1.00f, 1.00f, 0.00f, 0.90f);
colors[ImGuiCol_Tab] = ImVec4(0.27f, 0.54f, 0.42f, 0.83f);
colors[ImGuiCol_TabHovered] = ImVec4(0.34f, 0.68f, 0.53f, 0.83f);
colors[ImGuiCol_TabActive] = ImVec4(0.38f, 0.76f, 0.58f, 0.83f);
colors[ImGuiCol_TabSelected] = ImVec4(0.38f, 0.76f, 0.58f, 0.83f);
}


Expand Down
2 changes: 1 addition & 1 deletion src/render/engine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1176,7 +1176,7 @@ void Engine::showTextureInImGuiWindow(std::string windowName, TextureBuffer* buf
float h = w * buffer->getSizeY() / buffer->getSizeX();

ImGui::Text("Dimensions: %dx%d", buffer->getSizeX(), buffer->getSizeY());
ImGui::Image(buffer->getNativeHandle(), ImVec2(w, h), ImVec2(0, 1), ImVec2(1, 0));
ImGui::Image((ImTextureID)(intptr_t)buffer->getNativeHandle(), ImVec2(w, h), ImVec2(0, 1), ImVec2(1, 0));

ImGui::End();
}
Expand Down
3 changes: 2 additions & 1 deletion src/scalar_image_quantity.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,8 @@ void ScalarImageQuantity::showInImGuiWindow() {

// here we always use the same ImVec2 UV coords below, because the texture order is always openGL convention after the
// intermediate render pass
ImGui::Image(textureIntermediateRendered->getNativeHandle(), ImVec2(w, h), ImVec2(0, 1), ImVec2(1, 0));
ImGui::Image((ImTextureID)(intptr_t)textureIntermediateRendered->getNativeHandle(), ImVec2(w, h), ImVec2(0, 1),
ImVec2(1, 0));
render::engine->preserveResourceUntilImguiFrameCompletes(textureIntermediateRendered);


Expand Down