Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036)

6 years ago · 01586d33f3
parent f2aa124eb8
commit 01586d33f3
29 changed files with 76 additions and 5 deletions
--- a/README.md
+++ b/README.md
@ -22,6 +22,7 @@ Dear ImGui is self-contained within a few files that you can easily copy and com
 - imgui.h
 - imgui_demo.cpp
 - imgui_draw.cpp
+- imgui_widgets.cpp
 - imgui_internal.h
 - imconfig.h (empty by default, user-editable)
 - stb_rect_pack.h
--- a/examples/example_allegro5/example_allegro5.vcxproj
+++ b/examples/example_allegro5/example_allegro5.vcxproj
@ -153,6 +153,7 @@
    <ClCompile Include="..\..\imgui.cpp" />
    <ClCompile Include="..\..\imgui_demo.cpp" />
    <ClCompile Include="..\..\imgui_draw.cpp" />
+    <ClCompile Include="..\..\imgui_widgets.cpp" />
    <ClCompile Include="..\imgui_impl_allegro5.cpp" />
    <ClCompile Include="imconfig_allegro5.h" />
    <ClCompile Include="main.cpp" />
--- a/examples/example_allegro5/example_allegro5.vcxproj.filters
+++ b/examples/example_allegro5/example_allegro5.vcxproj.filters
@ -28,6 +28,9 @@
    <ClCompile Include="imconfig_allegro5.h">
      <Filter>sources</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\imgui_widgets.cpp">
+      <Filter>imgui</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\..\imconfig.h">
--- a/examples/example_freeglut_opengl2/example_freeglut_opengl2.vcxproj
+++ b/examples/example_freeglut_opengl2/example_freeglut_opengl2.vcxproj
@ -153,6 +153,7 @@
    <ClCompile Include="..\..\imgui.cpp" />
    <ClCompile Include="..\..\imgui_demo.cpp" />
    <ClCompile Include="..\..\imgui_draw.cpp" />
+    <ClCompile Include="..\..\imgui_widgets.cpp" />
    <ClCompile Include="..\imgui_impl_freeglut.cpp" />
    <ClCompile Include="..\imgui_impl_opengl2.cpp" />
    <ClCompile Include="main.cpp" />
--- a/examples/example_freeglut_opengl2/example_freeglut_opengl2.vcxproj.filters
+++ b/examples/example_freeglut_opengl2/example_freeglut_opengl2.vcxproj.filters
@ -28,6 +28,9 @@
    <ClCompile Include="..\imgui_impl_opengl2.cpp">
      <Filter>sources</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\imgui_widgets.cpp">
+      <Filter>imgui</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\..\imconfig.h">
--- a/examples/example_glfw_opengl2/Makefile
+++ b/examples/example_glfw_opengl2/Makefile
@ -17,7 +17,7 @@
 EXE = example_glfw_opengl2
 SOURCES = main.cpp
 SOURCES += ../imgui_impl_glfw.cpp ../imgui_impl_opengl2.cpp
-SOURCES += ../../imgui.cpp ../../imgui_demo.cpp ../../imgui_draw.cpp
+SOURCES += ../../imgui.cpp ../../imgui_demo.cpp ../../imgui_draw.cpp ../../imgui_widgets.cpp
 OBJS = $(addsuffix .o, $(basename $(notdir $(SOURCES))))

 UNAME_S := $(shell uname -s)
--- a/examples/example_glfw_opengl2/example_glfw_opengl2.vcxproj
+++ b/examples/example_glfw_opengl2/example_glfw_opengl2.vcxproj
@ -153,6 +153,7 @@
    <ClCompile Include="..\..\imgui.cpp" />
    <ClCompile Include="..\..\imgui_demo.cpp" />
    <ClCompile Include="..\..\imgui_draw.cpp" />
+    <ClCompile Include="..\..\imgui_widgets.cpp" />
    <ClCompile Include="..\imgui_impl_glfw.cpp" />
    <ClCompile Include="..\imgui_impl_opengl2.cpp" />
    <ClCompile Include="main.cpp" />
--- a/examples/example_glfw_opengl2/example_glfw_opengl2.vcxproj.filters
+++ b/examples/example_glfw_opengl2/example_glfw_opengl2.vcxproj.filters
@ -28,6 +28,9 @@
    <ClCompile Include="..\imgui_impl_opengl2.cpp">
      <Filter>sources</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\imgui_widgets.cpp">
+      <Filter>imgui</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\..\imconfig.h">
--- a/examples/example_glfw_opengl3/Makefile
+++ b/examples/example_glfw_opengl3/Makefile
@ -17,7 +17,7 @@
 EXE = example_glfw_opengl3
 SOURCES = main.cpp
 SOURCES += ../imgui_impl_glfw.cpp ../imgui_impl_opengl3.cpp
-SOURCES += ../../imgui.cpp ../../imgui_demo.cpp ../../imgui_draw.cpp
+SOURCES += ../../imgui.cpp ../../imgui_demo.cpp ../../imgui_draw.cpp ../../imgui_widgets.cpp
 OBJS = $(addsuffix .o, $(basename $(notdir $(SOURCES))))
 UNAME_S := $(shell uname -s)

--- a/examples/example_glfw_opengl3/example_glfw_opengl3.vcxproj
+++ b/examples/example_glfw_opengl3/example_glfw_opengl3.vcxproj
@ -153,6 +153,7 @@
    <ClCompile Include="..\..\imgui.cpp" />
    <ClCompile Include="..\..\imgui_demo.cpp" />
    <ClCompile Include="..\..\imgui_draw.cpp" />
+    <ClCompile Include="..\..\imgui_widgets.cpp" />
    <ClCompile Include="..\imgui_impl_glfw.cpp" />
    <ClCompile Include="..\imgui_impl_opengl3.cpp" />
    <ClCompile Include="..\libs\gl3w\GL\gl3w.c" />
--- a/examples/example_glfw_opengl3/example_glfw_opengl3.vcxproj.filters
+++ b/examples/example_glfw_opengl3/example_glfw_opengl3.vcxproj.filters
@ -34,6 +34,9 @@
    <ClCompile Include="..\imgui_impl_opengl3.cpp">
      <Filter>sources</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\imgui_widgets.cpp">
+      <Filter>imgui</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\..\imconfig.h">
--- a/examples/example_marmalade/marmalade_example.mkb
+++ b/examples/example_marmalade/marmalade_example.mkb
@ -33,6 +33,7 @@ files
    ../../imgui.cpp
    ../../imgui_demo.cpp
    ../../imgui_draw.cpp
+    ../../imgui_widgets.cpp
    ../../imconfig.h
    ../../imgui.h
    ../../imgui_internal.h
--- a/examples/example_sdl_opengl2/Makefile
+++ b/examples/example_sdl_opengl2/Makefile
@ -16,7 +16,7 @@

 EXE = example_sdl_opengl2
 SOURCES = main.cpp ../imgui_impl_sdl.cpp ../imgui_impl_opengl2.cpp
-SOURCES += ../../imgui.cpp ../../imgui_demo.cpp ../../imgui_draw.cpp
+SOURCES += ../../imgui.cpp ../../imgui_demo.cpp ../../imgui_draw.cpp ../../imgui_widgets.cpp
 OBJS = $(addsuffix .o, $(basename $(notdir $(SOURCES))))

 UNAME_S := $(shell uname -s)
--- a/examples/example_sdl_opengl2/example_sdl_opengl2.vcxproj
+++ b/examples/example_sdl_opengl2/example_sdl_opengl2.vcxproj
@ -19,7 +19,7 @@
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{2AE17FDE-F7F3-4CAC-ADAB-0710EDA4F741}</ProjectGuid>
+    <ProjectGuid>{94E991D0-790A-4DAF-B442-AAADE3233C75}</ProjectGuid>
    <RootNamespace>example_sdl_opengl2</RootNamespace>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@ -153,6 +153,7 @@
    <ClCompile Include="..\..\imgui.cpp" />
    <ClCompile Include="..\..\imgui_demo.cpp" />
    <ClCompile Include="..\..\imgui_draw.cpp" />
+    <ClCompile Include="..\..\imgui_widgets.cpp" />
    <ClCompile Include="..\imgui_impl_opengl2.cpp" />
    <ClCompile Include="..\imgui_impl_sdl.cpp" />
    <ClCompile Include="main.cpp" />
--- a/examples/example_sdl_opengl2/example_sdl_opengl2.vcxproj.filters
+++ b/examples/example_sdl_opengl2/example_sdl_opengl2.vcxproj.filters
@ -28,6 +28,9 @@
    <ClCompile Include="..\imgui_impl_opengl2.cpp">
      <Filter>sources</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\imgui_widgets.cpp">
+      <Filter>imgui</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\..\imconfig.h">
--- a/examples/example_sdl_opengl3/Makefile
+++ b/examples/example_sdl_opengl3/Makefile
@ -17,7 +17,7 @@
 EXE = example_sdl_opengl3
 SOURCES = main.cpp
 SOURCES += ../imgui_impl_sdl.cpp ../imgui_impl_opengl3.cpp
-SOURCES += ../../imgui.cpp ../../imgui_demo.cpp ../../imgui_draw.cpp
+SOURCES += ../../imgui.cpp ../../imgui_demo.cpp ../../imgui_draw.cpp ../../imgui_widgets.cpp
 OBJS = $(addsuffix .o, $(basename $(notdir $(SOURCES))))
 UNAME_S := $(shell uname -s)

--- a/examples/example_sdl_opengl3/example_sdl_opengl3.vcxproj
+++ b/examples/example_sdl_opengl3/example_sdl_opengl3.vcxproj
@ -153,6 +153,7 @@
    <ClCompile Include="..\..\imgui.cpp" />
    <ClCompile Include="..\..\imgui_demo.cpp" />
    <ClCompile Include="..\..\imgui_draw.cpp" />
+    <ClCompile Include="..\..\imgui_widgets.cpp" />
    <ClCompile Include="..\imgui_impl_opengl3.cpp" />
    <ClCompile Include="..\imgui_impl_sdl.cpp" />
    <ClCompile Include="..\libs\gl3w\GL\gl3w.c" />
--- a/examples/example_sdl_opengl3/example_sdl_opengl3.vcxproj.filters
+++ b/examples/example_sdl_opengl3/example_sdl_opengl3.vcxproj.filters
@ -34,6 +34,9 @@
    <ClCompile Include="..\imgui_impl_sdl.cpp">
      <Filter>sources</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\imgui_widgets.cpp">
+      <Filter>imgui</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\..\imconfig.h">
--- a/examples/example_sdl_vulkan/example_sdl_vulkan.vcxproj
+++ b/examples/example_sdl_vulkan/example_sdl_vulkan.vcxproj
@ -153,6 +153,7 @@
    <ClCompile Include="..\..\imgui.cpp" />
    <ClCompile Include="..\..\imgui_demo.cpp" />
    <ClCompile Include="..\..\imgui_draw.cpp" />
+    <ClCompile Include="..\..\imgui_widgets.cpp" />
    <ClCompile Include="..\imgui_impl_sdl.cpp" />
    <ClCompile Include="..\imgui_impl_vulkan.cpp" />
    <ClCompile Include="main.cpp" />
--- a/examples/example_sdl_vulkan/example_sdl_vulkan.vcxproj.filters
+++ b/examples/example_sdl_vulkan/example_sdl_vulkan.vcxproj.filters
@ -28,6 +28,9 @@
    <ClCompile Include="..\imgui_impl_vulkan.cpp">
      <Filter>sources</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\imgui_widgets.cpp">
+      <Filter>imgui</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\..\imconfig.h">
--- a/examples/example_win32_directx10/example_win32_directx10.vcxproj
+++ b/examples/example_win32_directx10/example_win32_directx10.vcxproj
@ -150,6 +150,7 @@
    <ClCompile Include="..\..\imgui.cpp" />
    <ClCompile Include="..\..\imgui_demo.cpp" />
    <ClCompile Include="..\..\imgui_draw.cpp" />
+    <ClCompile Include="..\..\imgui_widgets.cpp" />
    <ClCompile Include="..\imgui_impl_dx10.cpp" />
    <ClCompile Include="..\imgui_impl_win32.cpp" />
    <ClCompile Include="main.cpp" />
--- a/examples/example_win32_directx10/example_win32_directx10.vcxproj.filters
+++ b/examples/example_win32_directx10/example_win32_directx10.vcxproj.filters
@ -44,6 +44,9 @@
    <ClCompile Include="..\imgui_impl_win32.cpp">
      <Filter>sources</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\imgui_widgets.cpp">
+      <Filter>imgui</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <None Include="..\README.txt" />
--- a/examples/example_win32_directx11/example_win32_directx11.vcxproj
+++ b/examples/example_win32_directx11/example_win32_directx11.vcxproj
@ -150,6 +150,7 @@
    <ClCompile Include="..\..\imgui.cpp" />
    <ClCompile Include="..\..\imgui_demo.cpp" />
    <ClCompile Include="..\..\imgui_draw.cpp" />
+    <ClCompile Include="..\..\imgui_widgets.cpp" />
    <ClCompile Include="..\imgui_impl_dx11.cpp" />
    <ClCompile Include="..\imgui_impl_win32.cpp" />
    <ClCompile Include="main.cpp" />
--- a/examples/example_win32_directx11/example_win32_directx11.vcxproj.filters
+++ b/examples/example_win32_directx11/example_win32_directx11.vcxproj.filters
@ -44,6 +44,9 @@
    <ClCompile Include="..\imgui_impl_dx11.cpp">
      <Filter>sources</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\imgui_widgets.cpp">
+      <Filter>imgui</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <None Include="..\README.txt" />
--- a/examples/example_win32_directx12/example_win32_directx12.vcxproj
+++ b/examples/example_win32_directx12/example_win32_directx12.vcxproj
@ -153,6 +153,7 @@
    <ClCompile Include="..\..\imgui.cpp" />
    <ClCompile Include="..\..\imgui_demo.cpp" />
    <ClCompile Include="..\..\imgui_draw.cpp" />
+    <ClCompile Include="..\..\imgui_widgets.cpp" />
    <ClCompile Include="..\imgui_impl_dx12.cpp" />
    <ClCompile Include="..\imgui_impl_win32.cpp" />
    <ClCompile Include="main.cpp" />
--- a/examples/example_win32_directx12/example_win32_directx12.vcxproj.filters
+++ b/examples/example_win32_directx12/example_win32_directx12.vcxproj.filters
@ -44,6 +44,9 @@
    <ClCompile Include="..\imgui_impl_win32.cpp">
      <Filter>sources</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\imgui_widgets.cpp">
+      <Filter>imgui</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <None Include="..\README.txt" />
--- a/examples/example_win32_directx9/example_win32_directx9.vcxproj
+++ b/examples/example_win32_directx9/example_win32_directx9.vcxproj
@ -143,6 +143,7 @@
    <ClCompile Include="..\..\imgui.cpp" />
    <ClCompile Include="..\..\imgui_demo.cpp" />
    <ClCompile Include="..\..\imgui_draw.cpp" />
+    <ClCompile Include="..\..\imgui_widgets.cpp" />
    <ClCompile Include="..\imgui_impl_dx9.cpp" />
    <ClCompile Include="..\imgui_impl_win32.cpp" />
    <ClCompile Include="main.cpp" />
--- a/examples/example_win32_directx9/example_win32_directx9.vcxproj.filters
+++ b/examples/example_win32_directx9/example_win32_directx9.vcxproj.filters
@ -28,6 +28,9 @@
    <ClCompile Include="..\imgui_impl_dx9.cpp">
      <Filter>sources</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\imgui_widgets.cpp">
+      <Filter>imgui</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\..\imconfig.h">
--- a/imgui_widgets.cpp
+++ b/imgui_widgets.cpp
@ -0,0 +1,25 @@
+// dear imgui, v1.64 WIP
+// (widgets code)
+
+#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
+#define _CRT_SECURE_NO_WARNINGS
+#endif
+
+#include "imgui.h"
+#ifndef IMGUI_DEFINE_MATH_OPERATORS
+#define IMGUI_DEFINE_MATH_OPERATORS
+#endif
+#include "imgui_internal.h"
+
+//-------------------------------------------------------------------------
+// Forward Declarations
+//-------------------------------------------------------------------------
+
+//-------------------------------------------------------------------------
+// Shared Utilities
+//-------------------------------------------------------------------------
+
+//-------------------------------------------------------------------------
+// Widgets
+//-------------------------------------------------------------------------
+