From cdb109f617bd44df718f2c7c367ece02e2468da9 Mon Sep 17 00:00:00 2001 From: omar Date: Wed, 3 Apr 2019 16:23:50 +0200 Subject: [PATCH] Renamed freeglut vcxproj files + Comments, Changelog (#2465) --- docs/CHANGELOG.txt | 4 +++- examples/README.txt | 4 ++-- ...freeglut_opengl2.vcxproj => example_glut_opengl2.vcxproj} | 0 ....vcxproj.filters => example_glut_opengl2.vcxproj.filters} | 0 examples/example_glut_opengl2/main.cpp | 4 ++-- examples/imgui_impl_glut.cpp | 5 +++-- examples/imgui_impl_glut.h | 4 ++-- 7 files changed, 12 insertions(+), 9 deletions(-) rename examples/example_glut_opengl2/{example_freeglut_opengl2.vcxproj => example_glut_opengl2.vcxproj} (100%) rename examples/example_glut_opengl2/{example_freeglut_opengl2.vcxproj.filters => example_glut_opengl2.vcxproj.filters} (100%) diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index b4f7a9c2e..316e69f37 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -49,7 +49,9 @@ Other Changes: - Examples: OpenGL3: Minor tweaks + not calling glBindBuffer more than necessary in the render loop. - Examples: Vulkan: Added missing support for 32-bit indices (#define ImDrawIdx unsigned int). - Examples: DirectX9: Fixed erroneous assert in ImGui_ImplDX9_InvalidateDeviceObjects(). (#2454) -- Examples: FreeGLUT: Made io.DeltaTime always > 0. (#2430) +- Examples: GLUT: Fixed existing FreeGLUT example to work with regular GLUT. (#2465) [@andrewwillmott] +- Examples: GLUT: Renamed imgui_impl_freeglut.cpp/.h to imgui_impl_glut.cpp/.h. (#2465) [@andrewwillmott] +- Examples: GLUT: Made io.DeltaTime always > 0. (#2430) ----------------------------------------------------------------------- diff --git a/examples/README.txt b/examples/README.txt index 2876f7ee0..039747454 100644 --- a/examples/README.txt +++ b/examples/README.txt @@ -104,7 +104,7 @@ List of Platforms Bindings in this repository: imgui_impl_osx.mm ; macOS native API imgui_impl_sdl.cpp ; SDL2 (Windows, macOS, Linux, iOS, Android) https://www.libsdl.org imgui_impl_win32.cpp ; Win32 native API (Windows) - imgui_impl_glut.cpp ; GLUT (if you really miss the 90's) + imgui_impl_glut.cpp ; GLUT/FreeGLUT (not recommended unless really miss the 90's) List of Renderer Bindings in this repository: @@ -224,7 +224,7 @@ example_allegro5/ = main.cpp + imgui_impl_allegro5.cpp example_glut_opengl2/ - GLUT (E.g., FreeGLUT on Linux/Windows, GLUT framework on OSX) + OpenGL2. + GLUT (e.g., FreeGLUT on Linux/Windows, GLUT framework on OSX) + OpenGL2. = main.cpp + imgui_impl_glut.cpp + imgui_impl_opengl2.cpp example_marmalade/ diff --git a/examples/example_glut_opengl2/example_freeglut_opengl2.vcxproj b/examples/example_glut_opengl2/example_glut_opengl2.vcxproj similarity index 100% rename from examples/example_glut_opengl2/example_freeglut_opengl2.vcxproj rename to examples/example_glut_opengl2/example_glut_opengl2.vcxproj diff --git a/examples/example_glut_opengl2/example_freeglut_opengl2.vcxproj.filters b/examples/example_glut_opengl2/example_glut_opengl2.vcxproj.filters similarity index 100% rename from examples/example_glut_opengl2/example_freeglut_opengl2.vcxproj.filters rename to examples/example_glut_opengl2/example_glut_opengl2.vcxproj.filters diff --git a/examples/example_glut_opengl2/main.cpp b/examples/example_glut_opengl2/main.cpp index 4a4a03ad5..1089baee4 100644 --- a/examples/example_glut_opengl2/main.cpp +++ b/examples/example_glut_opengl2/main.cpp @@ -1,7 +1,7 @@ -// dear imgui: standalone example application for GLUT + OpenGL2, using legacy fixed pipeline +// dear imgui: standalone example application for GLUT/FreeGLUT + OpenGL2, using legacy fixed pipeline // If you are new to dear imgui, see examples/README.txt and documentation at the top of imgui.cpp. -// !!! GLUT IS OBSOLETE SOFTWARE. Using GLUT is not recommended unless you really miss the 90's. !!! +// !!! GLUT/FreeGLUT IS OBSOLETE SOFTWARE. Using GLUT is not recommended unless you really miss the 90's. !!! // !!! If someone or something is teaching you GLUT in 2019, you are being abused. Please show some resistance. !!! #include "imgui.h" diff --git a/examples/imgui_impl_glut.cpp b/examples/imgui_impl_glut.cpp index 60333caf4..d8bd7498b 100644 --- a/examples/imgui_impl_glut.cpp +++ b/examples/imgui_impl_glut.cpp @@ -1,7 +1,7 @@ -// dear imgui: Platform Binding for GLUT +// dear imgui: Platform Binding for GLUT/FreeGLUT // This needs to be used along with a Renderer (e.g. OpenGL2) -// !!! GLUT IS OBSOLETE SOFTWARE. Using GLUT is not recommended unless you really miss the 90's. !!! +// !!! GLUT/FreeGLUT IS OBSOLETE SOFTWARE. Using GLUT is not recommended unless you really miss the 90's. !!! // !!! If someone or something is teaching you GLUT in 2019, you are being abused. Please show some resistance. !!! // Issues: @@ -15,6 +15,7 @@ // CHANGELOG // (minor and older changes stripped away, please see git history for details) +// 2019-04-03: Misc: Renamed imgui_impl_freeglut.cpp/.h to imgui_impl_glut.cpp/.h. // 2019-03-25: Misc: Made io.DeltaTime always above zero. // 2018-11-30: Misc: Setting up io.BackendPlatformName so it can be displayed in the About Window. // 2018-03-22: Added GLUT Platform binding. diff --git a/examples/imgui_impl_glut.h b/examples/imgui_impl_glut.h index 59fe0d51f..8fde9bab8 100644 --- a/examples/imgui_impl_glut.h +++ b/examples/imgui_impl_glut.h @@ -1,7 +1,7 @@ -// dear imgui: Platform Binding for GLUT +// dear imgui: Platform Binding for GLUT/FreeGLUT // This needs to be used along with a Renderer (e.g. OpenGL2) -// !!! GLUT IS OBSOLETE SOFTWARE. Using GLUT is not recommended unless you really miss the 90's. !!! +// !!! GLUT/FreeGLUT IS OBSOLETE SOFTWARE. Using GLUT is not recommended unless you really miss the 90's. !!! // !!! If someone or something is teaching you GLUT in 2019, you are being abused. Please show some resistance. !!! // Issues: