From fdc2324d9ab2389bdff78a9b6efcea1a6da8ed69 Mon Sep 17 00:00:00 2001 From: ocornut Date: Thu, 11 Mar 2021 16:21:46 +0100 Subject: [PATCH] Moved 'misc/natvis/imgui.natvis' to 'misc/debuggers/imgui.natvis' --- docs/CHANGELOG.txt | 1 + .../example_allegro5/example_allegro5.vcxproj | 2 +- .../example_allegro5.vcxproj.filters | 2 +- .../example_glfw_opengl2.vcxproj | 2 +- .../example_glfw_opengl2.vcxproj.filters | 2 +- .../example_glfw_opengl3.vcxproj | 2 +- .../example_glfw_opengl3.vcxproj.filters | 2 +- .../example_glfw_vulkan.vcxproj | 2 +- .../example_glfw_vulkan.vcxproj.filters | 2 +- .../example_glut_opengl2.vcxproj | 2 +- .../example_glut_opengl2.vcxproj.filters | 2 +- .../example_sdl_directx11.vcxproj | 2 +- .../example_sdl_directx11.vcxproj.filters | 2 +- .../example_sdl_opengl2.vcxproj | 2 +- .../example_sdl_opengl2.vcxproj.filters | 2 +- .../example_sdl_opengl3.vcxproj | 2 +- .../example_sdl_opengl3.vcxproj.filters | 2 +- .../example_sdl_vulkan.vcxproj | 2 +- .../example_sdl_vulkan.vcxproj.filters | 4 ++-- .../example_win32_directx10.vcxproj | 2 +- .../example_win32_directx10.vcxproj.filters | 2 +- .../example_win32_directx11.vcxproj | 2 +- .../example_win32_directx11.vcxproj.filters | 2 +- .../example_win32_directx9.vcxproj | 2 +- .../example_win32_directx9.vcxproj.filters | 2 +- misc/README.txt | 9 ++++----- misc/debuggers/README.txt | 7 +++++++ misc/{natvis => debuggers}/imgui.natvis | 19 +++++++++++++++---- misc/natvis/README.txt | 4 ---- 29 files changed, 52 insertions(+), 38 deletions(-) create mode 100644 misc/debuggers/README.txt rename misc/{natvis => debuggers}/imgui.natvis (71%) delete mode 100644 misc/natvis/README.txt diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index 8f2b1871..edb56de8 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -62,6 +62,7 @@ Breaking Changes: This is technically the only real breaking change which we can't solve automatically. - ImDrawList: clarified that PathArcTo()/PathArcToFast() won't render with radius < 0.0f. Previously it sorts of accidentally worked but would lead to counter-clockwise paths which and have an effect on anti-aliasing. +- Moved 'misc/natvis/imgui.natvis' to 'misc/debuggers/imgui.natvis' as we will provide scripts for other debuggers. - Style: renamed rarely used style.CircleSegmentMaxError (old default = 1.60f) to style.CircleTessellationMaxError (new default = 0.30f) as its meaning changed. (#3808) [@thedmd] - Win32+MinGW: Re-enabled IME functions by default even under MinGW. In July 2016, issue #738 had me incorrectly diff --git a/examples/example_allegro5/example_allegro5.vcxproj b/examples/example_allegro5/example_allegro5.vcxproj index c6c524aa..ceaa05f1 100644 --- a/examples/example_allegro5/example_allegro5.vcxproj +++ b/examples/example_allegro5/example_allegro5.vcxproj @@ -171,7 +171,7 @@ - + diff --git a/examples/example_allegro5/example_allegro5.vcxproj.filters b/examples/example_allegro5/example_allegro5.vcxproj.filters index 00873a22..7fea78b3 100644 --- a/examples/example_allegro5/example_allegro5.vcxproj.filters +++ b/examples/example_allegro5/example_allegro5.vcxproj.filters @@ -51,7 +51,7 @@ - + sources diff --git a/examples/example_glfw_opengl2/example_glfw_opengl2.vcxproj b/examples/example_glfw_opengl2/example_glfw_opengl2.vcxproj index 2322ce25..1e58b36a 100644 --- a/examples/example_glfw_opengl2/example_glfw_opengl2.vcxproj +++ b/examples/example_glfw_opengl2/example_glfw_opengl2.vcxproj @@ -172,7 +172,7 @@ - + diff --git a/examples/example_glfw_opengl2/example_glfw_opengl2.vcxproj.filters b/examples/example_glfw_opengl2/example_glfw_opengl2.vcxproj.filters index 8327557c..69b285d1 100644 --- a/examples/example_glfw_opengl2/example_glfw_opengl2.vcxproj.filters +++ b/examples/example_glfw_opengl2/example_glfw_opengl2.vcxproj.filters @@ -54,7 +54,7 @@ - + sources diff --git a/examples/example_glfw_opengl3/example_glfw_opengl3.vcxproj b/examples/example_glfw_opengl3/example_glfw_opengl3.vcxproj index 61184d87..002e97d3 100644 --- a/examples/example_glfw_opengl3/example_glfw_opengl3.vcxproj +++ b/examples/example_glfw_opengl3/example_glfw_opengl3.vcxproj @@ -175,7 +175,7 @@ - + diff --git a/examples/example_glfw_opengl3/example_glfw_opengl3.vcxproj.filters b/examples/example_glfw_opengl3/example_glfw_opengl3.vcxproj.filters index 6e3859c1..586ad0af 100644 --- a/examples/example_glfw_opengl3/example_glfw_opengl3.vcxproj.filters +++ b/examples/example_glfw_opengl3/example_glfw_opengl3.vcxproj.filters @@ -66,7 +66,7 @@ - + sources diff --git a/examples/example_glfw_vulkan/example_glfw_vulkan.vcxproj b/examples/example_glfw_vulkan/example_glfw_vulkan.vcxproj index 1667b5ab..8e3349ad 100644 --- a/examples/example_glfw_vulkan/example_glfw_vulkan.vcxproj +++ b/examples/example_glfw_vulkan/example_glfw_vulkan.vcxproj @@ -172,7 +172,7 @@ - + diff --git a/examples/example_glfw_vulkan/example_glfw_vulkan.vcxproj.filters b/examples/example_glfw_vulkan/example_glfw_vulkan.vcxproj.filters index 943eb3dd..adc3365c 100644 --- a/examples/example_glfw_vulkan/example_glfw_vulkan.vcxproj.filters +++ b/examples/example_glfw_vulkan/example_glfw_vulkan.vcxproj.filters @@ -54,7 +54,7 @@ - + sources diff --git a/examples/example_glut_opengl2/example_glut_opengl2.vcxproj b/examples/example_glut_opengl2/example_glut_opengl2.vcxproj index f14ea156..4f0a0206 100644 --- a/examples/example_glut_opengl2/example_glut_opengl2.vcxproj +++ b/examples/example_glut_opengl2/example_glut_opengl2.vcxproj @@ -172,7 +172,7 @@ - + diff --git a/examples/example_glut_opengl2/example_glut_opengl2.vcxproj.filters b/examples/example_glut_opengl2/example_glut_opengl2.vcxproj.filters index 69882910..3c017ba9 100644 --- a/examples/example_glut_opengl2/example_glut_opengl2.vcxproj.filters +++ b/examples/example_glut_opengl2/example_glut_opengl2.vcxproj.filters @@ -54,7 +54,7 @@ - + sources diff --git a/examples/example_sdl_directx11/example_sdl_directx11.vcxproj b/examples/example_sdl_directx11/example_sdl_directx11.vcxproj index 99dd54af..56782ef1 100644 --- a/examples/example_sdl_directx11/example_sdl_directx11.vcxproj +++ b/examples/example_sdl_directx11/example_sdl_directx11.vcxproj @@ -173,7 +173,7 @@ - + diff --git a/examples/example_sdl_directx11/example_sdl_directx11.vcxproj.filters b/examples/example_sdl_directx11/example_sdl_directx11.vcxproj.filters index 8ebfd6d1..15fc8533 100644 --- a/examples/example_sdl_directx11/example_sdl_directx11.vcxproj.filters +++ b/examples/example_sdl_directx11/example_sdl_directx11.vcxproj.filters @@ -53,7 +53,7 @@ - + sources diff --git a/examples/example_sdl_opengl2/example_sdl_opengl2.vcxproj b/examples/example_sdl_opengl2/example_sdl_opengl2.vcxproj index 6b9e642d..c4b9affb 100644 --- a/examples/example_sdl_opengl2/example_sdl_opengl2.vcxproj +++ b/examples/example_sdl_opengl2/example_sdl_opengl2.vcxproj @@ -172,7 +172,7 @@ - + diff --git a/examples/example_sdl_opengl2/example_sdl_opengl2.vcxproj.filters b/examples/example_sdl_opengl2/example_sdl_opengl2.vcxproj.filters index 643b0ed7..2253b865 100644 --- a/examples/example_sdl_opengl2/example_sdl_opengl2.vcxproj.filters +++ b/examples/example_sdl_opengl2/example_sdl_opengl2.vcxproj.filters @@ -54,7 +54,7 @@ - + sources diff --git a/examples/example_sdl_opengl3/example_sdl_opengl3.vcxproj b/examples/example_sdl_opengl3/example_sdl_opengl3.vcxproj index 7ef1a792..2289a13d 100644 --- a/examples/example_sdl_opengl3/example_sdl_opengl3.vcxproj +++ b/examples/example_sdl_opengl3/example_sdl_opengl3.vcxproj @@ -175,7 +175,7 @@ - + diff --git a/examples/example_sdl_opengl3/example_sdl_opengl3.vcxproj.filters b/examples/example_sdl_opengl3/example_sdl_opengl3.vcxproj.filters index f6e323de..de967f4e 100644 --- a/examples/example_sdl_opengl3/example_sdl_opengl3.vcxproj.filters +++ b/examples/example_sdl_opengl3/example_sdl_opengl3.vcxproj.filters @@ -66,7 +66,7 @@ - + sources diff --git a/examples/example_sdl_vulkan/example_sdl_vulkan.vcxproj b/examples/example_sdl_vulkan/example_sdl_vulkan.vcxproj index 8567b790..e72a9a9a 100644 --- a/examples/example_sdl_vulkan/example_sdl_vulkan.vcxproj +++ b/examples/example_sdl_vulkan/example_sdl_vulkan.vcxproj @@ -172,7 +172,7 @@ - + diff --git a/examples/example_sdl_vulkan/example_sdl_vulkan.vcxproj.filters b/examples/example_sdl_vulkan/example_sdl_vulkan.vcxproj.filters index 8a6b48e3..9a04f95b 100644 --- a/examples/example_sdl_vulkan/example_sdl_vulkan.vcxproj.filters +++ b/examples/example_sdl_vulkan/example_sdl_vulkan.vcxproj.filters @@ -51,8 +51,8 @@ - + sources - \ No newline at end of file + diff --git a/examples/example_win32_directx10/example_win32_directx10.vcxproj b/examples/example_win32_directx10/example_win32_directx10.vcxproj index 16e24a37..4299b217 100644 --- a/examples/example_win32_directx10/example_win32_directx10.vcxproj +++ b/examples/example_win32_directx10/example_win32_directx10.vcxproj @@ -162,7 +162,7 @@ - + diff --git a/examples/example_win32_directx10/example_win32_directx10.vcxproj.filters b/examples/example_win32_directx10/example_win32_directx10.vcxproj.filters index f76be9d0..11ad8f90 100644 --- a/examples/example_win32_directx10/example_win32_directx10.vcxproj.filters +++ b/examples/example_win32_directx10/example_win32_directx10.vcxproj.filters @@ -53,7 +53,7 @@ - + sources diff --git a/examples/example_win32_directx11/example_win32_directx11.vcxproj b/examples/example_win32_directx11/example_win32_directx11.vcxproj index 4982050f..1861ddc9 100644 --- a/examples/example_win32_directx11/example_win32_directx11.vcxproj +++ b/examples/example_win32_directx11/example_win32_directx11.vcxproj @@ -161,7 +161,7 @@ - + diff --git a/examples/example_win32_directx11/example_win32_directx11.vcxproj.filters b/examples/example_win32_directx11/example_win32_directx11.vcxproj.filters index 56defdde..02cf18ca 100644 --- a/examples/example_win32_directx11/example_win32_directx11.vcxproj.filters +++ b/examples/example_win32_directx11/example_win32_directx11.vcxproj.filters @@ -53,7 +53,7 @@ - + sources diff --git a/examples/example_win32_directx9/example_win32_directx9.vcxproj b/examples/example_win32_directx9/example_win32_directx9.vcxproj index 747dcebe..2c8977c4 100644 --- a/examples/example_win32_directx9/example_win32_directx9.vcxproj +++ b/examples/example_win32_directx9/example_win32_directx9.vcxproj @@ -162,7 +162,7 @@ - + diff --git a/examples/example_win32_directx9/example_win32_directx9.vcxproj.filters b/examples/example_win32_directx9/example_win32_directx9.vcxproj.filters index 5197644e..9493970b 100644 --- a/examples/example_win32_directx9/example_win32_directx9.vcxproj.filters +++ b/examples/example_win32_directx9/example_win32_directx9.vcxproj.filters @@ -54,7 +54,7 @@ - + sources diff --git a/misc/README.txt b/misc/README.txt index 86900089..b4ce89f0 100644 --- a/misc/README.txt +++ b/misc/README.txt @@ -3,6 +3,10 @@ misc/cpp/ InputText() wrappers for C++ standard library (STL) type: std::string. This is also an example of how you may wrap your own similar types. +misc/debuggers/ + Helper files for popular debuggers. + With the .natvis file, types like ImVector<> will be displayed nicely in Visual Studio debugger. + misc/fonts/ Fonts loading/merging instructions (e.g. How to handle glyph ranges, how to merge icons fonts). Command line tool "binary_to_compressed_c" to create compressed arrays to embed data in source code. @@ -12,11 +16,6 @@ misc/freetype/ Font atlas builder/rasterizer using FreeType instead of stb_truetype. Benefit from better FreeType rasterization, in particular for small fonts. -misc/natvis/ - Natvis file to describe dear imgui types in the Visual Studio debugger. - With this, types like ImVector<> will be displayed nicely in the debugger. - You can include this file a Visual Studio project file, or install it in Visual Studio folder. - misc/single_file/ Single-file header stub. We use this to validate compiling all *.cpp files in a same compilation unit. diff --git a/misc/debuggers/README.txt b/misc/debuggers/README.txt new file mode 100644 index 00000000..87435db2 --- /dev/null +++ b/misc/debuggers/README.txt @@ -0,0 +1,7 @@ + +HELPER FILES FOR POPULAR DEBUGGERS + +imgui.natvis + Natvis file to describe dear imgui types in the Visual Studio debugger. + With this, types like ImVector<> will be displayed nicely in the debugger. + You can include this easily in your Visual Studio project files. diff --git a/misc/natvis/imgui.natvis b/misc/debuggers/imgui.natvis similarity index 71% rename from misc/natvis/imgui.natvis rename to misc/debuggers/imgui.natvis index 25d72fb6..1b95a04f 100644 --- a/misc/natvis/imgui.natvis +++ b/misc/debuggers/imgui.natvis @@ -1,6 +1,17 @@ - + @@ -13,7 +24,7 @@ - + {{Size={DataEnd-Data} }} @@ -45,5 +56,5 @@ {{Name {Name,s} Active {(Active||WasActive)?1:0,d} Child {(Flags & 0x01000000)?1:0,d} Popup {(Flags & 0x04000000)?1:0,d} Hidden {(Hidden)?1:0,d}} - - \ No newline at end of file + + diff --git a/misc/natvis/README.txt b/misc/natvis/README.txt deleted file mode 100644 index 1219db45..00000000 --- a/misc/natvis/README.txt +++ /dev/null @@ -1,4 +0,0 @@ - -Natvis file to describe dear imgui types in the Visual Studio debugger. -With this, types like ImVector<> will be displayed nicely in the debugger. -You can include this file a Visual Studio project file, or install it in Visual Studio folder.