diff --git a/3rdparty/ocornut-imgui/imconfig.h b/3rdparty/dear-imgui/imconfig.h similarity index 100% rename from 3rdparty/ocornut-imgui/imconfig.h rename to 3rdparty/dear-imgui/imconfig.h diff --git a/3rdparty/ocornut-imgui/imgui.cpp b/3rdparty/dear-imgui/imgui.cpp similarity index 100% rename from 3rdparty/ocornut-imgui/imgui.cpp rename to 3rdparty/dear-imgui/imgui.cpp diff --git a/3rdparty/ocornut-imgui/imgui.h b/3rdparty/dear-imgui/imgui.h similarity index 100% rename from 3rdparty/ocornut-imgui/imgui.h rename to 3rdparty/dear-imgui/imgui.h diff --git a/3rdparty/ocornut-imgui/imgui_demo.cpp b/3rdparty/dear-imgui/imgui_demo.cpp similarity index 100% rename from 3rdparty/ocornut-imgui/imgui_demo.cpp rename to 3rdparty/dear-imgui/imgui_demo.cpp diff --git a/3rdparty/ocornut-imgui/imgui_draw.cpp b/3rdparty/dear-imgui/imgui_draw.cpp similarity index 100% rename from 3rdparty/ocornut-imgui/imgui_draw.cpp rename to 3rdparty/dear-imgui/imgui_draw.cpp diff --git a/3rdparty/ocornut-imgui/imgui_internal.h b/3rdparty/dear-imgui/imgui_internal.h similarity index 100% rename from 3rdparty/ocornut-imgui/imgui_internal.h rename to 3rdparty/dear-imgui/imgui_internal.h diff --git a/3rdparty/ocornut-imgui/imgui_user.h b/3rdparty/dear-imgui/imgui_user.h similarity index 100% rename from 3rdparty/ocornut-imgui/imgui_user.h rename to 3rdparty/dear-imgui/imgui_user.h diff --git a/3rdparty/ocornut-imgui/imgui_user.inl b/3rdparty/dear-imgui/imgui_user.inl similarity index 100% rename from 3rdparty/ocornut-imgui/imgui_user.inl rename to 3rdparty/dear-imgui/imgui_user.inl diff --git a/3rdparty/ocornut-imgui/stb_rect_pack.h b/3rdparty/dear-imgui/stb_rect_pack.h similarity index 100% rename from 3rdparty/ocornut-imgui/stb_rect_pack.h rename to 3rdparty/dear-imgui/stb_rect_pack.h diff --git a/3rdparty/ocornut-imgui/stb_textedit.h b/3rdparty/dear-imgui/stb_textedit.h similarity index 100% rename from 3rdparty/ocornut-imgui/stb_textedit.h rename to 3rdparty/dear-imgui/stb_textedit.h diff --git a/3rdparty/ocornut-imgui/stb_truetype.h b/3rdparty/dear-imgui/stb_truetype.h similarity index 100% rename from 3rdparty/ocornut-imgui/stb_truetype.h rename to 3rdparty/dear-imgui/stb_truetype.h diff --git a/3rdparty/ocornut-imgui/widgets/color_picker.h b/3rdparty/dear-imgui/widgets/color_picker.h similarity index 100% rename from 3rdparty/ocornut-imgui/widgets/color_picker.h rename to 3rdparty/dear-imgui/widgets/color_picker.h diff --git a/3rdparty/ocornut-imgui/widgets/color_picker.inl b/3rdparty/dear-imgui/widgets/color_picker.inl similarity index 100% rename from 3rdparty/ocornut-imgui/widgets/color_picker.inl rename to 3rdparty/dear-imgui/widgets/color_picker.inl diff --git a/3rdparty/ocornut-imgui/widgets/color_wheel.h b/3rdparty/dear-imgui/widgets/color_wheel.h similarity index 100% rename from 3rdparty/ocornut-imgui/widgets/color_wheel.h rename to 3rdparty/dear-imgui/widgets/color_wheel.h diff --git a/3rdparty/ocornut-imgui/widgets/color_wheel.inl b/3rdparty/dear-imgui/widgets/color_wheel.inl similarity index 100% rename from 3rdparty/ocornut-imgui/widgets/color_wheel.inl rename to 3rdparty/dear-imgui/widgets/color_wheel.inl diff --git a/3rdparty/ocornut-imgui/widgets/dock.h b/3rdparty/dear-imgui/widgets/dock.h similarity index 100% rename from 3rdparty/ocornut-imgui/widgets/dock.h rename to 3rdparty/dear-imgui/widgets/dock.h diff --git a/3rdparty/ocornut-imgui/widgets/dock.inl b/3rdparty/dear-imgui/widgets/dock.inl similarity index 100% rename from 3rdparty/ocornut-imgui/widgets/dock.inl rename to 3rdparty/dear-imgui/widgets/dock.inl diff --git a/3rdparty/ocornut-imgui/widgets/file_list.h b/3rdparty/dear-imgui/widgets/file_list.h similarity index 100% rename from 3rdparty/ocornut-imgui/widgets/file_list.h rename to 3rdparty/dear-imgui/widgets/file_list.h diff --git a/3rdparty/ocornut-imgui/widgets/file_list.inl b/3rdparty/dear-imgui/widgets/file_list.inl similarity index 100% rename from 3rdparty/ocornut-imgui/widgets/file_list.inl rename to 3rdparty/dear-imgui/widgets/file_list.inl diff --git a/3rdparty/ocornut-imgui/widgets/gizmo.h b/3rdparty/dear-imgui/widgets/gizmo.h similarity index 100% rename from 3rdparty/ocornut-imgui/widgets/gizmo.h rename to 3rdparty/dear-imgui/widgets/gizmo.h diff --git a/3rdparty/ocornut-imgui/widgets/gizmo.inl b/3rdparty/dear-imgui/widgets/gizmo.inl similarity index 100% rename from 3rdparty/ocornut-imgui/widgets/gizmo.inl rename to 3rdparty/dear-imgui/widgets/gizmo.inl diff --git a/3rdparty/ocornut-imgui/widgets/memory_editor.h b/3rdparty/dear-imgui/widgets/memory_editor.h similarity index 100% rename from 3rdparty/ocornut-imgui/widgets/memory_editor.h rename to 3rdparty/dear-imgui/widgets/memory_editor.h diff --git a/3rdparty/ocornut-imgui/widgets/memory_editor.inl b/3rdparty/dear-imgui/widgets/memory_editor.inl similarity index 100% rename from 3rdparty/ocornut-imgui/widgets/memory_editor.inl rename to 3rdparty/dear-imgui/widgets/memory_editor.inl diff --git a/3rdparty/ocornut-imgui/widgets/range_slider.h b/3rdparty/dear-imgui/widgets/range_slider.h similarity index 100% rename from 3rdparty/ocornut-imgui/widgets/range_slider.h rename to 3rdparty/dear-imgui/widgets/range_slider.h diff --git a/3rdparty/ocornut-imgui/widgets/range_slider.inl b/3rdparty/dear-imgui/widgets/range_slider.inl similarity index 100% rename from 3rdparty/ocornut-imgui/widgets/range_slider.inl rename to 3rdparty/dear-imgui/widgets/range_slider.inl diff --git a/examples/common/imgui/imgui.cpp b/examples/common/imgui/imgui.cpp index 627ebd564..c5e3b5145 100644 --- a/examples/common/imgui/imgui.cpp +++ b/examples/common/imgui/imgui.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include "imgui.h" #include "../bgfx_utils.h" diff --git a/examples/common/imgui/imgui.h b/examples/common/imgui/imgui.h index 42dc27fa4..4f5496703 100644 --- a/examples/common/imgui/imgui.h +++ b/examples/common/imgui/imgui.h @@ -7,7 +7,7 @@ #define IMGUI_H_HEADER_GUARD #include -#include +#include #include #include diff --git a/scripts/example-common.lua b/scripts/example-common.lua index 7cb01f1da..976675ee7 100644 --- a/scripts/example-common.lua +++ b/scripts/example-common.lua @@ -30,8 +30,8 @@ project ("example-common") files { path.join(BGFX_DIR, "3rdparty/ib-compress/**.cpp"), path.join(BGFX_DIR, "3rdparty/ib-compress/**.h"), - path.join(BGFX_DIR, "3rdparty/ocornut-imgui/**.cpp"), - path.join(BGFX_DIR, "3rdparty/ocornut-imgui/**.h"), + path.join(BGFX_DIR, "3rdparty/dear-imgui/**.cpp"), + path.join(BGFX_DIR, "3rdparty/dear-imgui/**.h"), path.join(BGFX_DIR, "examples/common/**.cpp"), path.join(BGFX_DIR, "examples/common/**.cpp"), path.join(BGFX_DIR, "examples/common/**.h"),