Benj
/
imgui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,069 Commits
1 Branch
0 Tags
81 MiB
docking
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'a3d6554e8e'
${ noResults }
Commit Graph

864 Commits (a3d6554e8ea21a5610320170c4ae75a2c90cf577)

Author SHA1 Message Date
omar 7268c65d73 Examples: imgui_impl_vulkan: Comments (re) 6 years ago
omar 3fdfac3377 Examples: imgui_impl_vulkan: Comments 6 years ago
omar 5d630c930d Viewport: DestroyPlatformWindows() checks for the bool CreatedPlatformWindow flag correctly. Note that we set CreatedPlatformWindow=true for the main viewport to allow the back-end to store data in the public Viewport structure (for consistency). (#1542) 6 years ago
omar e5f2295398 Merge branch 'master' into viewport 
# Conflicts:
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
 6 years ago
omar 421dc19798 Examples: Cast to ImTextureID instead of void* when assigning to TexId. Applied to all examples. (#2015) 6 years ago
Ryan Crandall 9c0805010f imgui_impl_dx12: Cast to ImTextureID instead of void* to enable redefinition of ImTextureID (#2015, #301) 6 years ago
omar d5793102db imgui_impl_opengl3: Advertised as a ES2/ES3 renderer. Defaults to ES3 on Android. Default on "#version 300 es" on ES 3. (#2002, #1873) 6 years ago
Ryan Crandall 34203d5008 imgui_impl_win32: Don't redefine WIN32_LEAN_AND_MEAN if already defined (#2014) 6 years ago
luk1337 e3eb4111cc Examples: Fix 'How to build' instructions for SDL2 examples (#2012) 6 years ago
omar 35124cdd07 imgui_impl_opengl3.cpp Using GLES3 on IOS instead of gl3w. (#2002, #1873) 
Not modifying the main.cpp yet because we need to test GL ES 3 context creation on iOS (only imgui_impl_opengl3.cpp was tested).
 6 years ago
omar 00e29832d4 Examples: OpenGL2: Disabling/restoring GL_LIGHTING and GL_COLOR_MATERIAL to increase compatibility with legacy OpenGL applications. (#1996) 6 years ago
omar 8ef0ca9765 Merge branch 'master' into viewport 
# Conflicts:
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_sdl.cpp
#	imgui.cpp
 6 years ago
omar d69b2a1c1d Changelog for #1989 6 years ago
Matthias Moulin 6011ddf1e5 imgui_impl_dx11: Using ID3D11Factory instead of ID3D11Factory1 (#1989) 6 years ago
omar b1fc988c6b imgui_impl_glfw, imgui_impl_sdl: Workaround for Emscripten which doesn't seem to handle focus related calls. (#1941) 6 years ago
omar b217251a63 Added Visual Studio 2017+ build cruft to Ignore List (.vs/ folder) 6 years ago
omar 9824bf1ba1 Merge branch 'master' into viewport 
# Conflicts:
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
 6 years ago
omar 067edd09f9 imgui_impl_opengl3: Comments. (#1987) 6 years ago
Dado 81562b2b5a Examples: imgui_impl_opengl3.cpp Using #ifdef GL_SAMPLER_BINDING instead of if (glBindSampler) (#1985) 6 years ago
Marcel Smit faa7dad537 Examples: imgui_impl_osx: Fix for incorrect DeltaTime calculation on mac OS. (#1978) 6 years ago
omar 544db70852 Examples: OpenGL3: Tweaks, added changelog. (#1941) 6 years ago
Omar Sherif Fathy fc737d2333 Examples; imgui_impl_opengl3.cpp to work with Emscripten (#1941) 
* Add some ifdefs to add emscripten specific params and includes

* Update imgui_impl_opengl3.cpp

* Update imgui_impl_opengl3.cpp

* Update imgui_impl_opengl3.cpp

* replace __EMSCRIPTEN_BUILD__ with __EMSCRIPTEN__

* replace GLFW_INCLUDE_ES3 with direct header

* removing useless glfw include

* Making call to glPolygonMode() optional
 6 years ago
omar 352695bc57 Merge branch 'master' into viewport 
# Conflicts:
#	examples/imgui_impl_sdl.cpp
#	imgui.cpp
 6 years ago
omar ff83d0e369 Examples: Using fully qualified "Dear ImGui" name in window titles. 6 years ago
omar d016ef1825 Examples: SDL: Removed SDL_HAS_WARP_MOUSE_GLOBAL in the non-viewport branch. (#1954) (+1 squashed commits) 6 years ago
omar 7b4fbf4301 Viewport: Removed the need for the back-end to fill io.MousePosViewport, it seems unnecessary at this point. (#1542) 6 years ago
omar ee98a069f0 Merge branch 'master' into viewport 
# Conflicts:
#	examples/imgui_impl_dx10.cpp
#	examples/imgui_impl_dx11.cpp
#	imgui_demo.cpp
 6 years ago
omar 73e13a0762 Examples: Tweaked the main.cpp example structure for all examples. (There are a few hidden agendas here: 1) I would like to avoid encouraging people from using the implicit "Debug" window, and promote using Begin/End. In spite of my best attempt, there are a few feature of the upcoming docking system that cannot work 100% properly for the implicit Debug window, so future proof let's not put that feature in the spotlight too much for new users. 2) Moved dumb hardcoded positions into a single spot that can be replaced with a viewport relative position and not affect other demo windows. 3) Calling ShowDemoWindow before anything else, also for the benefit of a specific docking demo which will have an ordering constraint which is not really problematic in a real app but shouldn't be put forward in the demo. 6 years ago
omar abe7b190dc Examples: DX10, DX11: Fixed unreleased resources in Init and Shutdown functions. (#1944) 6 years ago
omar 88df66ec83 Merge branch 'master' into viewport 
# Conflicts:
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui.h
#	imgui_draw.cpp
#	imgui_internal.h
 6 years ago
omar 59fb3274a7 Examples: include for intptr_t on tdm-gcc + mingw32 (#1936) + mouse buttons comments 6 years ago
omar fff014dfed Examples: OpenGL3: Added shaders more versions of GLSL + made the example app default to GL 3.0 + GLSL 130 (instead of GL 3.2 + GLSL 150) unless on Mac. (#1938, #1900, #1513, #1466, etc.) 6 years ago
omar de13261f1b OpenGL3: Added error output when shaders fail to compile / link. (#1938) 6 years ago
omar 14cef31467 Merge branch 'master' into viewport 
# Conflicts:
#	imgui.cpp
 6 years ago
omar 6201cad2b4 Examples: Comments, Demo: Log early out, TODO. (#1553) 6 years ago
omar 6277781e83 Merge branch 'master' into viewport 
# Conflicts:
#	imgui.cpp
 6 years ago
omar 89e2ddf07f Examples: Comments + shallow coding convention tweak to be consistent across examples and with imgui_impl_osx 6 years ago
omar 569e0f07f1 Examples: Removed old example_apple/ + tweak comments (#1873) 6 years ago
Omar Cornut 839e4d34bd Merge branch 'warrenm_osx' 6 years ago
Omar Cornut c3f9220c15 Apple: Fixed example_osx_opengl2, renamed to example_apple_opengl2 + misc comments 6 years ago
Warren Moore d64157e803 Introduced a new Metal renderer implementation and a new example illustrating usage of Metal on macOS and iOS (partially addresses #1873) 6 years ago
omar 7b2662d245 Examples: Comments, bits of documentation 6 years ago
omar deb7aa29cd OSX: Various tweaks to imgui_impl_osx courtesy of @warrenm + fix NewFrame position which has been moved recently master. (#1873) 6 years ago
omar 0d7e779b37 Merge branch 'master' into osx 
# Conflicts:
#	examples/.gitignore
#	examples/README.txt
 6 years ago
omar a765c83bad Ignore list: added emscripten output 6 years ago
omar 770cba0bd0 Merge branch 'master' into viewport 
# Conflicts:
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_glfw.h
#	examples/imgui_impl_sdl.cpp
#	examples/imgui_impl_sdl.h
#	examples/imgui_impl_win32.cpp
#	examples/imgui_impl_win32.h
#	imgui.cpp
#	imgui_internal.h
 6 years ago
Konstantin Podsvirov ddb09c6011 Examples: Ignore all *.user files (#1919) 
For example `Qt Creator` create `CMakeLists.txt.user` file with user settings.
 6 years ago
omar c4e34aaace Examples: Comments to clarify how the keyboard data is indexed. 6 years ago
codecnotsupported b62cc5c150 Fix include Example_glfw_vulkan cmake (#1916) 
Probably got broken because of the refactor.
 6 years ago
omar 62b3d7c51e Fixed software Hand cursor from not actually working. Fixed demo from crashing. Fixed typo and extraneous trailing space. Added Changelogs. (#1913, #1914) 6 years ago
Aiekick ecd9a223e3 add hand cursor support (+11 squashed commit) 6 years ago
Omar Cornut 42a919f303 Examples: Apple: Fixed paths of GLFW+GL2 example. (#1906) Update ignore list. 6 years ago
omar c38fe6b0e1 Merge branch 'master' into viewport 
# Conflicts:
#	imgui.cpp
 6 years ago
omar a1ec7723ef Examples: OpenGL3: Remove misleading or unnecessary "#version 150" strings. 6 years ago
omar 20e89201cb Examples: Fixes. 6 years ago
omar d3ee3e7ab5 Fixed merge. 6 years ago
omar ce500f8727 Merge branch 'master' into viewport 
# Conflicts:
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_win32.cpp
 6 years ago
omar d68633398b Examples: Vulkan: nverted the parameters to ImGui_ImplVulkan_RenderDrawData() to be consistent with other bindings. 6 years ago
omar f9a5ff7a19 Examples: DirectX12: Moved the ID3D12GraphicsCommandList* parameter from ImGui_ImplDX12_NewFrame() to ImGui_ImplDX12_RenderDrawData() which makes a lots more sense. (#301) 6 years ago
omar cac4c3f9b8 Examples: The functions in imgui_impl_xxx.cpp are prefixed with IMGUI_IMPL_API (which defaults to IMGUI_API) to facilitate some uses. (#1888) + Comments in imgui.h 6 years ago
omar 528b0b4af6 Examples: SDL+OpenGL2: Fixed Makefile. (#1886) 6 years ago
omar c44a4bed84 Examples: Fixed bindings to use ImGuiMouseCursor_COUNT instead of old name ImGuiMouseCursor_Count_ so they can compile with IMGUI_DISABLE_OBSOLETE_FUNCTIONS. (#1887) 6 years ago
omar 2ce121b7d0 Readme, Links, Bindings 6 years ago
omar 40845852b9 Fixed warnings + readme 6 years ago
Omar Cornut a402edb66c Examples: OSX: Added clipboard support. Fixed ignore list for xcode cruft. Comments about broken keys. (#1873) 6 years ago
omar 9a5f742e63 Fixed merge. 6 years ago
omar 70b0bd13aa Merge branch 'master' into viewport 
# Conflicts:
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl2.h
#	examples/imgui_impl_opengl3.cpp
#	examples/imgui_impl_opengl3.h
#	imgui.cpp
#	imgui.h
 6 years ago
omar 185b4dde87 Examples: Allegro5: Added support for ImGuiConfigFlags_NoMouseCursorChange flag. Added clipboard support. Unindexing buffers ourselves as Allegro indexed drawing primitives are buggy in the DirectX9 back-end. 6 years ago
omar 087ab2acbf Examples: Fixed example vcproj names in Viewport branch. 6 years ago
omar be4b8b5615 Internals: Added GetItemID(), GetFocusID() for consistency. Made GetActiveID() inline. Comments, fixed typos, demo tweaks. 6 years ago
omar 24aeca3d0c Merge branch 'master' into viewport 
# Conflicts:
#	examples/imgui_impl_dx10.cpp
#	examples/imgui_impl_dx10.h
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_glfw.h
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl2.h
#	examples/imgui_impl_opengl3.cpp
#	examples/imgui_impl_sdl.cpp
#	examples/imgui_impl_sdl.h
#	examples/imgui_impl_vulkan.h
#	examples/imgui_impl_win32.cpp
 6 years ago
Omar Cornut e54b61aa0f Examples: OSX: Fixed obsolete enums. Fixed keyboard mapping. Added missing keyboard modifiers. (#1873) 6 years ago
omar f96c7fac91 Examples: FreeGLUT: Fixed mapping of Space key. (#801) 6 years ago
omar cdf51cad2d Comments, documentation 6 years ago
omar a1b6766d43 Examples: FreeGLUT: Added FreeGLUT bindings. Added FreeGLUT+OpenGL2 example. (#801) 6 years ago
omar bdb3d72d37 Examples: Win32: Fixed handling of mouse wheel messages to support finer position messages (typically sent by track-pads). (#1874) 6 years ago
omar 7acb46bec5 Examples: Comments to make ImGuiConfigFlags_NoMouseCursorChange more visible (#1027). + Allegro5: Added support for ImGuiConfigFlags_NoMouseCursorChange flag. 6 years ago
omar fac0c801da Examples: Added imgui_impl_osx.mm bindings (#1870, #281) 6 years ago
omar 6f7b7807ad Fixed Travis path + various paths in comments/documentations 6 years ago
omar 9660657e95 Merge branch 'master' into viewport 
# Conflicts:
#	examples/imgui_impl_sdl.cpp
 6 years ago
omar 5a13e4dcde Examples: Renamed imgui_impl_sdl2.cpp to imgui_impl_sdl.cpp (#1870) + changelog bits 6 years ago
omar 8d58fbb5ed Examples: Renamed example folders. (#1870) 6 years ago
omar 13a3a2d0f3 Merge branch 'examples_refactor2' into viewport (#1870) 
# Conflicts:
#	examples/README.txt
#	examples/directx11_example/main.cpp
#	examples/directx12_example/main.cpp
#	examples/imgui_impl_dx10.cpp
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_dx12.cpp
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl2.h
#	examples/imgui_impl_opengl3.cpp
#	examples/imgui_impl_sdl2.cpp
#	examples/imgui_impl_sdl2.h
#	examples/imgui_impl_vulkan.cpp
#	examples/imgui_impl_vulkan.h
#	examples/imgui_impl_win32.cpp
#	examples/imgui_impl_win32.h
#	examples/opengl2_example/main.cpp
#	examples/opengl3_example/main.cpp
#	examples/sdl_opengl2_example/main.cpp
#	examples/sdl_opengl3_example/main.cpp
#	examples/sdl_vulkan_example/main.cpp
#	examples/vulkan_example/main.cpp
#	imgui.cpp
#	imgui.h
 6 years ago
omar 85f9694bd4 Big example binding refactor (manually imported from Viewport branch, stripped out of Viewport code). (#1870) 
Read examples/README.txt for some details.
ImDrawData: Added DisplayPos, DisplaySize fields honored by all backends (not strictly necessary to honor just now, but doing it to be ahead)
 6 years ago
omar 24fc7c30dd Examples: Documentation 6 years ago
omar 06aa9d8d9a Examples: Fixed Makefile, batch files. 6 years ago
omar 8c374512fd Examples, Platform: Removed the call to ImGui::NewFrame() from the platform _NewFrame() function e.g. ImGui_ImplWin32_NewFrame(), ImGui_ImplSDL2_NewFrame(), ImGui_ImplGlfw_NewFrame(), etc. Moved to main.cpp for consistency. (#1542) 6 years ago
omar 77d51ebf24 Examples: Added .. folder in include path to remove the awkward #include "../imgui_impl_xxx.h" statements. 6 years ago
omar 929522febe Missing examples changelog bits and todo list 6 years ago
omar 03c8a78f04 Merge branch 'master' into viewport 
# Conflicts:
#	examples/opengl2_example/imgui_impl_glfw_gl2.cpp
#	examples/opengl3_example/imgui_impl_glfw_gl3.cpp
#	examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
#	examples/sdl_opengl3_example/imgui_impl_sdl_gl3.h
#	examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
 6 years ago
omar 9770c8b21d Examples: OpenGL3: Removed unnecessary backup/restore of GL_ELEMENT_ARRAY_BUFFER_BINDING since this is part of the VAO state. (#1836) 6 years ago
omar 5fd23eeb74 Examples: iOS: Fixed missing call to CreateContext() + various shallow coding style tweaks. (#1835) 6 years ago
omar bef0a13283 Examples: Comments about GLSL version not being the same as GL context version. (#1828) 6 years ago
omar 663e2c9237 Examples: GLFW: Made it possible to Shutdown/Init the backend again (by reseting the time storage properly). Changelog. Added to Vulkan example. (#1827) 6 years ago
ice1000 e8a72d3e72 Examples: GLFW* Make subsequent window creation possible. 6 years ago
omar 01429e7d16 Merge branch 'master' into viewport 
# Conflicts:
#	examples/opengl3_example/imgui_impl_glfw_gl3.cpp
#	examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
#	imgui.cpp
#	imgui.h
 6 years ago
omar 19544629be Examples: OpenGL3: Trying to make the call to glBindSampler optional to make the example code easier to use/share with different context version. (#1806) 6 years ago
omar 85f3ba844c Merge branch 'master' into viewport 
# Conflicts:
#	examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
#	examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
#	imgui.cpp
#	imgui.h
 7 years ago
omar 090eb437ed Viewport, Platform: Cleaned up xxx_UpdateMouseCursor() functions to make them more consistent. (#1542) 7 years ago
omar d574604a5d Viewport, Platform: Win32: Fixed handling of io.WantSetMousePos + added a bunch of comments. GLFW, SDL2: Added handling of io.WantSetMousePos. (#1542) 7 years ago