فهرست منبع

Examples: Renamed example folders. (#1870)

omar 7 سال پیش
والد
کامیت
8d58fbb5ed
95فایلهای تغییر یافته به همراه117 افزوده شده و 115 حذف شده
  1. 4 4
      examples/.gitignore
  2. 22 22
      examples/README.txt
  3. 2 2
      examples/example_allegro5/README.md
  4. 0 0
      examples/example_allegro5/imconfig_allegro5.h
  5. 0 0
      examples/example_allegro5/main.cpp
  6. 0 0
      examples/example_apple/.gitignore
  7. 2 0
      examples/example_apple/README.md
  8. 0 0
      examples/example_apple/imguiex-ios/AppDelegate.h
  9. 0 0
      examples/example_apple/imguiex-ios/AppDelegate.m
  10. 0 0
      examples/example_apple/imguiex-ios/Base.lproj/LaunchScreen.xib
  11. 0 0
      examples/example_apple/imguiex-ios/Base.lproj/Main.storyboard
  12. 0 0
      examples/example_apple/imguiex-ios/GameViewController.h
  13. 0 0
      examples/example_apple/imguiex-ios/GameViewController.m
  14. 0 0
      examples/example_apple/imguiex-ios/Images.xcassets/AppIcon.appiconset/Contents.json
  15. 0 0
      examples/example_apple/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_60@2x~iphone.png
  16. 0 0
      examples/example_apple/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_60@3x~iphone.png
  17. 0 0
      examples/example_apple/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_76@2x~ipad.png
  18. 0 0
      examples/example_apple/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_76~ipad.png
  19. 0 0
      examples/example_apple/imguiex-ios/Info.plist
  20. 0 0
      examples/example_apple/imguiex-ios/Shaders/Shader.fsh
  21. 0 0
      examples/example_apple/imguiex-ios/Shaders/Shader.vsh
  22. 0 0
      examples/example_apple/imguiex-ios/debug_hud.cpp
  23. 0 0
      examples/example_apple/imguiex-ios/debug_hud.h
  24. 0 0
      examples/example_apple/imguiex-ios/imgui_ex_icon.png
  25. 0 0
      examples/example_apple/imguiex-ios/imgui_impl_ios.h
  26. 0 0
      examples/example_apple/imguiex-ios/imgui_impl_ios.mm
  27. 0 0
      examples/example_apple/imguiex-ios/main.m
  28. 0 0
      examples/example_apple/imguiex-osx/AppDelegate.h
  29. 0 0
      examples/example_apple/imguiex-osx/AppDelegate.m
  30. 0 0
      examples/example_apple/imguiex-osx/Assets.xcassets/AppIcon.appiconset/Contents.json
  31. 0 0
      examples/example_apple/imguiex-osx/Assets.xcassets/AppIcon.appiconset/icon_imgui_180x180.png
  32. 0 0
      examples/example_apple/imguiex-osx/Assets.xcassets/Contents.json
  33. 0 0
      examples/example_apple/imguiex-osx/Info.plist
  34. 0 0
      examples/example_apple/imguiex-osx/main.m
  35. 0 0
      examples/example_apple/imguiex.xcodeproj/project.pbxproj
  36. 1 1
      examples/example_glfw_opengl2/Makefile
  37. 1 1
      examples/example_glfw_opengl2/build_win32.bat
  38. 1 1
      examples/example_glfw_opengl2/example_glfw_opengl2.vcxproj
  39. 0 0
      examples/example_glfw_opengl2/example_glfw_opengl2.vcxproj.filters
  40. 0 0
      examples/example_glfw_opengl2/main.cpp
  41. 1 1
      examples/example_glfw_opengl3/Makefile
  42. 1 1
      examples/example_glfw_opengl3/build_win32.bat
  43. 1 1
      examples/example_glfw_opengl3/example_glfw_opengl3.vcxproj
  44. 0 0
      examples/example_glfw_opengl3/example_glfw_opengl3.vcxproj.filters
  45. 0 0
      examples/example_glfw_opengl3/main.cpp
  46. 3 3
      examples/example_glfw_vulkan/CMakeLists.txt
  47. 7 0
      examples/example_glfw_vulkan/build_win32.bat
  48. 7 0
      examples/example_glfw_vulkan/build_win64.bat
  49. 1 1
      examples/example_glfw_vulkan/example_glfw_vulkan.vcxproj
  50. 0 0
      examples/example_glfw_vulkan/example_glfw_vulkan.vcxproj.filters
  51. 0 0
      examples/example_glfw_vulkan/gen_spv.sh
  52. 0 0
      examples/example_glfw_vulkan/glsl_shader.frag
  53. 0 0
      examples/example_glfw_vulkan/glsl_shader.vert
  54. 0 0
      examples/example_glfw_vulkan/main.cpp
  55. 0 0
      examples/example_marmalade/data/app.icf
  56. 0 0
      examples/example_marmalade/main.cpp
  57. 0 0
      examples/example_marmalade/marmalade_example.mkb
  58. 1 1
      examples/example_null/build_win32.bat
  59. 0 0
      examples/example_null/main.cpp
  60. 1 1
      examples/example_sdl_opengl2/Makefile
  61. 22 0
      examples/example_sdl_opengl2/README.md
  62. 1 1
      examples/example_sdl_opengl2/build_win32.bat
  63. 1 1
      examples/example_sdl_opengl2/example_sdl_opengl2.vcxproj
  64. 0 0
      examples/example_sdl_opengl2/example_sdl_opengl2.vcxproj.filters
  65. 0 0
      examples/example_sdl_opengl2/main.cpp
  66. 1 1
      examples/example_sdl_opengl3/Makefile
  67. 22 0
      examples/example_sdl_opengl3/README.md
  68. 1 1
      examples/example_sdl_opengl3/build_win32.bat
  69. 1 1
      examples/example_sdl_opengl3/example_sdl_opengl3.vcxproj
  70. 0 0
      examples/example_sdl_opengl3/example_sdl_opengl3.vcxproj.filters
  71. 0 0
      examples/example_sdl_opengl3/main.cpp
  72. 1 1
      examples/example_sdl_vulkan/example_sdl_vulkan.vcxproj
  73. 0 0
      examples/example_sdl_vulkan/example_sdl_vulkan.vcxproj.filters
  74. 0 0
      examples/example_sdl_vulkan/main.cpp
  75. 1 1
      examples/example_win32_directx10/build_win32.bat
  76. 0 0
      examples/example_win32_directx10/example_win32_directx10.vcxproj
  77. 0 0
      examples/example_win32_directx10/example_win32_directx10.vcxproj.filters
  78. 0 0
      examples/example_win32_directx10/main.cpp
  79. 1 1
      examples/example_win32_directx11/build_win32.bat
  80. 1 1
      examples/example_win32_directx11/example_win32_directx11.vcxproj
  81. 0 0
      examples/example_win32_directx11/example_win32_directx11.vcxproj.filters
  82. 0 0
      examples/example_win32_directx11/main.cpp
  83. 1 1
      examples/example_win32_directx12/build_win32.bat
  84. 0 0
      examples/example_win32_directx12/example_win32_directx12.vcxproj
  85. 0 0
      examples/example_win32_directx12/example_win32_directx12.vcxproj.filters
  86. 0 0
      examples/example_win32_directx12/main.cpp
  87. 1 1
      examples/example_win32_directx9/build_win32.bat
  88. 1 1
      examples/example_win32_directx9/example_win32_directx9.vcxproj
  89. 0 0
      examples/example_win32_directx9/example_win32_directx9.vcxproj.filters
  90. 0 0
      examples/example_win32_directx9/main.cpp
  91. 5 5
      examples/imgui_examples.sln
  92. 0 22
      examples/sdl_opengl2_example/README.md
  93. 0 22
      examples/sdl_opengl3_example/README.md
  94. 0 7
      examples/vulkan_example/build_win32.bat
  95. 0 7
      examples/vulkan_example/build_win64.bat

+ 4 - 4
examples/.gitignore

@@ -16,10 +16,10 @@ build/*
 *.VC.VC.opendb
 
 ## Unix executables
-opengl2_example/opengl2_example
-opengl3_example/opengl3_example
-sdl_opengl2_example/sdl_opengl2_example
-sdl_opengl3_example/sdl_opengl3_example
+example_glfw_opengl2/example_glfw_opengl2
+example_glfw_opengl3/example_glfw_opengl3
+example_sdl_opengl2/example_sdl_opengl2
+example_sdl_opengl3/example_sdl_opengl3
 
 ## Dear ImGui Ini files
 imgui.ini

+ 22 - 22
examples/README.txt

@@ -153,47 +153,47 @@ Building:
   directly with a command-line compiler.
 
 
-directx9_example/
+example_win32_directx9/
     DirectX9 example, Windows only.
     = main.cpp + imgui_impl_win32.cpp + imgui_impl_dx9.cpp
     
-directx10_example/
+example_win32_directx10/
     DirectX10 example, Windows only.
     = main.cpp + imgui_impl_win32.cpp + imgui_impl_dx10.cpp
 
-directx11_example/
+example_win32_directx11/
     DirectX11 example, Windows only.
     = main.cpp + imgui_impl_win32.cpp + imgui_impl_dx11.cpp
     
-directx12_example/
+example_win32_directx12/
     DirectX12 example, Windows only.
     This is quite long and tedious, because: DirectX12.
     = main.cpp + imgui_impl_win32.cpp + imgui_impl_dx12.cpp
 
-opengl2_example/
-    **DO NOT USE THIS CODE IF YOUR CODE/ENGINE IS USING MODERN OPENGL (SHADERS, VBO, VAO, etc.)**
-    **Prefer using the code in the opengl3_example/ folder**
-    GLFW + OpenGL example (legacy, fixed pipeline).
+example_glfw_opengl2/
+    **DO NOT USE OPENGL2 CODE IF YOUR CODE/ENGINE IS USING MODERN OPENGL (SHADERS, VBO, VAO, etc.)**
+    **Prefer using OPENGL3 code (with gl3w/glew/glad, you can replace the OpenGL function loader)**
+    GLFW + OpenGL2 example (legacy, fixed pipeline).
     This code is mostly provided as a reference to learn about ImGui integration, because it is shorter.
     If your code is using GL3+ context or any semi modern OpenGL calls, using this renderer is likely to
     make things more complicated, will require your code to reset many OpenGL attributes to their initial
     state, and might confuse your GPU driver. One star, not recommended.
     = main.cpp + imgui_impl_glfw.cpp + imgui_impl_opengl2.cpp
 
-opengl3_example/
-    GLFW (Win32, Mac, Linux) + OpenGL example (programmable pipeline, binding modern functions with GL3W).
+example_glfw_opengl3/
+    GLFW (Win32, Mac, Linux) + OpenGL3+ example (programmable pipeline, binding modern functions with GL3W).
     This uses more modern OpenGL calls and custom shaders. 
     Prefer using that if you are using modern OpenGL in your application (anything with shaders).
     = main.cpp + imgui_impl_glfw.cpp + imgui_impl_opengl3.cpp
 	
-vulkan_example/
-    Vulkan example.
+example_glfw_vulkan/
+    GLFW (Win32, Mac, Linux) + Vulkan example.
     This is quite long and tedious, because: Vulkan.
     = main.cpp + imgui_impl_glfw.cpp + imgui_impl_vulkan.cpp
 
-sdl_opengl2_example/
-    **DO NOT USE THIS CODE IF YOUR CODE/ENGINE IS USING MODERN OPENGL (SHADERS, VBO, VAO, etc.)**
-    **Prefer using the code in the sdl_opengl3_example/ folder**
+example_sdl_opengl2/
+    **DO NOT USE OPENGL2 CODE IF YOUR CODE/ENGINE IS USING MODERN OPENGL (SHADERS, VBO, VAO, etc.)**
+    **Prefer using OPENGL3 code (with gl3w/glew/glad, you can replace the OpenGL function loader)**
     SDL2 (Win32, Mac, Linux etc.) + OpenGL example (legacy, fixed pipeline).
     This code is mostly provided as a reference to learn about ImGui integration, because it is shorter.
     If your code is using GL3+ context or any semi modern OpenGL calls, using this renderer is likely to
@@ -201,28 +201,28 @@ sdl_opengl2_example/
     state, and might confuse your GPU driver. One star, not recommended. 
     = main.cpp + imgui_impl_sdl2.cpp + imgui_impl_opengl2.cpp
 
-sdl_opengl3_example/
-    SDL2 (Win32, Mac, Linux, etc.) + OpenGL3 example.
+example_sdl_opengl3/
+    SDL2 (Win32, Mac, Linux, etc.) + OpenGL3+ example.
     This uses more modern OpenGL calls and custom shaders. 
     Prefer using that if you are using modern OpenGL in your application (anything with shaders).
     = main.cpp + imgui_impl_sdl2.cpp + imgui_impl_opengl3.cpp
 
-sdl_vulkan_example/
+example_sdl_vulkan/
     SDL2 (Win32, Mac, Linux, etc.) + Vulkan example.
     This is quite long and tedious, because: Vulkan.
     = main.cpp + imgui_impl_glfw.cpp + imgui_impl_vulkan.cpp
 
-apple_example/
+example_apple/
     OSX & iOS example + OpenGL2.
     THIS EXAMPLE HAS NOT BEEN MAINTAINED PROPERLY AND NEEDS A MAINTAINER.
     Consider using the opengl3_example/ instead.
     On iOS, Using Synergy to access keyboard/mouse data from server computer.
     Synergy keyboard integration is rather hacky.
 
-allegro5_example/
+example_allegro5/
     Allegro 5 example.
     = main.cpp + imgui_impl_allegro5.cpp
 
-marmalade_example/
-    Marmalade example using IwGx
+example_marmalade/
+    Marmalade example using IwGx.
     = main.cpp + imgui_impl_marmalade.cpp

+ 2 - 2
examples/allegro5_example/README.md → examples/example_allegro5/README.md

@@ -12,12 +12,12 @@ Note that the back-end supports _BOTH_ 16-bit and 32-bit indices, but 32-bit ind
 - On Ubuntu 14.04+
 
 ```bash
-g++ -DIMGUI_USER_CONFIG=\"examples/allegro5_example/imconfig_allegro5.h\" -I .. -I ../.. main.cpp imgui_impl_allegro5.cpp ../../imgui*.cpp -lallegro -lallegro_primitives -o allegro5_example
+g++ -DIMGUI_USER_CONFIG=\"examples/example_allegro5/imconfig_allegro5.h\" -I .. -I ../.. main.cpp imgui_impl_allegro5.cpp ../../imgui*.cpp -lallegro -lallegro_primitives -o allegro5_example
 ```
 
 - On Windows with Visual Studio's CLI
 
 ```
 set ALLEGRODIR=path_to_your_allegro5_folder
-cl /Zi /MD /I %ALLEGRODIR%\include /DIMGUI_USER_CONFIG=\"examples/allegro5_example/imconfig_allegro5.h\" /I .. /I ..\.. main.cpp imgui_impl_allegro5.cpp ..\..\imgui*.cpp /link /LIBPATH:%ALLEGRODIR%\lib allegro-5.0.10-monolith-md.lib user32.lib
+cl /Zi /MD /I %ALLEGRODIR%\include /DIMGUI_USER_CONFIG=\"examples/example_allegro5/imconfig_allegro5.h\" /I .. /I ..\.. main.cpp imgui_impl_allegro5.cpp ..\..\imgui*.cpp /link /LIBPATH:%ALLEGRODIR%\lib allegro-5.0.10-monolith-md.lib user32.lib
 ```

+ 0 - 0
examples/allegro5_example/imconfig_allegro5.h → examples/example_allegro5/imconfig_allegro5.h


+ 0 - 0
examples/allegro5_example/main.cpp → examples/example_allegro5/main.cpp


+ 0 - 0
examples/apple_example/.gitignore → examples/example_apple/.gitignore


+ 2 - 0
examples/apple_example/README.md → examples/example_apple/README.md

@@ -2,6 +2,8 @@
 
 ## Introduction
 
+THIS EXAMPLE HAS NOT BEEN MAINTAINED PROPERLY AND NEEDS A MAINTAINER.
+
 This example is the default XCode "OpenGL" example code, modified to support ImGui and [Synergy](http://synergy-project.org/) to share mouse/keyboard on an iOS device.
 
 It is a rather complex and messy example because of all of the faff required to get an XCode/iOS application running. Refer to the regular OpenGL examples if you want to learn about integrating ImGui. **The opengl3_example/ should also work on OS X and is much simpler.** This is an integration for iOS with Synergy.

+ 0 - 0
examples/apple_example/imguiex-ios/AppDelegate.h → examples/example_apple/imguiex-ios/AppDelegate.h


+ 0 - 0
examples/apple_example/imguiex-ios/AppDelegate.m → examples/example_apple/imguiex-ios/AppDelegate.m


+ 0 - 0
examples/apple_example/imguiex-ios/Base.lproj/LaunchScreen.xib → examples/example_apple/imguiex-ios/Base.lproj/LaunchScreen.xib


+ 0 - 0
examples/apple_example/imguiex-ios/Base.lproj/Main.storyboard → examples/example_apple/imguiex-ios/Base.lproj/Main.storyboard


+ 0 - 0
examples/apple_example/imguiex-ios/GameViewController.h → examples/example_apple/imguiex-ios/GameViewController.h


+ 0 - 0
examples/apple_example/imguiex-ios/GameViewController.m → examples/example_apple/imguiex-ios/GameViewController.m


+ 0 - 0
examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/Contents.json → examples/example_apple/imguiex-ios/Images.xcassets/AppIcon.appiconset/Contents.json


+ 0 - 0
examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_60@2x~iphone.png → examples/example_apple/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_60@2x~iphone.png


+ 0 - 0
examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_60@3x~iphone.png → examples/example_apple/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_60@3x~iphone.png


+ 0 - 0
examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_76@2x~ipad.png → examples/example_apple/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_76@2x~ipad.png


+ 0 - 0
examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_76~ipad.png → examples/example_apple/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_76~ipad.png


+ 0 - 0
examples/apple_example/imguiex-ios/Info.plist → examples/example_apple/imguiex-ios/Info.plist


+ 0 - 0
examples/apple_example/imguiex-ios/Shaders/Shader.fsh → examples/example_apple/imguiex-ios/Shaders/Shader.fsh


+ 0 - 0
examples/apple_example/imguiex-ios/Shaders/Shader.vsh → examples/example_apple/imguiex-ios/Shaders/Shader.vsh


+ 0 - 0
examples/apple_example/imguiex-ios/debug_hud.cpp → examples/example_apple/imguiex-ios/debug_hud.cpp


+ 0 - 0
examples/apple_example/imguiex-ios/debug_hud.h → examples/example_apple/imguiex-ios/debug_hud.h


+ 0 - 0
examples/apple_example/imguiex-ios/imgui_ex_icon.png → examples/example_apple/imguiex-ios/imgui_ex_icon.png


+ 0 - 0
examples/apple_example/imguiex-ios/imgui_impl_ios.h → examples/example_apple/imguiex-ios/imgui_impl_ios.h


+ 0 - 0
examples/apple_example/imguiex-ios/imgui_impl_ios.mm → examples/example_apple/imguiex-ios/imgui_impl_ios.mm


+ 0 - 0
examples/apple_example/imguiex-ios/main.m → examples/example_apple/imguiex-ios/main.m


+ 0 - 0
examples/apple_example/imguiex-osx/AppDelegate.h → examples/example_apple/imguiex-osx/AppDelegate.h


+ 0 - 0
examples/apple_example/imguiex-osx/AppDelegate.m → examples/example_apple/imguiex-osx/AppDelegate.m


+ 0 - 0
examples/apple_example/imguiex-osx/Assets.xcassets/AppIcon.appiconset/Contents.json → examples/example_apple/imguiex-osx/Assets.xcassets/AppIcon.appiconset/Contents.json


+ 0 - 0
examples/apple_example/imguiex-osx/Assets.xcassets/AppIcon.appiconset/icon_imgui_180x180.png → examples/example_apple/imguiex-osx/Assets.xcassets/AppIcon.appiconset/icon_imgui_180x180.png


+ 0 - 0
examples/apple_example/imguiex-osx/Assets.xcassets/Contents.json → examples/example_apple/imguiex-osx/Assets.xcassets/Contents.json


+ 0 - 0
examples/apple_example/imguiex-osx/Info.plist → examples/example_apple/imguiex-osx/Info.plist


+ 0 - 0
examples/apple_example/imguiex-osx/main.m → examples/example_apple/imguiex-osx/main.m


+ 0 - 0
examples/apple_example/imguiex.xcodeproj/project.pbxproj → examples/example_apple/imguiex.xcodeproj/project.pbxproj


+ 1 - 1
examples/opengl2_example/Makefile → examples/example_glfw_opengl2/Makefile

@@ -14,7 +14,7 @@
 #CXX = g++
 #CXX = clang++
 
-EXE = opengl2_example
+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

+ 1 - 1
examples/opengl2_example/build_win32.bat → examples/example_glfw_opengl2/build_win32.bat

@@ -1,3 +1,3 @@
 @REM Build for Visual Studio compiler. Run your copy of vcvars32.bat or vcvarsall.bat to setup command-line compiler.
 mkdir Debug
-cl /nologo /Zi /MD /I .. /I ..\.. /I ..\libs\glfw\include *.cpp ..\imgui_impl_opengl2.cpp ..\imgui_impl_glfw.cpp ..\..\imgui*.cpp /FeDebug/opengl2_example.exe /FoDebug/ /link /LIBPATH:..\libs\glfw\lib-vc2010-32 glfw3.lib opengl32.lib gdi32.lib shell32.lib
+cl /nologo /Zi /MD /I .. /I ..\.. /I ..\libs\glfw\include *.cpp ..\imgui_impl_opengl2.cpp ..\imgui_impl_glfw.cpp ..\..\imgui*.cpp /FeDebug/example_glfw_opengl2.exe /FoDebug/ /link /LIBPATH:..\libs\glfw\lib-vc2010-32 glfw3.lib opengl32.lib gdi32.lib shell32.lib

+ 1 - 1
examples/opengl2_example/opengl2_example.vcxproj → examples/example_glfw_opengl2/example_glfw_opengl2.vcxproj

@@ -20,7 +20,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{9CDA7840-B7A5-496D-A527-E95571496D18}</ProjectGuid>
-    <RootNamespace>opengl2_example</RootNamespace>
+    <RootNamespace>example_glfw_opengl2</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+ 0 - 0
examples/opengl2_example/opengl2_example.vcxproj.filters → examples/example_glfw_opengl2/example_glfw_opengl2.vcxproj.filters


+ 0 - 0
examples/opengl2_example/main.cpp → examples/example_glfw_opengl2/main.cpp


+ 1 - 1
examples/opengl3_example/Makefile → examples/example_glfw_opengl3/Makefile

@@ -14,7 +14,7 @@
 #CXX = g++
 #CXX = clang++
 
-EXE = opengl3_example
+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

+ 1 - 1
examples/opengl3_example/build_win32.bat → examples/example_glfw_opengl3/build_win32.bat

@@ -1,3 +1,3 @@
 @REM Build for Visual Studio compiler. Run your copy of vcvars32.bat or vcvarsall.bat to setup command-line compiler.
 mkdir Debug
-cl /nologo /Zi /MD /I ..\.. /I ..\libs\glfw\include /I ..\libs\gl3w *.cpp ..\imgui_impl_glfw.cpp ..\imgui_impl_opengl3.cpp ..\..\imgui*.cpp ..\libs\gl3w\GL\gl3w.c /FeDebug/opengl_example3.exe /FoDebug/ /link /LIBPATH:..\libs\glfw\lib-vc2010-32 glfw3.lib opengl32.lib gdi32.lib shell32.lib
+cl /nologo /Zi /MD /I ..\.. /I ..\libs\glfw\include /I ..\libs\gl3w *.cpp ..\imgui_impl_glfw.cpp ..\imgui_impl_opengl3.cpp ..\..\imgui*.cpp ..\libs\gl3w\GL\gl3w.c /FeDebug/example_glfw_opengl3.exe /FoDebug/ /link /LIBPATH:..\libs\glfw\lib-vc2010-32 glfw3.lib opengl32.lib gdi32.lib shell32.lib

+ 1 - 1
examples/opengl3_example/opengl3_example.vcxproj → examples/example_glfw_opengl3/example_glfw_opengl3.vcxproj

@@ -20,7 +20,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{4a1fb5ea-22f5-42a8-ab92-1d2df5d47fb9}</ProjectGuid>
-    <RootNamespace>opengl3_example</RootNamespace>
+    <RootNamespace>example_glfw_opengl3</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+ 0 - 0
examples/opengl3_example/opengl3_example.vcxproj.filters → examples/example_glfw_opengl3/example_glfw_opengl3.vcxproj.filters


+ 0 - 0
examples/opengl3_example/main.cpp → examples/example_glfw_opengl3/main.cpp


+ 3 - 3
examples/vulkan_example/CMakeLists.txt → examples/example_glfw_vulkan/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.8)
-project(ImGuiGLFWVulkanExample C CXX)
+project(imgui_example_glfw_vulkan C CXX)
 
 if(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE Debug CACHE STRING "" FORCE)
@@ -32,5 +32,5 @@ include_directories(${GLFW_DIR}/deps)
 
 file(GLOB sources *.cpp)
 
-add_executable(vulkan_example ${sources} ${IMGUI_DIR}/imgui.cpp ${IMGUI_DIR}/imgui_draw.cpp ${IMGUI_DIR}/imgui_demo.cpp)
-target_link_libraries(vulkan_example ${LIBRARIES})
+add_executable(example_glfw_vulkan ${sources} ${IMGUI_DIR}/examples/imgui_impl_glfw.cpp ${IMGUI_DIR}/examples/imgui_impl_vulkan.cpp ${IMGUI_DIR}/imgui.cpp ${IMGUI_DIR}/imgui_draw.cpp ${IMGUI_DIR}/imgui_demo.cpp)
+target_link_libraries(example_glfw_vulkan ${LIBRARIES})

+ 7 - 0
examples/example_glfw_vulkan/build_win32.bat

@@ -0,0 +1,7 @@
+@REM Build for Visual Studio compiler. Run your copy of vcvars32.bat or vcvarsall.bat to setup command-line compiler.
+
+mkdir Debug
+cl /nologo /Zi /MD /I .. /I ..\.. /I ..\libs\glfw\include /I %VULKAN_SDK%\include *.cpp ..\imgui_impl_vulkan.cpp ..\imgui_impl_glfw.cpp ..\..\imgui*.cpp /FeDebug/example_glfw_vulkan.exe /FoDebug/ /link /LIBPATH:..\libs\glfw\lib-vc2010-32 /libpath:%VULKAN_SDK%\lib32 glfw3.lib opengl32.lib gdi32.lib shell32.lib vulkan-1.lib
+
+mkdir Release
+cl /nologo /Zi /MD /Ox /Oi /I .. /I ..\.. /I ..\libs\glfw\include /I %VULKAN_SDK%\include *.cpp ..\imgui_impl_vulkan.cpp ..\imgui_impl_glfw.cpp ..\..\imgui*.cpp /FeRelease/example_glfw_vulkan.exe /FoRelease/ /link /LIBPATH:..\libs\glfw\lib-vc2010-32 /libpath:%VULKAN_SDK%\lib32 glfw3.lib opengl32.lib gdi32.lib shell32.lib vulkan-1.lib

+ 7 - 0
examples/example_glfw_vulkan/build_win64.bat

@@ -0,0 +1,7 @@
+@REM Build for Visual Studio compiler. Run your copy of amd64/vcvars32.bat to setup 64-bit command-line compiler.
+
+mkdir Debug
+cl /nologo /Zi /MD /I .. /I ..\.. /I ..\libs\glfw\include /I %VULKAN_SDK%\include *.cpp ..\imgui_impl_vulkan.cpp ..\imgui_impl_glfw.cpp ..\..\imgui*.cpp /FeDebug/example_glfw_vulkan.exe /FoDebug/ /link /LIBPATH:..\libs\glfw\lib-vc2010-64 /libpath:%VULKAN_SDK%\lib glfw3.lib opengl32.lib gdi32.lib shell32.lib vulkan-1.lib
+
+mkdir Release
+cl /nologo /Zi /MD /Ox /Oi /I .. /I ..\.. /I ..\libs\glfw\include /I %VULKAN_SDK%\include *.cpp ..\imgui_impl_vulkan.cpp ..\imgui_impl_glfw.cpp ..\..\imgui*.cpp /FeRelease/example_glfw_vulkan.exe /FoRelease/ /link /LIBPATH:..\libs\glfw\lib-vc2010-64 /libpath:%VULKAN_SDK%\lib glfw3.lib opengl32.lib gdi32.lib shell32.lib vulkan-1.lib

+ 1 - 1
examples/vulkan_example/vulkan_example.vcxproj → examples/example_glfw_vulkan/example_glfw_vulkan.vcxproj

@@ -20,7 +20,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{57E2DF5A-6FC8-45BB-99DD-91A18C646E80}</ProjectGuid>
-    <RootNamespace>vulkan_example</RootNamespace>
+    <RootNamespace>example_glfw_vulkan</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+ 0 - 0
examples/vulkan_example/vulkan_example.vcxproj.filters → examples/example_glfw_vulkan/example_glfw_vulkan.vcxproj.filters


+ 0 - 0
examples/vulkan_example/gen_spv.sh → examples/example_glfw_vulkan/gen_spv.sh


+ 0 - 0
examples/vulkan_example/glsl_shader.frag → examples/example_glfw_vulkan/glsl_shader.frag


+ 0 - 0
examples/vulkan_example/glsl_shader.vert → examples/example_glfw_vulkan/glsl_shader.vert


+ 0 - 0
examples/vulkan_example/main.cpp → examples/example_glfw_vulkan/main.cpp


+ 0 - 0
examples/marmalade_example/data/app.icf → examples/example_marmalade/data/app.icf


+ 0 - 0
examples/marmalade_example/main.cpp → examples/example_marmalade/main.cpp


+ 0 - 0
examples/marmalade_example/marmalade_example.mkb → examples/example_marmalade/marmalade_example.mkb


+ 1 - 1
examples/null_example/build_win32.bat → examples/example_null/build_win32.bat

@@ -1,3 +1,3 @@
 @REM Build for Visual Studio compiler. Run your copy of vcvars32.bat or vcvarsall.bat to setup command-line compiler.
 mkdir Debug
-cl /nologo /Zi /MD /I ..\.. *.cpp ..\..\*.cpp /FeDebug/null_example.exe /FoDebug/ /link gdi32.lib shell32.lib
+cl /nologo /Zi /MD /I ..\.. *.cpp ..\..\*.cpp /FeDebug/example_null.exe /FoDebug/ /link gdi32.lib shell32.lib

+ 0 - 0
examples/null_example/main.cpp → examples/example_null/main.cpp


+ 1 - 1
examples/sdl_opengl2_example/Makefile → examples/example_sdl_opengl2/Makefile

@@ -14,7 +14,7 @@
 #CXX = g++
 #CXX = clang++
 
-EXE = sdl_opengl2_example
+EXE = example_sdl_opengl2
 SOURCES = main.cpp ../imgui_impl_sdl2.cpp ../imgui_impl_opengl2.cpp
 SOURCES += ../../imgui.cpp ../../imgui_demo.cpp ../../imgui_draw.cpp
 OBJS = $(addsuffix .o, $(basename $(notdir $(SOURCES))))

+ 22 - 0
examples/example_sdl_opengl2/README.md

@@ -0,0 +1,22 @@
+
+# How to Build
+
+- On Windows with Visual Studio's CLI
+
+```
+set SDL2DIR=path_to_your_sdl2_folder
+cl /Zi /MD /I %SDL2DIR%\include /I ..\.. main.cpp ..\imgui_impl_sdl2.cpp ..\imgui_impl_opengl2.cpp ..\..\imgui*.cpp /link /LIBPATH:%SDL2DIR%\lib SDL2.lib SDL2main.lib opengl32.lib /subsystem:console
+```
+
+- On Linux and similar Unixes
+
+```
+c++ `sdl2-config --cflags` -I ../.. main.cpp ../imgui_impl_sdl2.cpp ../imgui_impl_opengl2.cpp ../../imgui*.cpp `sdl2-config --libs` -lGL
+```
+
+- On Mac OS X
+
+```
+brew install sdl2
+c++ `sdl2-config --cflags` -I ../.. main.cpp ../imgui_impl_sdl2.cpp ../imgui_impl_opengl2.cpp ../../imgui*.cpp `sdl2-config --libs` -framework OpenGl
+```

+ 1 - 1
examples/sdl_opengl2_example/build_win32.bat → examples/example_sdl_opengl2/build_win32.bat

@@ -1,3 +1,3 @@
 @REM Build for Visual Studio compiler. Run your copy of vcvars32.bat or vcvarsall.bat to setup command-line compiler.
 mkdir Debug
-cl /nologo /Zi /MD /I .. /I ..\.. /I ..\libs\gl3w /I %SDL2_DIR%\include *.cpp ..\imgui_impl_opengl2.cpp ..\imgui_impl_sdl2.cpp ..\..\imgui*.cpp ..\libs\gl3w\GL\gl3w.c /FeDebug/sdl_opengl2_example.exe /FoDebug/ /link /libpath:%SDL2_DIR%\lib\x86 SDL2.lib SDL2main.lib opengl32.lib /subsystem:console
+cl /nologo /Zi /MD /I .. /I ..\.. /I ..\libs\gl3w /I %SDL2_DIR%\include *.cpp ..\imgui_impl_opengl2.cpp ..\imgui_impl_sdl2.cpp ..\..\imgui*.cpp ..\libs\gl3w\GL\gl3w.c /FeDebug/example_sdl_opengl2.exe /FoDebug/ /link /libpath:%SDL2_DIR%\lib\x86 SDL2.lib SDL2main.lib opengl32.lib /subsystem:console

+ 1 - 1
examples/sdl_opengl2_example/sdl_opengl2_example.vcxproj → examples/example_sdl_opengl2/example_sdl_opengl2.vcxproj

@@ -20,7 +20,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{2AE17FDE-F7F3-4CAC-ADAB-0710EDA4F741}</ProjectGuid>
-    <RootNamespace>opengl3_example</RootNamespace>
+    <RootNamespace>example_sdl_opengl2</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+ 0 - 0
examples/sdl_opengl2_example/sdl_opengl2_example.vcxproj.filters → examples/example_sdl_opengl2/example_sdl_opengl2.vcxproj.filters


+ 0 - 0
examples/sdl_opengl2_example/main.cpp → examples/example_sdl_opengl2/main.cpp


+ 1 - 1
examples/sdl_opengl3_example/Makefile → examples/example_sdl_opengl3/Makefile

@@ -14,7 +14,7 @@
 #CXX = g++
 #CXX = clang++
 
-EXE = sdl_opengl3_example
+EXE = example_sdl_opengl3
 SOURCES = main.cpp
 SOURCES += ../imgui_impl_sdl2.cpp ../imgui_impl_opengl3.cpp
 SOURCES += ../../imgui.cpp ../../imgui_demo.cpp ../../imgui_draw.cpp

+ 22 - 0
examples/example_sdl_opengl3/README.md

@@ -0,0 +1,22 @@
+
+# How to Build
+
+- On Windows with Visual Studio's CLI
+
+```
+set SDL2DIR=path_to_your_sdl2_folder
+cl /Zi /MD /I ..\.. /I ..\libs\gl3w /I %SDL2DIR%\include main.cpp ..\imgui_impl_sdl2.cpp ..\imgui_impl_opengl3.cpp ..\..\imgui*.cpp ..\libs\gl3w\GL\gl3w.c /link /libpath:%SDL2DIR%\lib\x86 SDL2.lib SDL2main.lib opengl32.lib /subsystem:console
+```
+
+- On Linux and similar Unixes
+
+```
+c++ `sdl2-config --cflags` -I ../.. -I ../libs/gl3w main.cpp ../imgui_impl_sdl2.cpp ../imgui_impl_opengl3.cpp ../../imgui*.cpp ../libs/gl3w/GL/gl3w.c `sdl2-config --libs` -lGL -ldl
+```
+
+- On Mac OS X
+
+```
+brew install sdl2
+c++ `sdl2-config --cflags` -I ../.. -I ../libs/gl3w main.cpp ../imgui_impl_sdl2.cpp ../imgui_impl_opengl3.cpp ../../imgui*.cpp ../libs/gl3w/GL/gl3w.c `sdl2-config --libs` -framework OpenGl -framework CoreFoundation
+```

+ 1 - 1
examples/sdl_opengl3_example/build_win32.bat → examples/example_sdl_opengl3/build_win32.bat

@@ -1,3 +1,3 @@
 @REM Build for Visual Studio compiler. Run your copy of vcvars32.bat or vcvarsall.bat to setup command-line compiler.
 mkdir Debug
-cl /nologo /Zi /MD /I .. /I ..\.. /I ..\libs\gl3w /I %SDL2_DIR%\include *.cpp ..\imgui_impl_opengl3.cpp ..\imgui_impl_sdl2.cpp ..\..\imgui*.cpp ..\libs\gl3w\GL\gl3w.c /FeDebug/sdl_opengl3_example.exe /FoDebug/ /link /libpath:%SDL2_DIR%\lib\x86 SDL2.lib SDL2main.lib opengl32.lib /subsystem:console
+cl /nologo /Zi /MD /I .. /I ..\.. /I ..\libs\gl3w /I %SDL2_DIR%\include *.cpp ..\imgui_impl_opengl3.cpp ..\imgui_impl_sdl2.cpp ..\..\imgui*.cpp ..\libs\gl3w\GL\gl3w.c /FeDebug/example_sdl_opengl3.exe /FoDebug/ /link /libpath:%SDL2_DIR%\lib\x86 SDL2.lib SDL2main.lib opengl32.lib /subsystem:console

+ 1 - 1
examples/sdl_opengl3_example/sdl_opengl3_example.vcxproj → examples/example_sdl_opengl3/example_sdl_opengl3.vcxproj

@@ -20,7 +20,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{BBAEB705-1669-40F3-8567-04CF6A991F4C}</ProjectGuid>
-    <RootNamespace>opengl3_example</RootNamespace>
+    <RootNamespace>example_sdl_opengl3</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+ 0 - 0
examples/sdl_opengl3_example/sdl_opengl3_example.vcxproj.filters → examples/example_sdl_opengl3/example_sdl_opengl3.vcxproj.filters


+ 0 - 0
examples/sdl_opengl3_example/main.cpp → examples/example_sdl_opengl3/main.cpp


+ 1 - 1
examples/sdl_vulkan_example/sdl_vulkan_example.vcxproj → examples/example_sdl_vulkan/example_sdl_vulkan.vcxproj

@@ -20,7 +20,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{BAE3D0B5-9695-4EB1-AD0F-75890EB4A3B3}</ProjectGuid>
-    <RootNamespace>sdl_vulkan_example</RootNamespace>
+    <RootNamespace>example_sdl_vulkan</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+ 0 - 0
examples/sdl_vulkan_example/sdl_vulkan_example.vcxproj.filters → examples/example_sdl_vulkan/example_sdl_vulkan.vcxproj.filters


+ 0 - 0
examples/sdl_vulkan_example/main.cpp → examples/example_sdl_vulkan/main.cpp


+ 1 - 1
examples/directx10_example/build_win32.bat → examples/example_win32_directx10/build_win32.bat

@@ -1,4 +1,4 @@
 @REM Build for Visual Studio compiler. Run your copy of vcvars32.bat or vcvarsall.bat to setup command-line compiler.
 mkdir Debug
-cl /nologo /Zi /MD /I .. /I ..\.. /I "%WindowsSdkDir%Include\um" /I "%WindowsSdkDir%Include\shared" /I "%DXSDK_DIR%Include" /D UNICODE /D _UNICODE *.cpp ..\imgui_impl_win32.cpp ..\imgui_impl_dx10.cpp ..\..\imgui*.cpp /FeDebug/directx10_example.exe /FoDebug/ /link /LIBPATH:"%DXSDK_DIR%/Lib/x86" d3d10.lib d3dcompiler.lib
+cl /nologo /Zi /MD /I .. /I ..\.. /I "%WindowsSdkDir%Include\um" /I "%WindowsSdkDir%Include\shared" /I "%DXSDK_DIR%Include" /D UNICODE /D _UNICODE *.cpp ..\imgui_impl_win32.cpp ..\imgui_impl_dx10.cpp ..\..\imgui*.cpp /FeDebug/example_win32_directx10.exe /FoDebug/ /link /LIBPATH:"%DXSDK_DIR%/Lib/x86" d3d10.lib d3dcompiler.lib
 

+ 0 - 0
examples/directx10_example/directx10_example.vcxproj → examples/example_win32_directx10/example_win32_directx10.vcxproj


+ 0 - 0
examples/directx10_example/directx10_example.vcxproj.filters → examples/example_win32_directx10/example_win32_directx10.vcxproj.filters


+ 0 - 0
examples/directx10_example/main.cpp → examples/example_win32_directx10/main.cpp


+ 1 - 1
examples/directx11_example/build_win32.bat → examples/example_win32_directx11/build_win32.bat

@@ -1,4 +1,4 @@
 @REM Build for Visual Studio compiler. Run your copy of vcvars32.bat or vcvarsall.bat to setup command-line compiler.
 mkdir Debug
-cl /nologo /Zi /MD /I .. /I ..\.. /I "%WindowsSdkDir%Include\um" /I "%WindowsSdkDir%Include\shared" /I "%DXSDK_DIR%Include" /D UNICODE /D _UNICODE *.cpp ..\imgui_impl_dx11.cpp ..\imgui_impl_win32.cpp ..\..\imgui*.cpp /FeDebug/directx11_example.exe /FoDebug/ /link /LIBPATH:"%DXSDK_DIR%/Lib/x86" d3d11.lib d3dcompiler.lib
+cl /nologo /Zi /MD /I .. /I ..\.. /I "%WindowsSdkDir%Include\um" /I "%WindowsSdkDir%Include\shared" /I "%DXSDK_DIR%Include" /D UNICODE /D _UNICODE *.cpp ..\imgui_impl_dx11.cpp ..\imgui_impl_win32.cpp ..\..\imgui*.cpp /FeDebug/example_win32_directx11.exe /FoDebug/ /link /LIBPATH:"%DXSDK_DIR%/Lib/x86" d3d11.lib d3dcompiler.lib
 

+ 1 - 1
examples/directx11_example/directx11_example.vcxproj → examples/example_win32_directx11/example_win32_directx11.vcxproj

@@ -20,7 +20,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{9F316E83-5AE5-4939-A723-305A94F48005}</ProjectGuid>
-    <RootNamespace>directx11_example</RootNamespace>
+    <RootNamespace>example_win32_directx11</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+ 0 - 0
examples/directx11_example/directx11_example.vcxproj.filters → examples/example_win32_directx11/example_win32_directx11.vcxproj.filters


+ 0 - 0
examples/directx11_example/main.cpp → examples/example_win32_directx11/main.cpp


+ 1 - 1
examples/directx12_example/build_win32.bat → examples/example_win32_directx12/build_win32.bat

@@ -1,4 +1,4 @@
 @REM Build for Visual Studio compiler. Run your copy of vcvars32.bat or vcvarsall.bat to setup command-line compiler.
 mkdir Debug
-cl /nologo /Zi /MD /I .. /I ..\.. /I "%WindowsSdkDir%Include\um" /I "%WindowsSdkDir%Include\shared" /D UNICODE /D _UNICODE *.cpp ..\imgui_impl_dx12.cpp ..\imgui_impl_win32.cpp ..\..\imgui*.cpp /FeDebug/directx12_example.exe /FoDebug/ /link d3d12.lib d3dcompiler.lib dxgi.lib
+cl /nologo /Zi /MD /I .. /I ..\.. /I "%WindowsSdkDir%Include\um" /I "%WindowsSdkDir%Include\shared" /D UNICODE /D _UNICODE *.cpp ..\imgui_impl_dx12.cpp ..\imgui_impl_win32.cpp ..\..\imgui*.cpp /FeDebug/example_win32_directx12.exe /FoDebug/ /link d3d12.lib d3dcompiler.lib dxgi.lib
 

+ 0 - 0
examples/directx12_example/directx12_example.vcxproj → examples/example_win32_directx12/example_win32_directx12.vcxproj


+ 0 - 0
examples/directx12_example/directx12_example.vcxproj.filters → examples/example_win32_directx12/example_win32_directx12.vcxproj.filters


+ 0 - 0
examples/directx12_example/main.cpp → examples/example_win32_directx12/main.cpp


+ 1 - 1
examples/directx9_example/build_win32.bat → examples/example_win32_directx9/build_win32.bat

@@ -1,3 +1,3 @@
 @REM Build for Visual Studio compiler. Run your copy of vcvars32.bat or vcvarsall.bat to setup command-line compiler.
 mkdir Debug
-cl /nologo /Zi /MD /I .. /I ..\.. /I "%DXSDK_DIR%/Include" /D UNICODE /D _UNICODE *.cpp ..\imgui_impl_dx9.cpp ..\imgui_impl_win32.cpp ..\..\imgui*.cpp /FeDebug/directx9_example.exe /FoDebug/ /link /LIBPATH:"%DXSDK_DIR%/Lib/x86" d3d9.lib
+cl /nologo /Zi /MD /I .. /I ..\.. /I "%DXSDK_DIR%/Include" /D UNICODE /D _UNICODE *.cpp ..\imgui_impl_dx9.cpp ..\imgui_impl_win32.cpp ..\..\imgui*.cpp /FeDebug/example_win32_directx9.exe /FoDebug/ /link /LIBPATH:"%DXSDK_DIR%/Lib/x86" d3d9.lib

+ 1 - 1
examples/directx9_example/directx9_example.vcxproj → examples/example_win32_directx9/example_win32_directx9.vcxproj

@@ -20,7 +20,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{4165A294-21F2-44CA-9B38-E3F935ABADF5}</ProjectGuid>
-    <RootNamespace>directx9_example</RootNamespace>
+    <RootNamespace>example_win32_directx9</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+ 0 - 0
examples/directx9_example/directx9_example.vcxproj.filters → examples/example_win32_directx9/example_win32_directx9.vcxproj.filters


+ 0 - 0
examples/directx9_example/main.cpp → examples/example_win32_directx9/main.cpp


+ 5 - 5
examples/imgui_examples.sln

@@ -3,15 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opengl2_example", "opengl2_example\opengl2_example.vcxproj", "{9CDA7840-B7A5-496D-A527-E95571496D18}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_win32_directx9", "example_win32_directx9\example_win32_directx9.vcxproj", "{4165A294-21F2-44CA-9B38-E3F935ABADF5}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "directx9_example", "directx9_example\directx9_example.vcxproj", "{4165A294-21F2-44CA-9B38-E3F935ABADF5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_win32_directx10", "example_win32_directx10\example_win32_directx10.vcxproj", "{345A953E-A004-4648-B442-DC5F9F11068C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "directx11_example", "directx11_example\directx11_example.vcxproj", "{9F316E83-5AE5-4939-A723-305A94F48005}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_win32_directx11", "example_win32_directx11\example_win32_directx11.vcxproj", "{9F316E83-5AE5-4939-A723-305A94F48005}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opengl3_example", "opengl3_example\opengl3_example.vcxproj", "{4A1FB5EA-22F5-42A8-AB92-1D2DF5D47FB9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_glfw_opengl2", "example_glfw_opengl2\example_glfw_opengl2.vcxproj", "{9CDA7840-B7A5-496D-A527-E95571496D18}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "directx10_example", "directx10_example\directx10_example.vcxproj", "{345A953E-A004-4648-B442-DC5F9F11068C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_glfw_opengl3", "example_glfw_opengl3\example_glfw_opengl3.vcxproj", "{4A1FB5EA-22F5-42A8-AB92-1D2DF5D47FB9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+ 0 - 22
examples/sdl_opengl2_example/README.md

@@ -1,22 +0,0 @@
-
-# How to Build
-
-- On Windows with Visual Studio's CLI
-
-```
-set SDL2DIR=path_to_your_sdl2_folder
-cl /Zi /MD /I %SDL2DIR%\include /I ..\.. main.cpp imgui_impl_sdl_gl2.cpp ..\..\imgui*.cpp /link /LIBPATH:%SDL2DIR%\lib SDL2.lib SDL2main.lib opengl32.lib /subsystem:console
-```
-
-- On Linux and similar Unixes
-
-```
-c++ `sdl2-config --cflags` -I ../.. main.cpp imgui_impl_sdl_gl2.cpp ../../imgui*.cpp `sdl2-config --libs` -lGL -o sdl2example
-```
-
-- On Mac OS X
-
-```
-brew install sdl2
-c++ `sdl2-config --cflags` -I ../.. main.cpp imgui_impl_sdl_gl2.cpp ../../imgui*.cpp `sdl2-config --libs` -framework OpenGl -o sdl2example
-```

+ 0 - 22
examples/sdl_opengl3_example/README.md

@@ -1,22 +0,0 @@
-
-# How to Build
-
-- On Windows with Visual Studio's CLI
-
-```
-set SDL2DIR=path_to_your_sdl2_folder
-cl /Zi /MD /I ..\.. /I ..\libs\gl3w /I %SDL2DIR%\include main.cpp imgui_impl_sdl_gl3.cpp ..\..\imgui*.cpp ..\libs\gl3w\GL\gl3w.c /link /libpath:%SDL2DIR%\lib\x86 SDL2.lib SDL2main.lib opengl32.lib /subsystem:console
-```
-
-- On Linux and similar Unixes
-
-```
-c++ `sdl2-config --cflags` -I ../.. -I ../libs/gl3w main.cpp imgui_impl_sdl_gl3.cpp ../../imgui*.cpp ../libs/gl3w/GL/gl3w.c `sdl2-config --libs` -lGL -ldl -o sdl2example
-```
-
-- On Mac OS X
-
-```
-brew install sdl2
-c++ `sdl2-config --cflags` -I ../.. -I ../libs/gl3w main.cpp imgui_impl_sdl_gl3.cpp ../../imgui*.cpp ../libs/gl3w/GL/gl3w.c `sdl2-config --libs` -framework OpenGl -framework CoreFoundation -o sdl2example
-```

+ 0 - 7
examples/vulkan_example/build_win32.bat

@@ -1,7 +0,0 @@
-@REM Build for Visual Studio compiler. Run your copy of vcvars32.bat or vcvarsall.bat to setup command-line compiler.
-
-mkdir Debug
-cl /nologo /Zi /MD /I .. /I ..\.. /I ..\libs\glfw\include /I %VULKAN_SDK%\include *.cpp ..\imgui_impl_vulkan.cpp ..\imgui_impl_glfw.cpp ..\..\imgui*.cpp /FeDebug/vulkan_example.exe /FoDebug/ /link /LIBPATH:..\libs\glfw\lib-vc2010-32 /libpath:%VULKAN_SDK%\lib32 glfw3.lib opengl32.lib gdi32.lib shell32.lib vulkan-1.lib
-
-mkdir Release
-cl /nologo /Zi /MD /Ox /Oi /I .. /I ..\.. /I ..\libs\glfw\include /I %VULKAN_SDK%\include *.cpp ..\imgui_impl_vulkan.cpp ..\imgui_impl_glfw.cpp ..\..\imgui*.cpp /FeRelease/vulkan_example.exe /FoRelease/ /link /LIBPATH:..\libs\glfw\lib-vc2010-32 /libpath:%VULKAN_SDK%\lib32 glfw3.lib opengl32.lib gdi32.lib shell32.lib vulkan-1.lib

+ 0 - 7
examples/vulkan_example/build_win64.bat

@@ -1,7 +0,0 @@
-@REM Build for Visual Studio compiler. Run your copy of amd64/vcvars32.bat to setup 64-bit command-line compiler.
-
-mkdir Debug
-cl /nologo /Zi /MD /I .. /I ..\.. /I ..\libs\glfw\include /I %VULKAN_SDK%\include *.cpp ..\imgui_impl_vulkan.cpp ..\imgui_impl_glfw.cpp ..\..\imgui*.cpp /FeDebug/vulkan_example.exe /FoDebug/ /link /LIBPATH:..\libs\glfw\lib-vc2010-64 /libpath:%VULKAN_SDK%\lib glfw3.lib opengl32.lib gdi32.lib shell32.lib vulkan-1.lib
-
-mkdir Release
-cl /nologo /Zi /MD /Ox /Oi /I .. /I ..\.. /I ..\libs\glfw\include /I %VULKAN_SDK%\include *.cpp ..\imgui_impl_vulkan.cpp ..\imgui_impl_glfw.cpp ..\..\imgui*.cpp /FeRelease/vulkan_example.exe /FoRelease/ /link /LIBPATH:..\libs\glfw\lib-vc2010-64 /libpath:%VULKAN_SDK%\lib glfw3.lib opengl32.lib gdi32.lib shell32.lib vulkan-1.lib