From d9b2fb7338a1b67cdbad15b6c9fa60a2bd29cdf4 Mon Sep 17 00:00:00 2001 From: ocornut Date: Mon, 12 Oct 2020 15:22:06 +0200 Subject: [PATCH] Moving backends code from examples/ to backends/ (step 1: moving source files) --- {examples => backends}/imgui_impl_allegro5.cpp | 0 {examples => backends}/imgui_impl_allegro5.h | 0 {examples => backends}/imgui_impl_dx10.cpp | 0 {examples => backends}/imgui_impl_dx10.h | 0 {examples => backends}/imgui_impl_dx11.cpp | 0 {examples => backends}/imgui_impl_dx11.h | 0 {examples => backends}/imgui_impl_dx12.cpp | 0 {examples => backends}/imgui_impl_dx12.h | 0 {examples => backends}/imgui_impl_dx9.cpp | 0 {examples => backends}/imgui_impl_dx9.h | 0 {examples => backends}/imgui_impl_glfw.cpp | 0 {examples => backends}/imgui_impl_glfw.h | 0 {examples => backends}/imgui_impl_glut.cpp | 0 {examples => backends}/imgui_impl_glut.h | 0 {examples => backends}/imgui_impl_marmalade.cpp | 0 {examples => backends}/imgui_impl_marmalade.h | 0 {examples => backends}/imgui_impl_metal.h | 0 {examples => backends}/imgui_impl_metal.mm | 0 {examples => backends}/imgui_impl_opengl2.cpp | 0 {examples => backends}/imgui_impl_opengl2.h | 0 {examples => backends}/imgui_impl_opengl3.cpp | 0 {examples => backends}/imgui_impl_opengl3.h | 0 {examples => backends}/imgui_impl_osx.h | 0 {examples => backends}/imgui_impl_osx.mm | 0 {examples => backends}/imgui_impl_sdl.cpp | 0 {examples => backends}/imgui_impl_sdl.h | 0 {examples => backends}/imgui_impl_vulkan.cpp | 0 {examples => backends}/imgui_impl_vulkan.h | 0 {examples => backends}/imgui_impl_win32.cpp | 0 {examples => backends}/imgui_impl_win32.h | 0 imgui.cpp | 6 +++--- imgui.h | 2 +- 32 files changed, 4 insertions(+), 4 deletions(-) rename {examples => backends}/imgui_impl_allegro5.cpp (100%) rename {examples => backends}/imgui_impl_allegro5.h (100%) rename {examples => backends}/imgui_impl_dx10.cpp (100%) rename {examples => backends}/imgui_impl_dx10.h (100%) rename {examples => backends}/imgui_impl_dx11.cpp (100%) rename {examples => backends}/imgui_impl_dx11.h (100%) rename {examples => backends}/imgui_impl_dx12.cpp (100%) rename {examples => backends}/imgui_impl_dx12.h (100%) rename {examples => backends}/imgui_impl_dx9.cpp (100%) rename {examples => backends}/imgui_impl_dx9.h (100%) rename {examples => backends}/imgui_impl_glfw.cpp (100%) rename {examples => backends}/imgui_impl_glfw.h (100%) rename {examples => backends}/imgui_impl_glut.cpp (100%) rename {examples => backends}/imgui_impl_glut.h (100%) rename {examples => backends}/imgui_impl_marmalade.cpp (100%) rename {examples => backends}/imgui_impl_marmalade.h (100%) rename {examples => backends}/imgui_impl_metal.h (100%) rename {examples => backends}/imgui_impl_metal.mm (100%) rename {examples => backends}/imgui_impl_opengl2.cpp (100%) rename {examples => backends}/imgui_impl_opengl2.h (100%) rename {examples => backends}/imgui_impl_opengl3.cpp (100%) rename {examples => backends}/imgui_impl_opengl3.h (100%) rename {examples => backends}/imgui_impl_osx.h (100%) rename {examples => backends}/imgui_impl_osx.mm (100%) rename {examples => backends}/imgui_impl_sdl.cpp (100%) rename {examples => backends}/imgui_impl_sdl.h (100%) rename {examples => backends}/imgui_impl_vulkan.cpp (100%) rename {examples => backends}/imgui_impl_vulkan.h (100%) rename {examples => backends}/imgui_impl_win32.cpp (100%) rename {examples => backends}/imgui_impl_win32.h (100%) diff --git a/examples/imgui_impl_allegro5.cpp b/backends/imgui_impl_allegro5.cpp similarity index 100% rename from examples/imgui_impl_allegro5.cpp rename to backends/imgui_impl_allegro5.cpp diff --git a/examples/imgui_impl_allegro5.h b/backends/imgui_impl_allegro5.h similarity index 100% rename from examples/imgui_impl_allegro5.h rename to backends/imgui_impl_allegro5.h diff --git a/examples/imgui_impl_dx10.cpp b/backends/imgui_impl_dx10.cpp similarity index 100% rename from examples/imgui_impl_dx10.cpp rename to backends/imgui_impl_dx10.cpp diff --git a/examples/imgui_impl_dx10.h b/backends/imgui_impl_dx10.h similarity index 100% rename from examples/imgui_impl_dx10.h rename to backends/imgui_impl_dx10.h diff --git a/examples/imgui_impl_dx11.cpp b/backends/imgui_impl_dx11.cpp similarity index 100% rename from examples/imgui_impl_dx11.cpp rename to backends/imgui_impl_dx11.cpp diff --git a/examples/imgui_impl_dx11.h b/backends/imgui_impl_dx11.h similarity index 100% rename from examples/imgui_impl_dx11.h rename to backends/imgui_impl_dx11.h diff --git a/examples/imgui_impl_dx12.cpp b/backends/imgui_impl_dx12.cpp similarity index 100% rename from examples/imgui_impl_dx12.cpp rename to backends/imgui_impl_dx12.cpp diff --git a/examples/imgui_impl_dx12.h b/backends/imgui_impl_dx12.h similarity index 100% rename from examples/imgui_impl_dx12.h rename to backends/imgui_impl_dx12.h diff --git a/examples/imgui_impl_dx9.cpp b/backends/imgui_impl_dx9.cpp similarity index 100% rename from examples/imgui_impl_dx9.cpp rename to backends/imgui_impl_dx9.cpp diff --git a/examples/imgui_impl_dx9.h b/backends/imgui_impl_dx9.h similarity index 100% rename from examples/imgui_impl_dx9.h rename to backends/imgui_impl_dx9.h diff --git a/examples/imgui_impl_glfw.cpp b/backends/imgui_impl_glfw.cpp similarity index 100% rename from examples/imgui_impl_glfw.cpp rename to backends/imgui_impl_glfw.cpp diff --git a/examples/imgui_impl_glfw.h b/backends/imgui_impl_glfw.h similarity index 100% rename from examples/imgui_impl_glfw.h rename to backends/imgui_impl_glfw.h diff --git a/examples/imgui_impl_glut.cpp b/backends/imgui_impl_glut.cpp similarity index 100% rename from examples/imgui_impl_glut.cpp rename to backends/imgui_impl_glut.cpp diff --git a/examples/imgui_impl_glut.h b/backends/imgui_impl_glut.h similarity index 100% rename from examples/imgui_impl_glut.h rename to backends/imgui_impl_glut.h diff --git a/examples/imgui_impl_marmalade.cpp b/backends/imgui_impl_marmalade.cpp similarity index 100% rename from examples/imgui_impl_marmalade.cpp rename to backends/imgui_impl_marmalade.cpp diff --git a/examples/imgui_impl_marmalade.h b/backends/imgui_impl_marmalade.h similarity index 100% rename from examples/imgui_impl_marmalade.h rename to backends/imgui_impl_marmalade.h diff --git a/examples/imgui_impl_metal.h b/backends/imgui_impl_metal.h similarity index 100% rename from examples/imgui_impl_metal.h rename to backends/imgui_impl_metal.h diff --git a/examples/imgui_impl_metal.mm b/backends/imgui_impl_metal.mm similarity index 100% rename from examples/imgui_impl_metal.mm rename to backends/imgui_impl_metal.mm diff --git a/examples/imgui_impl_opengl2.cpp b/backends/imgui_impl_opengl2.cpp similarity index 100% rename from examples/imgui_impl_opengl2.cpp rename to backends/imgui_impl_opengl2.cpp diff --git a/examples/imgui_impl_opengl2.h b/backends/imgui_impl_opengl2.h similarity index 100% rename from examples/imgui_impl_opengl2.h rename to backends/imgui_impl_opengl2.h diff --git a/examples/imgui_impl_opengl3.cpp b/backends/imgui_impl_opengl3.cpp similarity index 100% rename from examples/imgui_impl_opengl3.cpp rename to backends/imgui_impl_opengl3.cpp diff --git a/examples/imgui_impl_opengl3.h b/backends/imgui_impl_opengl3.h similarity index 100% rename from examples/imgui_impl_opengl3.h rename to backends/imgui_impl_opengl3.h diff --git a/examples/imgui_impl_osx.h b/backends/imgui_impl_osx.h similarity index 100% rename from examples/imgui_impl_osx.h rename to backends/imgui_impl_osx.h diff --git a/examples/imgui_impl_osx.mm b/backends/imgui_impl_osx.mm similarity index 100% rename from examples/imgui_impl_osx.mm rename to backends/imgui_impl_osx.mm diff --git a/examples/imgui_impl_sdl.cpp b/backends/imgui_impl_sdl.cpp similarity index 100% rename from examples/imgui_impl_sdl.cpp rename to backends/imgui_impl_sdl.cpp diff --git a/examples/imgui_impl_sdl.h b/backends/imgui_impl_sdl.h similarity index 100% rename from examples/imgui_impl_sdl.h rename to backends/imgui_impl_sdl.h diff --git a/examples/imgui_impl_vulkan.cpp b/backends/imgui_impl_vulkan.cpp similarity index 100% rename from examples/imgui_impl_vulkan.cpp rename to backends/imgui_impl_vulkan.cpp diff --git a/examples/imgui_impl_vulkan.h b/backends/imgui_impl_vulkan.h similarity index 100% rename from examples/imgui_impl_vulkan.h rename to backends/imgui_impl_vulkan.h diff --git a/examples/imgui_impl_win32.cpp b/backends/imgui_impl_win32.cpp similarity index 100% rename from examples/imgui_impl_win32.cpp rename to backends/imgui_impl_win32.cpp diff --git a/examples/imgui_impl_win32.h b/backends/imgui_impl_win32.h similarity index 100% rename from examples/imgui_impl_win32.h rename to backends/imgui_impl_win32.h diff --git a/imgui.cpp b/imgui.cpp index 265efd90d..c24e8e4ea 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -181,7 +181,7 @@ CODE HOW A SIMPLE APPLICATION MAY LOOK LIKE -------------------------------------- - EXHIBIT 1: USING THE EXAMPLE BACKENDS (= imgui_impl_XXX.cpp files from the examples/ folder). + EXHIBIT 1: USING THE EXAMPLE BACKENDS (= imgui_impl_XXX.cpp files from the backends/ folder). The sub-folders in examples/ contains examples applications following this structure. // Application init: create a dear imgui context, setup some options, load fonts @@ -462,7 +462,7 @@ CODE - 2018/08/01 (1.63) - renamed io.OptCursorBlink to io.ConfigCursorBlink [-> io.ConfigInputTextCursorBlink in 1.65], io.OptMacOSXBehaviors to ConfigMacOSXBehaviors for consistency. - 2018/07/22 (1.63) - changed ImGui::GetTime() return value from float to double to avoid accumulating floating point imprecisions over time. - 2018/07/08 (1.63) - style: renamed ImGuiCol_ModalWindowDarkening to ImGuiCol_ModalWindowDimBg for consistency with other features. Kept redirection enum (will obsolete). - - 2018/06/08 (1.62) - examples: the imgui_impl_xxx files have been split to separate platform (Win32, GLFW, SDL2, etc.) from renderer (DX11, OpenGL, Vulkan, etc.). + - 2018/06/08 (1.62) - examples: the imgui_impl_XXX files have been split to separate platform (Win32, GLFW, SDL2, etc.) from renderer (DX11, OpenGL, Vulkan, etc.). old backends will still work as is, however prefer using the separated backends as they will be updated to support multi-viewports. when adopting new backends follow the main.cpp code of your preferred examples/ folder to know which functions to call. in particular, note that old backends called ImGui::NewFrame() at the end of their ImGui_ImplXXXX_NewFrame() function. @@ -566,7 +566,7 @@ CODE you need to render your textured triangles with bilinear filtering to benefit from sub-pixel positioning of text. - 2015/07/08 (1.43) - switched rendering data to use indexed rendering. this is saving a fair amount of CPU/GPU and enables us to get anti-aliasing for a marginal cost. this necessary change will break your rendering function! the fix should be very easy. sorry for that :( - - if you are using a vanilla copy of one of the imgui_impl_XXXX.cpp provided in the example, you just need to update your copy and you can ignore the rest. + - if you are using a vanilla copy of one of the imgui_impl_XXX.cpp provided in the example, you just need to update your copy and you can ignore the rest. - the signature of the io.RenderDrawListsFn handler has changed! old: ImGui_XXXX_RenderDrawLists(ImDrawList** const cmd_lists, int cmd_lists_count) new: ImGui_XXXX_RenderDrawLists(ImDrawData* draw_data). diff --git a/imgui.h b/imgui.h index 9d16a39d4..01b01f2bc 100644 --- a/imgui.h +++ b/imgui.h @@ -60,7 +60,7 @@ Index of this file: // Version // (Integer encoded as XYYZZ for use in #if preprocessor conditionals. Work in progress versions typically starts at XYY99 then bounce up to XYY00, XYY01 etc. when release tagging happens) #define IMGUI_VERSION "1.80 WIP" -#define IMGUI_VERSION_NUM 17904 +#define IMGUI_VERSION_NUM 17905 #define IMGUI_CHECKVERSION() ImGui::DebugCheckVersionAndDataLayout(IMGUI_VERSION, sizeof(ImGuiIO), sizeof(ImGuiStyle), sizeof(ImVec2), sizeof(ImVec4), sizeof(ImDrawVert), sizeof(ImDrawIdx)) // Define attributes of all API symbols declarations (e.g. for DLL under Windows)