mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2024-11-28 00:39:02 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Backends: GLUT: remove call to ImGui::NewFrame() from ImGui_ImplGLUT_NewFrame(). (#6337)

Browse Source
This commit is contained in:
Gereon V 2023-04-16 00:45:21 +02:00 committed by ocornut
parent 064153fca4
commit f304603e13
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backends/imgui_impl_glut.cpp
View File

@ -21,6 +21,7 @@
// CHANGELOG // CHANGELOG
// (minor and older changes stripped away, please see git history for details) // (minor and older changes stripped away, please see git history for details)
// 2023-04-17: BREAKING: Removed call to ImGui::NewFrame() from ImGui_ImplGLUT_NewFrame(). Needs to be called from the main application loop, like with every other backends.
// 2022-09-26: Inputs: Renamed ImGuiKey_ModXXX introduced in 1.87 to ImGuiMod_XXX (old names still supported). // 2022-09-26: Inputs: Renamed ImGuiKey_ModXXX introduced in 1.87 to ImGuiMod_XXX (old names still supported).
// 2022-01-26: Inputs: replaced short-lived io.AddKeyModsEvent() (added two weeks ago) with io.AddKeyEvent() using ImGuiKey_ModXXX flags. Sorry for the confusion. // 2022-01-26: Inputs: replaced short-lived io.AddKeyModsEvent() (added two weeks ago) with io.AddKeyEvent() using ImGuiKey_ModXXX flags. Sorry for the confusion.
// 2022-01-17: Inputs: calling new io.AddMousePosEvent(), io.AddMouseButtonEvent(), io.AddMouseWheelEvent() API (1.87+). // 2022-01-17: Inputs: calling new io.AddMousePosEvent(), io.AddMouseButtonEvent(), io.AddMouseWheelEvent() API (1.87+).
@ -202,9 +203,6 @@ void ImGui_ImplGLUT_NewFrame()
delta_time_ms = 1; delta_time_ms = 1;
io.DeltaTime = delta_time_ms / 1000.0f; io.DeltaTime = delta_time_ms / 1000.0f;
g_Time = current_time; g_Time = current_time;
// Start the frame
ImGui::NewFrame();
} }
static void ImGui_ImplGLUT_UpdateKeyModifiers() static void ImGui_ImplGLUT_UpdateKeyModifiers()

4
docs/CHANGELOG.txt
View File

@ -37,9 +37,13 @@ HOW TO UPDATE?
Breaking changes: Breaking changes:
- Backends: GLUT: Removed call to ImGui::NewFrame() from ImGui_ImplGLUT_NewFrame().
It needs to be called from the main app loop, like with every other backends. (#6337) [@GereonV]
Other changes: Other changes:
----------------------------------------------------------------------- -----------------------------------------------------------------------
VERSION 1.89.5 (Released 2023-04-13) VERSION 1.89.5 (Released 2023-04-13)
----------------------------------------------------------------------- -----------------------------------------------------------------------

1
examples/example_glut_opengl2/main.cpp
View File

@ -107,6 +107,7 @@ void MainLoopStep()
// Start the Dear ImGui frame // Start the Dear ImGui frame
ImGui_ImplOpenGL2_NewFrame(); ImGui_ImplOpenGL2_NewFrame();
ImGui_ImplGLUT_NewFrame(); ImGui_ImplGLUT_NewFrame();
ImGui::NewFrame();
// 1. Show the big demo window (Most of the sample code is in ImGui::ShowDemoWindow()! You can browse its code to learn more about Dear ImGui!). // 1. Show the big demo window (Most of the sample code is in ImGui::ShowDemoWindow()! You can browse its code to learn more about Dear ImGui!).
if (show_demo_window) if (show_demo_window)