Browse code Merge latest from ocornut/imgui docking features/draw_callback_extra_arg features/fnv1a features/imvector_size_t features/premake features/range_select features/tex_round_corners master v1.67-fixes v1.71 v1.70 v1.69 v1.68 v1.67 v1.66b v1.66 v1.65 v1.64 v1.63 v1.62 v1.61 v1.60
commit 30954b4a88bff0ff5f6d65c8e76002acecf3f475 2 parents f6181b3 + 6384eee Jefferson Montgomery authored on 13 Mar 2017 Jefferson Montgomery committed on 13 Mar 2017

Showing 133 changed files

• .travis.yml
• README.md
• examples/.gitignore
• examples/README.txt
• examples/allegro5_example/imgui_impl_a5.cpp
• examples/allegro5_example/imgui_impl_a5.h
• examples/allegro5_example/main.cpp
• examples/apple_example/.gitignore
• examples/apple_example/README.md
• examples/apple_example/imguiex-ios/AppDelegate.h
• examples/apple_example/imguiex-ios/AppDelegate.m
• examples/apple_example/imguiex-ios/Base.lproj/LaunchScreen.xib
• examples/apple_example/imguiex-ios/Base.lproj/Main.storyboard
• examples/apple_example/imguiex-ios/GameViewController.h
• examples/apple_example/imguiex-ios/GameViewController.m
• examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/Contents.json
• examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_60@2x~iphone.png
• examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_60@3x~iphone.png
• examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_76@2x~ipad.png
• examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_76~ipad.png
• examples/apple_example/imguiex-ios/Info.plist
• examples/apple_example/imguiex-ios/Shaders/Shader.fsh
• examples/apple_example/imguiex-ios/Shaders/Shader.vsh
• examples/apple_example/imguiex-ios/debug_hud.cpp
• examples/apple_example/imguiex-ios/debug_hud.h
• examples/apple_example/imguiex-ios/imgui_ex_icon.png
• examples/apple_example/imguiex-ios/imgui_impl_ios.h
• examples/apple_example/imguiex-ios/imgui_impl_ios.mm
• examples/apple_example/imguiex-ios/main.m
• examples/apple_example/imguiex-osx/AppDelegate.h
• examples/apple_example/imguiex-osx/AppDelegate.m
• examples/apple_example/imguiex-osx/Assets.xcassets/AppIcon.appiconset/Contents.json
• examples/apple_example/imguiex-osx/Assets.xcassets/AppIcon.appiconset/icon_imgui_180x180.png
• examples/apple_example/imguiex-osx/Assets.xcassets/Contents.json
• examples/apple_example/imguiex-osx/Info.plist
• examples/apple_example/imguiex-osx/main.m
• examples/apple_example/imguiex.xcodeproj/project.pbxproj
• examples/directx10_example/imgui_impl_dx10.cpp
• examples/directx10_example/imgui_impl_dx10.h
• examples/directx10_example/main.cpp
• examples/directx11_example/imgui_impl_dx11.cpp
• examples/directx11_example/imgui_impl_dx11.h
• examples/directx11_example/main.cpp
• examples/directx12_example/build_win32.bat
• examples/directx12_example/directx12_example.vcxproj
• examples/directx12_example/directx12_example.vcxproj.filters
• examples/directx12_example/imgui_impl_dx12.cpp
• examples/directx12_example/imgui_impl_dx12.h
• examples/directx12_example/main.cpp
• examples/directx9_example/build_win32.bat
• examples/directx9_example/directx9_example.vcxproj
• examples/directx9_example/imgui_impl_dx9.cpp
• examples/directx9_example/imgui_impl_dx9.h
• examples/directx9_example/main.cpp
• examples/imgui_examples_msvc2010.sln
• examples/ios_example/.gitignore
• examples/ios_example/README.md
• examples/ios_example/imguiex.xcodeproj/project.pbxproj
• examples/ios_example/imguiex/AppDelegate.h
• examples/ios_example/imguiex/AppDelegate.m
• examples/ios_example/imguiex/Base.lproj/LaunchScreen.xib
• examples/ios_example/imguiex/Base.lproj/Main.storyboard
• examples/ios_example/imguiex/GameViewController.h
• examples/ios_example/imguiex/GameViewController.m
• examples/ios_example/imguiex/Images.xcassets/AppIcon.appiconset/Contents.json
• examples/ios_example/imguiex/Images.xcassets/AppIcon.appiconset/icon_imgui_60@2x~iphone.png
• examples/ios_example/imguiex/Images.xcassets/AppIcon.appiconset/icon_imgui_60@3x~iphone.png
• examples/ios_example/imguiex/Images.xcassets/AppIcon.appiconset/icon_imgui_76@2x~ipad.png
• examples/ios_example/imguiex/Images.xcassets/AppIcon.appiconset/icon_imgui_76~ipad.png
• examples/ios_example/imguiex/Info.plist
• examples/ios_example/imguiex/Shaders/Shader.fsh
• examples/ios_example/imguiex/Shaders/Shader.vsh
• examples/ios_example/imguiex/debug_hud.cpp
• examples/ios_example/imguiex/debug_hud.h
• examples/ios_example/imguiex/imgui_ex_icon.png
• examples/ios_example/imguiex/imgui_impl_ios.h
• examples/ios_example/imguiex/imgui_impl_ios.mm
• examples/ios_example/imguiex/main.m
• examples/libs/glfw/include/GLFW/glfw3.h
• examples/libs/glfw/include/GLFW/glfw3native.h
• examples/libs/glfw/lib-vc2010-32/glfw3.lib
• examples/libs/glfw/lib-vc2010-64/glfw3.lib
• examples/marmalade_example/imgui_impl_marmalade.cpp
• examples/marmalade_example/imgui_impl_marmalade.h
• examples/opengl2_example/Makefile
• examples/opengl2_example/build_win32.bat
• examples/opengl2_example/imgui_impl_glfw.cpp
• examples/opengl2_example/imgui_impl_glfw.h
• examples/opengl2_example/main.cpp
• examples/opengl2_example/opengl2_example.vcxproj
• examples/opengl2_example/opengl2_example.vcxproj.filters
• examples/opengl3_example/Makefile
• examples/opengl3_example/imgui_impl_glfw_gl3.cpp
• examples/opengl3_example/imgui_impl_glfw_gl3.h
• examples/opengl3_example/main.cpp
• examples/opengl_example/Makefile
• examples/opengl_example/build_win32.bat
• examples/opengl_example/imgui_impl_glfw.cpp
• examples/opengl_example/imgui_impl_glfw.h
• examples/opengl_example/main.cpp
• examples/opengl_example/opengl_example.vcxproj
• examples/opengl_example/opengl_example.vcxproj.filters
• examples/sdl_opengl2_example/README.md
• examples/sdl_opengl2_example/imgui_impl_sdl.cpp
• examples/sdl_opengl2_example/imgui_impl_sdl.h
• examples/sdl_opengl2_example/main.cpp
• examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
• examples/sdl_opengl3_example/imgui_impl_sdl_gl3.h
• examples/sdl_opengl3_example/main.cpp
• examples/sdl_opengl_example/README.md
• examples/sdl_opengl_example/imgui_impl_sdl.cpp
• examples/sdl_opengl_example/imgui_impl_sdl.h
• examples/sdl_opengl_example/main.cpp
• examples/vulkan_example/CMakeLists.txt
• examples/vulkan_example/build_win32.bat
• examples/vulkan_example/gen_spv.sh
• examples/vulkan_example/glsl_shader.frag
• examples/vulkan_example/glsl_shader.vert
• examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
• examples/vulkan_example/imgui_impl_glfw_vulkan.h
• examples/vulkan_example/main.cpp
• extra_fonts/README.txt
• extra_fonts/Roboto-Medium.ttf
• extra_fonts/binary_to_compressed_c.cpp
• imconfig.h
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_draw.cpp
• imgui_internal.h
• stb_rect_pack.h
• stb_textedit.h
• stb_truetype.h

Ignore Space Show notes View .travis.yml
Too large

Ignore Space Show notes View README.md
Too large

Ignore Space Show notes View examples/.gitignore
Too large

Ignore Space Show notes View examples/README.txt
Too large

Ignore Space Show notes View examples/allegro5_example/imgui_impl_a5.cpp
Too large

Ignore Space Show notes View examples/allegro5_example/imgui_impl_a5.h
Too large

Ignore Space Show notes View examples/allegro5_example/main.cpp
Too large

Ignore Space Show notes View examples/apple_example/.gitignore 0 → 100644
Too large

Ignore Space Show notes View examples/apple_example/README.md 0 → 100644
Too large

Ignore Space Show notes View examples/apple_example/imguiex-ios/AppDelegate.h 0 → 100644
Too large

Ignore Space Show notes View examples/apple_example/imguiex-ios/AppDelegate.m 0 → 100644
Too large

Ignore Space Show notes View examples/apple_example/imguiex-ios/Base.lproj/LaunchScreen.xib 0 → 100644
Too large

Ignore Space Show notes View examples/apple_example/imguiex-ios/Base.lproj/Main.storyboard 0 → 100644
Too large

Ignore Space Show notes View examples/apple_example/imguiex-ios/GameViewController.h 0 → 100644
Too large

Ignore Space Show notes View examples/apple_example/imguiex-ios/GameViewController.m 0 → 100644
Too large

Ignore Space Show notes View examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/Contents.json 0 → 100644
Too large

Ignore Space Show notes View examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_60@2x~iphone.png 0 → 100644
Too large

Ignore Space Show notes View examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_60@3x~iphone.png 0 → 100644
Too large

Ignore Space Show notes View examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_76@2x~ipad.png 0 → 100644
Too large

Ignore Space Show notes View examples/apple_example/imguiex-ios/Images.xcassets/AppIcon.appiconset/icon_imgui_76~ipad.png 0 → 100644
Too large

Ignore Space Show notes View examples/apple_example/imguiex-ios/Info.plist 0 → 100644
Too large

Ignore Space Show notes View examples/apple_example/imguiex-ios/Shaders/Shader.fsh 0 → 100644
Too large

Ignore Space Show notes View examples/apple_example/imguiex-ios/Shaders/Shader.vsh 0 → 100644
Too large

Ignore Space Show notes View examples/apple_example/imguiex-ios/debug_hud.cpp 0 → 100644
Too large

Ignore Space Show notes View examples/apple_example/imguiex-ios/debug_hud.h 0 → 100644
Too large

Ignore Space Show notes View examples/apple_example/imguiex-ios/imgui_ex_icon.png 0 → 100644
Too large

Ignore Space Show notes View examples/apple_example/imguiex-ios/imgui_impl_ios.h 0 → 100644
Too large

Ignore Space Show notes View examples/apple_example/imguiex-ios/imgui_impl_ios.mm 0 → 100644
Too large

Ignore Space Show notes View examples/apple_example/imguiex-ios/main.m 0 → 100644
Too large

Ignore Space Show notes View examples/apple_example/imguiex-osx/AppDelegate.h 0 → 100644
Too large

Ignore Space Show notes View examples/apple_example/imguiex-osx/AppDelegate.m 0 → 100644
Too large

Ignore Space Show notes View examples/apple_example/imguiex-osx/Assets.xcassets/AppIcon.appiconset/Contents.json 0 → 100644
Too large

Ignore Space Show notes View examples/apple_example/imguiex-osx/Assets.xcassets/AppIcon.appiconset/icon_imgui_180x180.png 0 → 100644
Too large

Ignore Space Show notes View examples/apple_example/imguiex-osx/Assets.xcassets/Contents.json 0 → 100644
Too large

Ignore Space Show notes View examples/apple_example/imguiex-osx/Info.plist 0 → 100644
Too large

Ignore Space Show notes View examples/apple_example/imguiex-osx/main.m 0 → 100644
Too large

Ignore Space Show notes View examples/apple_example/imguiex.xcodeproj/project.pbxproj 0 → 100644
Too large

Ignore Space Show notes View examples/directx10_example/imgui_impl_dx10.cpp
Too large

Ignore Space Show notes View examples/directx10_example/imgui_impl_dx10.h
Too large

Ignore Space Show notes View examples/directx10_example/main.cpp
Too large

Ignore Space Show notes View examples/directx11_example/imgui_impl_dx11.cpp
Too large

Ignore Space Show notes View examples/directx11_example/imgui_impl_dx11.h
Too large

Ignore Space Show notes View examples/directx11_example/main.cpp
Too large

Ignore Space Show notes View examples/directx12_example/build_win32.bat
Too large

Ignore Space Show notes View examples/directx12_example/directx12_example.vcxproj
Too large

Ignore Space Show notes View examples/directx12_example/directx12_example.vcxproj.filters
Too large

Ignore Space Show notes View examples/directx12_example/imgui_impl_dx12.cpp
Too large

Ignore Space Show notes View examples/directx12_example/imgui_impl_dx12.h
Too large

Ignore Space Show notes View examples/directx12_example/main.cpp
Too large

Ignore Space Show notes View examples/directx9_example/build_win32.bat
Too large

Ignore Space Show notes View examples/directx9_example/directx9_example.vcxproj
Too large

Ignore Space Show notes View examples/directx9_example/imgui_impl_dx9.cpp
Too large

Ignore Space Show notes View examples/directx9_example/imgui_impl_dx9.h
Too large

Ignore Space Show notes View examples/directx9_example/main.cpp
Too large

Ignore Space Show notes View examples/imgui_examples_msvc2010.sln
Too large

Show notes View examples/ios_example/.gitignore 100644 → 0
Too large

Show notes View examples/ios_example/README.md 100644 → 0
Too large

Show notes View examples/ios_example/imguiex.xcodeproj/project.pbxproj 100644 → 0
Too large

Show notes View examples/ios_example/imguiex/AppDelegate.h 100644 → 0
Too large

Show notes View examples/ios_example/imguiex/AppDelegate.m 100644 → 0
Too large

Show notes View examples/ios_example/imguiex/Base.lproj/LaunchScreen.xib 100644 → 0
Too large

Show notes View examples/ios_example/imguiex/Base.lproj/Main.storyboard 100644 → 0
Too large

Show notes View examples/ios_example/imguiex/GameViewController.h 100644 → 0
Too large

Show notes View examples/ios_example/imguiex/GameViewController.m 100644 → 0
Too large

Show notes View examples/ios_example/imguiex/Images.xcassets/AppIcon.appiconset/Contents.json 100644 → 0
Too large

Show notes View examples/ios_example/imguiex/Images.xcassets/AppIcon.appiconset/icon_imgui_60@2x~iphone.png 100644 → 0
Too large

Show notes View examples/ios_example/imguiex/Images.xcassets/AppIcon.appiconset/icon_imgui_60@3x~iphone.png 100644 → 0
Too large

Show notes View examples/ios_example/imguiex/Images.xcassets/AppIcon.appiconset/icon_imgui_76@2x~ipad.png 100644 → 0
Too large

Show notes View examples/ios_example/imguiex/Images.xcassets/AppIcon.appiconset/icon_imgui_76~ipad.png 100644 → 0
Too large

Show notes View examples/ios_example/imguiex/Info.plist 100644 → 0
Too large

Show notes View examples/ios_example/imguiex/Shaders/Shader.fsh 100644 → 0
Too large

Show notes View examples/ios_example/imguiex/Shaders/Shader.vsh 100644 → 0
Too large

Show notes View examples/ios_example/imguiex/debug_hud.cpp 100644 → 0
Too large

Show notes View examples/ios_example/imguiex/debug_hud.h 100644 → 0
Too large

Show notes View examples/ios_example/imguiex/imgui_ex_icon.png 100644 → 0
Too large

Show notes View examples/ios_example/imguiex/imgui_impl_ios.h 100644 → 0
Too large

Show notes View examples/ios_example/imguiex/imgui_impl_ios.mm 100644 → 0
Too large

Show notes View examples/ios_example/imguiex/main.m 100644 → 0
Too large

Ignore Space Show notes View examples/libs/glfw/include/GLFW/glfw3.h
Too large

Ignore Space Show notes View examples/libs/glfw/include/GLFW/glfw3native.h
Too large

Ignore Space Show notes View examples/libs/glfw/lib-vc2010-32/glfw3.lib
Too large

Ignore Space Show notes View examples/libs/glfw/lib-vc2010-64/glfw3.lib
Too large

Ignore Space Show notes View examples/marmalade_example/imgui_impl_marmalade.cpp
Too large

Ignore Space Show notes View examples/marmalade_example/imgui_impl_marmalade.h
Too large

Ignore Space Show notes View examples/opengl2_example/Makefile 0 → 100644
Too large

Ignore Space Show notes View examples/opengl2_example/build_win32.bat 0 → 100644
Too large

Ignore Space Show notes View examples/opengl2_example/imgui_impl_glfw.cpp 0 → 100644
Too large

Ignore Space Show notes View examples/opengl2_example/imgui_impl_glfw.h 0 → 100644
Too large

Ignore Space Show notes View examples/opengl2_example/main.cpp 0 → 100644
Too large

Ignore Space Show notes View examples/opengl2_example/opengl2_example.vcxproj 0 → 100644
Too large

Ignore Space Show notes View examples/opengl2_example/opengl2_example.vcxproj.filters 0 → 100644
Too large

Ignore Space Show notes View examples/opengl3_example/Makefile
Too large

Ignore Space Show notes View examples/opengl3_example/imgui_impl_glfw_gl3.cpp
Too large

Ignore Space Show notes View examples/opengl3_example/imgui_impl_glfw_gl3.h
Too large

Ignore Space Show notes View examples/opengl3_example/main.cpp
Too large

Show notes View examples/opengl_example/Makefile 100644 → 0
Too large

Show notes View examples/opengl_example/build_win32.bat 100644 → 0
Too large

Show notes View examples/opengl_example/imgui_impl_glfw.cpp 100644 → 0
Too large

Show notes View examples/opengl_example/imgui_impl_glfw.h 100644 → 0
Too large

Show notes View examples/opengl_example/main.cpp 100644 → 0
Too large

Show notes View examples/opengl_example/opengl_example.vcxproj 100644 → 0
Too large

Show notes View examples/opengl_example/opengl_example.vcxproj.filters 100644 → 0
Too large

Ignore Space Show notes View examples/sdl_opengl2_example/README.md 0 → 100644
Too large

Ignore Space Show notes View examples/sdl_opengl2_example/imgui_impl_sdl.cpp 0 → 100644
Too large

Ignore Space Show notes View examples/sdl_opengl2_example/imgui_impl_sdl.h 0 → 100644
Too large

Ignore Space Show notes View examples/sdl_opengl2_example/main.cpp 0 → 100644
Too large

Ignore Space Show notes View examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
Too large

Ignore Space Show notes View examples/sdl_opengl3_example/imgui_impl_sdl_gl3.h
Too large

Ignore Space Show notes View examples/sdl_opengl3_example/main.cpp
Too large

Show notes View examples/sdl_opengl_example/README.md 100644 → 0
Too large

Show notes View examples/sdl_opengl_example/imgui_impl_sdl.cpp 100644 → 0
Too large

Show notes View examples/sdl_opengl_example/imgui_impl_sdl.h 100644 → 0
Too large

Show notes View examples/sdl_opengl_example/main.cpp 100644 → 0
Too large

Ignore Space Show notes View examples/vulkan_example/CMakeLists.txt 0 → 100644
Too large

Ignore Space Show notes View examples/vulkan_example/build_win32.bat 0 → 100644
Too large

Ignore Space Show notes View examples/vulkan_example/gen_spv.sh 0 → 100755
Too large

Ignore Space Show notes View examples/vulkan_example/glsl_shader.frag 0 → 100644
Too large

Ignore Space Show notes View examples/vulkan_example/glsl_shader.vert 0 → 100644
Too large

Ignore Space Show notes View examples/vulkan_example/imgui_impl_glfw_vulkan.cpp 0 → 100644
Too large

Ignore Space Show notes View examples/vulkan_example/imgui_impl_glfw_vulkan.h 0 → 100644
Too large

Ignore Space Show notes View examples/vulkan_example/main.cpp 0 → 100644
Too large

Ignore Space Show notes View extra_fonts/README.txt
Too large

Ignore Space Show notes View extra_fonts/Roboto-Medium.ttf 0 → 100644
Too large

Ignore Space Show notes View extra_fonts/binary_to_compressed_c.cpp
Too large

Ignore Space Show notes View imconfig.h
Too large

Ignore Space Show notes View imgui.cpp
Too large

Ignore Space Show notes View imgui.h
Too large

Ignore Space Show notes View imgui_demo.cpp
Too large

Ignore Space Show notes View imgui_draw.cpp
Too large

Ignore Space Show notes View imgui_internal.h
Too large

Ignore Space Show notes View stb_rect_pack.h
Too large

Ignore Space Show notes View stb_textedit.h
Too large

Ignore Space Show notes View stb_truetype.h
Too large

Show line notes below