Skip to content
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

Jump to bottom

Update ImGui v1.90.9 #13392

Open
wants to merge 8 commits into
base: development
Choose a base branch
from
Open

Update ImGui v1.90.9 #13392

wants to merge 8 commits into from

Conversation

Noy-Zini
Copy link

@Noy-Zini Noy-Zini commented Oct 1, 2024

Traced on: [LRS-1129]

Nir-Az
Nir-Az reviewed Oct 6, 2024
View reviewed changes
common/ux-alignment.cpp Outdated Show resolved Hide resolved
Nir-Az
Nir-Az reviewed Oct 6, 2024
View reviewed changes
common/ux-alignment.cpp Outdated Show resolved Hide resolved
Nir-Az
Nir-Az reviewed Oct 6, 2024
View reviewed changes
common/ux-window.cpp Outdated Show resolved Hide resolved
Nir-Az
Nir-Az reviewed Oct 6, 2024
View reviewed changes
common/ux-window.cpp Outdated Show resolved Hide resolved
Nir-Az
Nir-Az reviewed Oct 6, 2024
View reviewed changes
common/ux-window.cpp Outdated Show resolved Hide resolved
Nir-Az
Nir-Az reviewed Oct 6, 2024
View reviewed changes
common/ux-window.cpp Outdated Show resolved Hide resolved
@Nir-Az
Copy link
Collaborator

Nir-Az commented Oct 6, 2024

Note that once ready we will have to make a UI sanity to this change.
Including online updates windows, calibration windows and more

Nir-Az
Nir-Az reviewed Nov 10, 2024
View reviewed changes
common/option-model.cpp Outdated Show resolved Hide resolved
Nir-Az
Nir-Az reviewed Nov 10, 2024
View reviewed changes
common/option-model.cpp Outdated Show resolved Hide resolved
Nir-Az
Nir-Az reviewed Nov 10, 2024
View reviewed changes
common/subdevice-model.cpp Outdated Show resolved Hide resolved
Nir-Az
Nir-Az reviewed Nov 10, 2024
View reviewed changes
examples/align-gl/rs-align-gl.cpp
@@ -124,11 +130,17 @@ int main(int argc, char * argv[]) try
glDisable(GL_BLEND);

// Render the UI:
ImGui_ImplGlfw_NewFrame(1);
ImGui_ImplOpenGL3_NewFrame();
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can abe placed at realsense_imgui.h right as a
push_new_frame
pop_new_frame

or something like this, helper funcs that will be used everywhere.

Thoughts?

Nir-Az
Nir-Az reviewed Nov 10, 2024
View reviewed changes
examples/example-imgui.hpp
@@ -146,7 +164,7 @@ class hdr_widgets {
void render_widgets() {

//start a new frame of ImGui
ImGui_ImplGlfw_NewFrame(1);
ImGui_ImplGlfw_NewFrame();
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't we need all the other NEW / DESTROY methods?

Nir-Az
Nir-Az reviewed Nov 10, 2024
View reviewed changes
examples/example-imgui.hpp
@@ -47,10 +47,28 @@ class hdr_slider : public slider {
ImGui::SetNextWindowPos(_position);
//concate the name given with seq_id in order to make a unique name (uniqeness is needed for Begin())
std::string name_id = std::string(_name) + std::to_string(_seq_id);
ImGuiStyle& style = ImGui::GetStyle();
ImVec4* colors = style.Colors;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need all this color settings that was not done before?

Nir-Az
Nir-Az reviewed Nov 10, 2024
View reviewed changes
examples/post-processing/rs-post-processing.cpp
@@ -288,6 +303,7 @@ void render_ui(float w, float h, std::vector<filter_options>& filters)

ImGui::End();
ImGui::Render();
ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData());
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like not all examples use the same calls, right? or I m missing something

Nir-Az
Nir-Az reviewed Nov 10, 2024
View reviewed changes
third-party/imgui/realsense_imgui.cpp
/* License: Apache 2.0. See LICENSE file in root directory. */
/* Copyright(c) 2024 Intel Corporation. All Rights Reserved. */

//Overloading imgui functions to accommodate realsense GUI
Copy link
Collaborator

@Nir-Az Nir-Az Nov 10, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So we must include this header only after the IMGUI header?

@Noy-Zini Noy-Zini marked this pull request as ready for review November 12, 2024 09:59
@Noy-Zini Noy-Zini force-pushed the Update_ImGui_v1.90.9 branch 2 times, most recently from 62664f3 to 8b81f93 Compare November 13, 2024 13:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Nir-Az Nir-Az Nir-Az left review comments

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Noy-Zini @Nir-Az