diff --git a/examples/.gitignore b/examples/.gitignore index ff44bccb7..db2859e1d 100644 --- a/examples/.gitignore +++ b/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 diff --git a/examples/README.txt b/examples/README.txt index f9afc6db2..ecc9db14c 100644 --- a/examples/README.txt +++ b/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 diff --git a/examples/allegro5_example/README.md b/examples/example_allegro5/README.md similarity index 89% rename from examples/allegro5_example/README.md rename to examples/example_allegro5/README.md index f15b5fda9..783839db3 100644 --- a/examples/allegro5_example/README.md +++ b/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 ``` diff --git a/examples/allegro5_example/imconfig_allegro5.h b/examples/example_allegro5/imconfig_allegro5.h similarity index 100% rename from examples/allegro5_example/imconfig_allegro5.h rename to examples/example_allegro5/imconfig_allegro5.h diff --git a/examples/allegro5_example/main.cpp b/examples/example_allegro5/main.cpp similarity index 100% rename from examples/allegro5_example/main.cpp rename to examples/example_allegro5/main.cpp diff --git a/examples/apple_example/.gitignore b/examples/example_apple/.gitignore similarity index 100% rename from examples/apple_example/.gitignore rename to examples/example_apple/.gitignore diff --git a/examples/apple_example/README.md b/examples/example_apple/README.md similarity index 96% rename from examples/apple_example/README.md rename to examples/example_apple/README.md index 339f6bf85..d414d1333 100644 --- a/examples/apple_example/README.md +++ b/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. diff --git a/examples/apple_example/imguiex-ios/AppDelegate.h b/examples/example_apple/imguiex-ios/AppDelegate.h similarity index 100% rename from examples/apple_example/imguiex-ios/AppDelegate.h rename to examples/example_apple/imguiex-ios/AppDelegate.h diff --git a/examples/apple_example/imguiex-ios/AppDelegate.m b/examples/example_apple/imguiex-ios/AppDelegate.m similarity index 100% rename from examples/apple_example/imguiex-ios/AppDelegate.m rename to examples/example_apple/imguiex-ios/AppDelegate.m diff --git a/examples/apple_example/imguiex-ios/Base.lproj/LaunchScreen.xib b/examples/example_apple/imguiex-ios/Base.lproj/LaunchScreen.xib similarity index 100% rename from examples/apple_example/imguiex-ios/Base.lproj/LaunchScreen.xib rename to examples/example_apple/imguiex-ios/Base.lproj/LaunchScreen.xib diff --git a/examples/apple_example/imguiex-ios/Base.lproj/Main.storyboard b/examples/example_apple/imguiex-ios/Base.lproj/Main.storyboard similarity index 100% rename from examples/apple_example/imguiex-ios/Base.lproj/Main.storyboard rename to examples/example_apple/imguiex-ios/Base.lproj/Main.storyboard diff --git a/examples/apple_example/imguiex-ios/GameViewController.h b/examples/example_apple/imguiex-ios/GameViewController.h similarity index 100% rename from examples/apple_example/imguiex-ios/GameViewController.h rename to examples/example_apple/imguiex-ios/GameViewController.h diff --git a/examples/apple_example/imguiex-ios/GameViewController.m b/examples/example_apple/imguiex-ios/GameViewController.m similarity index 100% rename from examples/apple_example/imguiex-ios/GameViewController.m rename to examples/example_apple/imguiex-ios/GameViewController.m diff --git a/examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/Contents.json b/examples/example_apple/imguiex-ios/Images.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/Contents.json rename to examples/example_apple/imguiex-ios/Images.xcassets/AppIcon.appiconset/Contents.json diff --git a/examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_60@2x~iphone.png b/examples/example_apple/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_60@2x~iphone.png similarity index 100% rename from examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_60@2x~iphone.png rename to examples/example_apple/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_60@2x~iphone.png diff --git a/examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_60@3x~iphone.png b/examples/example_apple/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_60@3x~iphone.png similarity index 100% rename from examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_60@3x~iphone.png rename to examples/example_apple/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_60@3x~iphone.png diff --git a/examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_76@2x~ipad.png b/examples/example_apple/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_76@2x~ipad.png similarity index 100% rename from examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_76@2x~ipad.png rename to examples/example_apple/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_76@2x~ipad.png diff --git a/examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_76~ipad.png b/examples/example_apple/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_76~ipad.png similarity index 100% rename from examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_76~ipad.png rename to examples/example_apple/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_76~ipad.png diff --git a/examples/apple_example/imguiex-ios/Info.plist b/examples/example_apple/imguiex-ios/Info.plist similarity index 100% rename from examples/apple_example/imguiex-ios/Info.plist rename to examples/example_apple/imguiex-ios/Info.plist diff --git a/examples/apple_example/imguiex-ios/Shaders/Shader.fsh b/examples/example_apple/imguiex-ios/Shaders/Shader.fsh similarity index 100% rename from examples/apple_example/imguiex-ios/Shaders/Shader.fsh rename to examples/example_apple/imguiex-ios/Shaders/Shader.fsh diff --git a/examples/apple_example/imguiex-ios/Shaders/Shader.vsh b/examples/example_apple/imguiex-ios/Shaders/Shader.vsh similarity index 100% rename from examples/apple_example/imguiex-ios/Shaders/Shader.vsh rename to examples/example_apple/imguiex-ios/Shaders/Shader.vsh diff --git a/examples/apple_example/imguiex-ios/debug_hud.cpp b/examples/example_apple/imguiex-ios/debug_hud.cpp similarity index 100% rename from examples/apple_example/imguiex-ios/debug_hud.cpp rename to examples/example_apple/imguiex-ios/debug_hud.cpp diff --git a/examples/apple_example/imguiex-ios/debug_hud.h b/examples/example_apple/imguiex-ios/debug_hud.h similarity index 100% rename from examples/apple_example/imguiex-ios/debug_hud.h rename to examples/example_apple/imguiex-ios/debug_hud.h diff --git a/examples/apple_example/imguiex-ios/imgui_ex_icon.png b/examples/example_apple/imguiex-ios/imgui_ex_icon.png similarity index 100% rename from examples/apple_example/imguiex-ios/imgui_ex_icon.png rename to examples/example_apple/imguiex-ios/imgui_ex_icon.png diff --git a/examples/apple_example/imguiex-ios/imgui_impl_ios.h b/examples/example_apple/imguiex-ios/imgui_impl_ios.h similarity index 100% rename from examples/apple_example/imguiex-ios/imgui_impl_ios.h rename to examples/example_apple/imguiex-ios/imgui_impl_ios.h diff --git a/examples/apple_example/imguiex-ios/imgui_impl_ios.mm b/examples/example_apple/imguiex-ios/imgui_impl_ios.mm similarity index 100% rename from examples/apple_example/imguiex-ios/imgui_impl_ios.mm rename to examples/example_apple/imguiex-ios/imgui_impl_ios.mm diff --git a/examples/apple_example/imguiex-ios/main.m b/examples/example_apple/imguiex-ios/main.m similarity index 100% rename from examples/apple_example/imguiex-ios/main.m rename to examples/example_apple/imguiex-ios/main.m diff --git a/examples/apple_example/imguiex-osx/AppDelegate.h b/examples/example_apple/imguiex-osx/AppDelegate.h similarity index 100% rename from examples/apple_example/imguiex-osx/AppDelegate.h rename to examples/example_apple/imguiex-osx/AppDelegate.h diff --git a/examples/apple_example/imguiex-osx/AppDelegate.m b/examples/example_apple/imguiex-osx/AppDelegate.m similarity index 100% rename from examples/apple_example/imguiex-osx/AppDelegate.m rename to examples/example_apple/imguiex-osx/AppDelegate.m diff --git a/examples/apple_example/imguiex-osx/Assets.xcassets/AppIcon.appiconset/Contents.json b/examples/example_apple/imguiex-osx/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from examples/apple_example/imguiex-osx/Assets.xcassets/AppIcon.appiconset/Contents.json rename to examples/example_apple/imguiex-osx/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/examples/apple_example/imguiex-osx/Assets.xcassets/AppIcon.appiconset/icon_imgui_180x180.png b/examples/example_apple/imguiex-osx/Assets.xcassets/AppIcon.appiconset/icon_imgui_180x180.png similarity index 100% rename from examples/apple_example/imguiex-osx/Assets.xcassets/AppIcon.appiconset/icon_imgui_180x180.png rename to examples/example_apple/imguiex-osx/Assets.xcassets/AppIcon.appiconset/icon_imgui_180x180.png diff --git a/examples/apple_example/imguiex-osx/Assets.xcassets/Contents.json b/examples/example_apple/imguiex-osx/Assets.xcassets/Contents.json similarity index 100% rename from examples/apple_example/imguiex-osx/Assets.xcassets/Contents.json rename to examples/example_apple/imguiex-osx/Assets.xcassets/Contents.json diff --git a/examples/apple_example/imguiex-osx/Info.plist b/examples/example_apple/imguiex-osx/Info.plist similarity index 100% rename from examples/apple_example/imguiex-osx/Info.plist rename to examples/example_apple/imguiex-osx/Info.plist diff --git a/examples/apple_example/imguiex-osx/main.m b/examples/example_apple/imguiex-osx/main.m similarity index 100% rename from examples/apple_example/imguiex-osx/main.m rename to examples/example_apple/imguiex-osx/main.m diff --git a/examples/apple_example/imguiex.xcodeproj/project.pbxproj b/examples/example_apple/imguiex.xcodeproj/project.pbxproj similarity index 100% rename from examples/apple_example/imguiex.xcodeproj/project.pbxproj rename to examples/example_apple/imguiex.xcodeproj/project.pbxproj diff --git a/examples/opengl2_example/Makefile b/examples/example_glfw_opengl2/Makefile similarity index 98% rename from examples/opengl2_example/Makefile rename to examples/example_glfw_opengl2/Makefile index 36f8baa59..7ec7eeee0 100644 --- a/examples/opengl2_example/Makefile +++ b/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 diff --git a/examples/opengl2_example/build_win32.bat b/examples/example_glfw_opengl2/build_win32.bat similarity index 65% rename from examples/opengl2_example/build_win32.bat rename to examples/example_glfw_opengl2/build_win32.bat index c7a8073a8..538d9a52b 100644 --- a/examples/opengl2_example/build_win32.bat +++ b/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 diff --git a/examples/opengl2_example/opengl2_example.vcxproj b/examples/example_glfw_opengl2/example_glfw_opengl2.vcxproj similarity index 99% rename from examples/opengl2_example/opengl2_example.vcxproj rename to examples/example_glfw_opengl2/example_glfw_opengl2.vcxproj index 927ddfa54..acec434b7 100644 --- a/examples/opengl2_example/opengl2_example.vcxproj +++ b/examples/example_glfw_opengl2/example_glfw_opengl2.vcxproj @@ -20,7 +20,7 @@ {9CDA7840-B7A5-496D-A527-E95571496D18} - opengl2_example + example_glfw_opengl2 diff --git a/examples/opengl2_example/opengl2_example.vcxproj.filters b/examples/example_glfw_opengl2/example_glfw_opengl2.vcxproj.filters similarity index 100% rename from examples/opengl2_example/opengl2_example.vcxproj.filters rename to examples/example_glfw_opengl2/example_glfw_opengl2.vcxproj.filters diff --git a/examples/opengl2_example/main.cpp b/examples/example_glfw_opengl2/main.cpp similarity index 100% rename from examples/opengl2_example/main.cpp rename to examples/example_glfw_opengl2/main.cpp diff --git a/examples/opengl3_example/Makefile b/examples/example_glfw_opengl3/Makefile similarity index 98% rename from examples/opengl3_example/Makefile rename to examples/example_glfw_opengl3/Makefile index c6ce9a488..8cfc9f302 100644 --- a/examples/opengl3_example/Makefile +++ b/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 diff --git a/examples/opengl3_example/build_win32.bat b/examples/example_glfw_opengl3/build_win32.bat similarity index 60% rename from examples/opengl3_example/build_win32.bat rename to examples/example_glfw_opengl3/build_win32.bat index f6f021689..8b54affda 100644 --- a/examples/opengl3_example/build_win32.bat +++ b/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 diff --git a/examples/opengl3_example/opengl3_example.vcxproj b/examples/example_glfw_opengl3/example_glfw_opengl3.vcxproj similarity index 99% rename from examples/opengl3_example/opengl3_example.vcxproj rename to examples/example_glfw_opengl3/example_glfw_opengl3.vcxproj index 34bae2511..07f28e303 100644 --- a/examples/opengl3_example/opengl3_example.vcxproj +++ b/examples/example_glfw_opengl3/example_glfw_opengl3.vcxproj @@ -20,7 +20,7 @@ {4a1fb5ea-22f5-42a8-ab92-1d2df5d47fb9} - opengl3_example + example_glfw_opengl3 diff --git a/examples/opengl3_example/opengl3_example.vcxproj.filters b/examples/example_glfw_opengl3/example_glfw_opengl3.vcxproj.filters similarity index 100% rename from examples/opengl3_example/opengl3_example.vcxproj.filters rename to examples/example_glfw_opengl3/example_glfw_opengl3.vcxproj.filters diff --git a/examples/opengl3_example/main.cpp b/examples/example_glfw_opengl3/main.cpp similarity index 100% rename from examples/opengl3_example/main.cpp rename to examples/example_glfw_opengl3/main.cpp diff --git a/examples/vulkan_example/CMakeLists.txt b/examples/example_glfw_vulkan/CMakeLists.txt similarity index 76% rename from examples/vulkan_example/CMakeLists.txt rename to examples/example_glfw_vulkan/CMakeLists.txt index d05b45163..f9adc77e0 100644 --- a/examples/vulkan_example/CMakeLists.txt +++ b/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}) diff --git a/examples/example_glfw_vulkan/build_win32.bat b/examples/example_glfw_vulkan/build_win32.bat new file mode 100644 index 000000000..0d991b9d2 --- /dev/null +++ b/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 diff --git a/examples/example_glfw_vulkan/build_win64.bat b/examples/example_glfw_vulkan/build_win64.bat new file mode 100644 index 000000000..ddedf597c --- /dev/null +++ b/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 diff --git a/examples/vulkan_example/vulkan_example.vcxproj b/examples/example_glfw_vulkan/example_glfw_vulkan.vcxproj similarity index 99% rename from examples/vulkan_example/vulkan_example.vcxproj rename to examples/example_glfw_vulkan/example_glfw_vulkan.vcxproj index 3a0a99471..04b550822 100644 --- a/examples/vulkan_example/vulkan_example.vcxproj +++ b/examples/example_glfw_vulkan/example_glfw_vulkan.vcxproj @@ -20,7 +20,7 @@ {57E2DF5A-6FC8-45BB-99DD-91A18C646E80} - vulkan_example + example_glfw_vulkan diff --git a/examples/vulkan_example/vulkan_example.vcxproj.filters b/examples/example_glfw_vulkan/example_glfw_vulkan.vcxproj.filters similarity index 100% rename from examples/vulkan_example/vulkan_example.vcxproj.filters rename to examples/example_glfw_vulkan/example_glfw_vulkan.vcxproj.filters diff --git a/examples/vulkan_example/gen_spv.sh b/examples/example_glfw_vulkan/gen_spv.sh similarity index 100% rename from examples/vulkan_example/gen_spv.sh rename to examples/example_glfw_vulkan/gen_spv.sh diff --git a/examples/vulkan_example/glsl_shader.frag b/examples/example_glfw_vulkan/glsl_shader.frag similarity index 100% rename from examples/vulkan_example/glsl_shader.frag rename to examples/example_glfw_vulkan/glsl_shader.frag diff --git a/examples/vulkan_example/glsl_shader.vert b/examples/example_glfw_vulkan/glsl_shader.vert similarity index 100% rename from examples/vulkan_example/glsl_shader.vert rename to examples/example_glfw_vulkan/glsl_shader.vert diff --git a/examples/vulkan_example/main.cpp b/examples/example_glfw_vulkan/main.cpp similarity index 100% rename from examples/vulkan_example/main.cpp rename to examples/example_glfw_vulkan/main.cpp diff --git a/examples/marmalade_example/data/app.icf b/examples/example_marmalade/data/app.icf similarity index 100% rename from examples/marmalade_example/data/app.icf rename to examples/example_marmalade/data/app.icf diff --git a/examples/marmalade_example/main.cpp b/examples/example_marmalade/main.cpp similarity index 100% rename from examples/marmalade_example/main.cpp rename to examples/example_marmalade/main.cpp diff --git a/examples/marmalade_example/marmalade_example.mkb b/examples/example_marmalade/marmalade_example.mkb similarity index 100% rename from examples/marmalade_example/marmalade_example.mkb rename to examples/example_marmalade/marmalade_example.mkb diff --git a/examples/null_example/build_win32.bat b/examples/example_null/build_win32.bat similarity index 54% rename from examples/null_example/build_win32.bat rename to examples/example_null/build_win32.bat index 7bb78232a..12cb70ab4 100644 --- a/examples/null_example/build_win32.bat +++ b/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 diff --git a/examples/null_example/main.cpp b/examples/example_null/main.cpp similarity index 100% rename from examples/null_example/main.cpp rename to examples/example_null/main.cpp diff --git a/examples/sdl_opengl2_example/Makefile b/examples/example_sdl_opengl2/Makefile similarity index 98% rename from examples/sdl_opengl2_example/Makefile rename to examples/example_sdl_opengl2/Makefile index 1fa4a91d7..8f008b8af 100644 --- a/examples/sdl_opengl2_example/Makefile +++ b/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)))) diff --git a/examples/example_sdl_opengl2/README.md b/examples/example_sdl_opengl2/README.md new file mode 100644 index 000000000..6d4ce25c8 --- /dev/null +++ b/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 +``` diff --git a/examples/sdl_opengl2_example/build_win32.bat b/examples/example_sdl_opengl2/build_win32.bat similarity index 70% rename from examples/sdl_opengl2_example/build_win32.bat rename to examples/example_sdl_opengl2/build_win32.bat index be0f75a72..0493a72c7 100644 --- a/examples/sdl_opengl2_example/build_win32.bat +++ b/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 diff --git a/examples/sdl_opengl2_example/sdl_opengl2_example.vcxproj b/examples/example_sdl_opengl2/example_sdl_opengl2.vcxproj similarity index 99% rename from examples/sdl_opengl2_example/sdl_opengl2_example.vcxproj rename to examples/example_sdl_opengl2/example_sdl_opengl2.vcxproj index 6bc24caa8..e6d3e79e8 100644 --- a/examples/sdl_opengl2_example/sdl_opengl2_example.vcxproj +++ b/examples/example_sdl_opengl2/example_sdl_opengl2.vcxproj @@ -20,7 +20,7 @@ {2AE17FDE-F7F3-4CAC-ADAB-0710EDA4F741} - opengl3_example + example_sdl_opengl2 diff --git a/examples/sdl_opengl2_example/sdl_opengl2_example.vcxproj.filters b/examples/example_sdl_opengl2/example_sdl_opengl2.vcxproj.filters similarity index 100% rename from examples/sdl_opengl2_example/sdl_opengl2_example.vcxproj.filters rename to examples/example_sdl_opengl2/example_sdl_opengl2.vcxproj.filters diff --git a/examples/sdl_opengl2_example/main.cpp b/examples/example_sdl_opengl2/main.cpp similarity index 100% rename from examples/sdl_opengl2_example/main.cpp rename to examples/example_sdl_opengl2/main.cpp diff --git a/examples/sdl_opengl3_example/Makefile b/examples/example_sdl_opengl3/Makefile similarity index 98% rename from examples/sdl_opengl3_example/Makefile rename to examples/example_sdl_opengl3/Makefile index 3870ec86c..d2f71f69e 100644 --- a/examples/sdl_opengl3_example/Makefile +++ b/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 diff --git a/examples/example_sdl_opengl3/README.md b/examples/example_sdl_opengl3/README.md new file mode 100644 index 000000000..8a7741e1d --- /dev/null +++ b/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 +``` diff --git a/examples/sdl_opengl3_example/build_win32.bat b/examples/example_sdl_opengl3/build_win32.bat similarity index 70% rename from examples/sdl_opengl3_example/build_win32.bat rename to examples/example_sdl_opengl3/build_win32.bat index e933a8622..c0403d3f9 100644 --- a/examples/sdl_opengl3_example/build_win32.bat +++ b/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 diff --git a/examples/sdl_opengl3_example/sdl_opengl3_example.vcxproj b/examples/example_sdl_opengl3/example_sdl_opengl3.vcxproj similarity index 99% rename from examples/sdl_opengl3_example/sdl_opengl3_example.vcxproj rename to examples/example_sdl_opengl3/example_sdl_opengl3.vcxproj index c8ebb094a..3753caca2 100644 --- a/examples/sdl_opengl3_example/sdl_opengl3_example.vcxproj +++ b/examples/example_sdl_opengl3/example_sdl_opengl3.vcxproj @@ -20,7 +20,7 @@ {BBAEB705-1669-40F3-8567-04CF6A991F4C} - opengl3_example + example_sdl_opengl3 diff --git a/examples/sdl_opengl3_example/sdl_opengl3_example.vcxproj.filters b/examples/example_sdl_opengl3/example_sdl_opengl3.vcxproj.filters similarity index 100% rename from examples/sdl_opengl3_example/sdl_opengl3_example.vcxproj.filters rename to examples/example_sdl_opengl3/example_sdl_opengl3.vcxproj.filters diff --git a/examples/sdl_opengl3_example/main.cpp b/examples/example_sdl_opengl3/main.cpp similarity index 100% rename from examples/sdl_opengl3_example/main.cpp rename to examples/example_sdl_opengl3/main.cpp diff --git a/examples/sdl_vulkan_example/sdl_vulkan_example.vcxproj b/examples/example_sdl_vulkan/example_sdl_vulkan.vcxproj similarity index 99% rename from examples/sdl_vulkan_example/sdl_vulkan_example.vcxproj rename to examples/example_sdl_vulkan/example_sdl_vulkan.vcxproj index 8b4d648c8..42146cd17 100644 --- a/examples/sdl_vulkan_example/sdl_vulkan_example.vcxproj +++ b/examples/example_sdl_vulkan/example_sdl_vulkan.vcxproj @@ -20,7 +20,7 @@ {BAE3D0B5-9695-4EB1-AD0F-75890EB4A3B3} - sdl_vulkan_example + example_sdl_vulkan diff --git a/examples/sdl_vulkan_example/sdl_vulkan_example.vcxproj.filters b/examples/example_sdl_vulkan/example_sdl_vulkan.vcxproj.filters similarity index 100% rename from examples/sdl_vulkan_example/sdl_vulkan_example.vcxproj.filters rename to examples/example_sdl_vulkan/example_sdl_vulkan.vcxproj.filters diff --git a/examples/sdl_vulkan_example/main.cpp b/examples/example_sdl_vulkan/main.cpp similarity index 100% rename from examples/sdl_vulkan_example/main.cpp rename to examples/example_sdl_vulkan/main.cpp diff --git a/examples/directx10_example/build_win32.bat b/examples/example_win32_directx10/build_win32.bat similarity index 70% rename from examples/directx10_example/build_win32.bat rename to examples/example_win32_directx10/build_win32.bat index 9d806ab74..d79cb8f7b 100644 --- a/examples/directx10_example/build_win32.bat +++ b/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 diff --git a/examples/directx10_example/directx10_example.vcxproj b/examples/example_win32_directx10/example_win32_directx10.vcxproj similarity index 100% rename from examples/directx10_example/directx10_example.vcxproj rename to examples/example_win32_directx10/example_win32_directx10.vcxproj diff --git a/examples/directx10_example/directx10_example.vcxproj.filters b/examples/example_win32_directx10/example_win32_directx10.vcxproj.filters similarity index 100% rename from examples/directx10_example/directx10_example.vcxproj.filters rename to examples/example_win32_directx10/example_win32_directx10.vcxproj.filters diff --git a/examples/directx10_example/main.cpp b/examples/example_win32_directx10/main.cpp similarity index 100% rename from examples/directx10_example/main.cpp rename to examples/example_win32_directx10/main.cpp diff --git a/examples/directx11_example/build_win32.bat b/examples/example_win32_directx11/build_win32.bat similarity index 70% rename from examples/directx11_example/build_win32.bat rename to examples/example_win32_directx11/build_win32.bat index eefeed985..05e6a6f6c 100644 --- a/examples/directx11_example/build_win32.bat +++ b/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 diff --git a/examples/directx11_example/directx11_example.vcxproj b/examples/example_win32_directx11/example_win32_directx11.vcxproj similarity index 99% rename from examples/directx11_example/directx11_example.vcxproj rename to examples/example_win32_directx11/example_win32_directx11.vcxproj index 77f56fead..9aa098658 100644 --- a/examples/directx11_example/directx11_example.vcxproj +++ b/examples/example_win32_directx11/example_win32_directx11.vcxproj @@ -20,7 +20,7 @@ {9F316E83-5AE5-4939-A723-305A94F48005} - directx11_example + example_win32_directx11 diff --git a/examples/directx11_example/directx11_example.vcxproj.filters b/examples/example_win32_directx11/example_win32_directx11.vcxproj.filters similarity index 100% rename from examples/directx11_example/directx11_example.vcxproj.filters rename to examples/example_win32_directx11/example_win32_directx11.vcxproj.filters diff --git a/examples/directx11_example/main.cpp b/examples/example_win32_directx11/main.cpp similarity index 100% rename from examples/directx11_example/main.cpp rename to examples/example_win32_directx11/main.cpp diff --git a/examples/directx12_example/build_win32.bat b/examples/example_win32_directx12/build_win32.bat similarity index 78% rename from examples/directx12_example/build_win32.bat rename to examples/example_win32_directx12/build_win32.bat index 066e37cbf..2cd7fcdff 100644 --- a/examples/directx12_example/build_win32.bat +++ b/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 diff --git a/examples/directx12_example/directx12_example.vcxproj b/examples/example_win32_directx12/example_win32_directx12.vcxproj similarity index 100% rename from examples/directx12_example/directx12_example.vcxproj rename to examples/example_win32_directx12/example_win32_directx12.vcxproj diff --git a/examples/directx12_example/directx12_example.vcxproj.filters b/examples/example_win32_directx12/example_win32_directx12.vcxproj.filters similarity index 100% rename from examples/directx12_example/directx12_example.vcxproj.filters rename to examples/example_win32_directx12/example_win32_directx12.vcxproj.filters diff --git a/examples/directx12_example/main.cpp b/examples/example_win32_directx12/main.cpp similarity index 100% rename from examples/directx12_example/main.cpp rename to examples/example_win32_directx12/main.cpp diff --git a/examples/directx9_example/build_win32.bat b/examples/example_win32_directx9/build_win32.bat similarity index 69% rename from examples/directx9_example/build_win32.bat rename to examples/example_win32_directx9/build_win32.bat index 767438650..4db27653e 100644 --- a/examples/directx9_example/build_win32.bat +++ b/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 diff --git a/examples/directx9_example/directx9_example.vcxproj b/examples/example_win32_directx9/example_win32_directx9.vcxproj similarity index 99% rename from examples/directx9_example/directx9_example.vcxproj rename to examples/example_win32_directx9/example_win32_directx9.vcxproj index 83d06f603..ebc8a921b 100644 --- a/examples/directx9_example/directx9_example.vcxproj +++ b/examples/example_win32_directx9/example_win32_directx9.vcxproj @@ -20,7 +20,7 @@ {4165A294-21F2-44CA-9B38-E3F935ABADF5} - directx9_example + example_win32_directx9 diff --git a/examples/directx9_example/directx9_example.vcxproj.filters b/examples/example_win32_directx9/example_win32_directx9.vcxproj.filters similarity index 100% rename from examples/directx9_example/directx9_example.vcxproj.filters rename to examples/example_win32_directx9/example_win32_directx9.vcxproj.filters diff --git a/examples/directx9_example/main.cpp b/examples/example_win32_directx9/main.cpp similarity index 100% rename from examples/directx9_example/main.cpp rename to examples/example_win32_directx9/main.cpp diff --git a/examples/imgui_examples.sln b/examples/imgui_examples.sln index 6ae2e4f16..49b2ff89a 100644 --- a/examples/imgui_examples.sln +++ b/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 diff --git a/examples/sdl_opengl2_example/README.md b/examples/sdl_opengl2_example/README.md deleted file mode 100644 index a1a44a584..000000000 --- a/examples/sdl_opengl2_example/README.md +++ /dev/null @@ -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 -``` diff --git a/examples/sdl_opengl3_example/README.md b/examples/sdl_opengl3_example/README.md deleted file mode 100644 index a982ff568..000000000 --- a/examples/sdl_opengl3_example/README.md +++ /dev/null @@ -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 -``` diff --git a/examples/vulkan_example/build_win32.bat b/examples/vulkan_example/build_win32.bat deleted file mode 100644 index e57893016..000000000 --- a/examples/vulkan_example/build_win32.bat +++ /dev/null @@ -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 diff --git a/examples/vulkan_example/build_win64.bat b/examples/vulkan_example/build_win64.bat deleted file mode 100644 index 871370c5a..000000000 --- a/examples/vulkan_example/build_win64.bat +++ /dev/null @@ -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