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

727 Commits (8c374512fdaa1918c155c1e65a81e5f5e08ed094)

Author SHA1 Message Date
omar a2ed3ee2cf Examples: OpenGL3: Added a way to override the glsl version number through the Init call. (#1667, #1466) 7 years ago
omar c4a158656e Merge branch 'master' into viewport 
# Conflicts:
#	examples/allegro5_example/main.cpp
#	examples/directx10_example/main.cpp
#	examples/directx11_example/main.cpp
#	examples/directx12_example/main.cpp
#	examples/directx9_example/main.cpp
#	examples/imgui_impl_dx10.cpp
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_dx12.cpp
#	examples/imgui_impl_dx9.cpp
#	examples/imgui_impl_glfw.h
#	examples/imgui_impl_vulkan.cpp
#	examples/opengl2_example/imgui_impl_glfw_gl2.cpp
#	examples/opengl2_example/main.cpp
#	examples/opengl3_example/imgui_impl_glfw_gl3.cpp
#	examples/opengl3_example/main.cpp
#	examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
#	examples/sdl_opengl2_example/main.cpp
#	examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
#	examples/sdl_opengl3_example/main.cpp
#	examples/vulkan_example/main.cpp
#	imgui.cpp
#	imgui.h
 7 years ago
omar e026c8d3b7 Viewport: Give a chance to platform and renderer to actually destroy their data. Otherwise the regular ImplXXX_Shutdown + following by DestroyContext() order fails to fullifl this. (#1542) 7 years ago
omar cab41d954e Examples: Vulkan: Further refactor. 7 years ago
omar 69e700f869 Renamed ImGuiStyleVar_Count_ to ImGuiStyleVar_COUNT for consistency with other enums. Added 7 years ago
omar e0cbfd74d7 Examples: Vulkan: Moved CreateOrResizeWindowData func to imgui_impl_vulkan.h 7 years ago
omar 426930e028 Examples: Vulkan: Moved main.cpp data structures to imgui_impl_vulkan.h as shared helpers for the benefit of both the example and the platform/viewport renderer interface. 7 years ago
omar e9fa17e1bf Viewport: Replaced UpdatePlatformWindows/RenderPlatformWindows by RenderAdditionalViewports(). The update is always called in EndFrame(). (#1542) 7 years ago
omar 7113fc7dee Examples: Vulkan: Moved variables into per-window data, refactored/tweaks to that the bug functions main.cpp for both SDL and GLFW examples match (they'll probably be moved to imgui_impl_vulkan as helpers). 7 years ago
omar e0f283cfcb Examples: Vulkan: Fix 7b968b098e 7 years ago
omar 7b968b098e Examples: Vulkan: Reduced duplicate code by skipping present on the first frame. Amend 201d589714 by @ParticlePeter 7 years ago
omar e927a6ac4a Examples: Vulkan: Various tweak. Misc refactor into per-frame data. Duplicate buffer creation code moved to CreateOrResizeBuffer(). 7 years ago
omar 9da475e4e8 Examples: GLFW, Vulkan: GLFW binding viewport tweaks to supports Vulkan better (do not call SwapBuffer, share context etc.). Added DUMMY (empty) platform/viewport interface in the viewport code. 7 years ago
omar 5b282bdd48 Examples: Renamed glfw error callback so it's more clear what it is. 7 years ago
omar fc80f2b41a Merge branch 'examples_refactor' into viewport 
# Conflicts:
#	examples/directx10_example/main.cpp
#	examples/directx11_example/main.cpp
#	examples/directx12_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.h
 7 years ago
omar 68e9ef9885 Examples: Vulkan: SDL: Fixed missing resize handler (not properly merged from #1367) + tweaks. 7 years ago
omar 296db2ed33 Examples: Vulkan: Moved code into shared helpers: ImGui_ImplVulkan_SelectSurfaceFormat, ImGui_ImplVulkan_SelectPresentMode. 7 years ago
omar 3171d61dfc Examples: Vulkan: Various tweaks to name variable more consistently like Vulkan + a few comments + a few imgui style code compaction. 7 years ago
omar 57e9f61852 Examples: Vulkan: Debug report tweak + always enable in Debug build. 7 years ago
omar cf365ed00b Examples: Fixed enabling IMGUI_VULKAN_DEBUG_REPORT which was broken during refactor because of duplicate 'extensions' local variable. 7 years ago
omar b37ef20c5c Makefile: updated sdl_opengl3_example with all changes from #885. 7 years ago
Sam Hocevar 124d8522b1 Do not store compiled objects outside the project tree. 7 years ago
Sam Hocevar b6f251103b Define SOURCES instead of OBJS in Makefiles. 
OBJS is still deduced from SOURCES, but this change gives better control
over where the object files get actually written.
 7 years ago
Sam Hocevar d4f63c3844 Use make variables $@ and $^ where appropriate. 7 years ago
Sam Hocevar 551932697d Ensure `make clean` is idempotent. 
Prior to this, `make clean` would fail if the project was not already
fully built, and a second invokation would always fail.
 7 years ago
omar d98a5d54aa Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. (#787) 7 years ago
omar 8074d56bdd Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. (#787) 7 years ago
omar 2c9f45bbe7 Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. (#787) 7 years ago
omar fc3c3de70d Examples: DX10: Multi viewport/platform support (based on DX11 version). (#1542) 7 years ago
omar 997d1bd0eb Examples: NULL pointers for consistency. 7 years ago
omar baef79415b Examples: DX12: Empty skeleton toward implementing the multi-viewport api for DirectX12. (WIP/test API) (#1542, #301) 7 years ago
omar cb601d79e8 Examples: SDL: Initial attempt at implementing the viewport/platform api. (WIP/test API) (#1542) 
ImGui_ImplSDL2_Init() now takes a SDL GL context.
 7 years ago
omar 4cee46f909 Examples: GLFW + OpenGL3: Initial attempt at implementing the viewport/platform api. (WIP/test API) (#1542) 7 years ago
omar 25349b31d7 Examples: DX11 + Win32: Initial attempt at implementing the viewport/platform api. (WIP/test API) (#1542) 7 years ago
omar 29510fcb83 Examples: Misc tweaks/fixes. 7 years ago
omar 3f335b0d42 Merge branch 'master' into examples_refactor 
# Conflicts:
#	examples/opengl3_example/imgui_impl_glfw_gl3.cpp
#	examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
 7 years ago
omar d7f97922b8 Examples: Fix d749d49903 missing the deletion code. (#1217) 7 years ago
omar d749d49903 Examples: OpenGL3: Create the VAO in the render function so the setup can more easily be used with multiple shared GL context. (#1217) 7 years ago
omar ffda84cfae Examples: DirectX12: Merged to new example format, imgui_impl_dx12.cpp contains the DX12 stuff, couple with imgui_impl_win32.cpp 7 years ago
omar e6bc840f6f Merge branch 'master' into examples_refactor 7 years ago
omar 288351a801 Examples: DirectX12: Tweaked assertion to more accurately represent what it wants to say. (#301) 7 years ago
omar 63be3e7c82
Update README.txt 7 years ago
omar 7e24ce0956 Examples: DirectX12: Fixed shutdown issue. (#301) 7 years ago
omar 9be7d048c8 Examples: DirectX12: Merge, various styling tweaks, update for 1.60 wip, synchronized Win32 features with other examples. (#301) 7 years ago
omar 913f3692a2 Examples: DirectX12: Removed from current solution which is meant to be VS2010 compatible for now (will change soon). 7 years ago
omar 0d063585e8 Merge branch 'jdm3_master' 7 years ago
omar f43068c543 Examples: DirectX10, DirectX11: Simplified main example code. 7 years ago
omar 0b26387a2b Simplified .gitignore list 7 years ago
omar 493ec0bc98 Simplified .gitignore list 7 years ago
omar f7ef10e547 Examples: Titles/comments in headers 7 years ago
omar 91cadc1130 Merge branch 'master' into examples_refactor 7 years ago
omar 9b9d9321cf Examples: SDL: Using %SDL2_DIR% in the .vcproj instead of %SDL_DIR%, the earlier is more standard. 7 years ago
omar 47d1360124 Examples: Using SDL2_DIR instead of SDL_DIR (more standard). 7 years ago
omar f67699456c Examples: Added SDL+Vulkan example, the abstraction worked here :) (ref #1367) 7 years ago
omar 387f724d33 Examples: Vulkan: Formatting and tweaks (to match SDL's main). 7 years ago
omar bcdfd5d61c Merge branch 'master' into examples_refactor 7 years ago
omar 9c20a40b36 Examples: OpenGL: Cast call to glPolygonMode(). (#1628). 7 years ago
omar daddd09cd5 Examples: Mouse cursor handling comments/tweaks to homogenize. (#1495) 7 years ago
omar d534207622 Examples: GLFW: Added support for mouse cursors (ImGui::GetMouseCursor() value and WM_SETCURSOR message handling). (#1495) 7 years ago
omar 11b12488e8 Examples: GLFW*: Renamed GLFW callbacks exposed in .h to not include GL2/GL3/Vulkan in their name. 7 years ago
omar 7e2e0535dd Examples: DirectX 9,10,11: Inputs: Added support for mouse cursors (ImGui::GetMouseCursor() value and WM_SETCURSOR message handling). (#1495) 7 years ago
omar e660d92fa5 Examples: GLFW: Added mouse cursors support (#1495) 7 years ago
omar 9fdf72e42b Examples: WIn32: Prefixing every Win32 function calls with :: to denote global namespace in a consistent manner. 7 years ago
omar df9051ded2 Examples: Vulkan: Added support for io.DisplayPos. 7 years ago
omar 230c5ca735 Examples: Vulkan: Fixed GLFW calls. 7 years ago
omar 3bd3693fb7 Examples: DirectX10, DirectX11, OpenGL2, OpenGL3: Added support for io.DisplayPos. 7 years ago
omar 6d0f9244b8 Examples: Allegro5, Marmalade: Moved bindings to parent folder. Renamed Allegro stuff from *A5_ to *Allegro5_ 7 years ago
omar 80a8aea7e3 Examples: Added SDL, Vulkan examples to .sln file. 7 years ago
omar 4f0db01f7c Examples: DirectX9: Reusing imgui_impl_win32, removed that code from imgui_impl_dx9 7 years ago
omar 6cd4e30b58 Examples: DirectX10: Reusing imgui_impl_win32, removed that code from imgui_impl_dx10 7 years ago
omar 19540479d4 Examples: DirectX11: Extracted imgui_impl_dx11.* instead imgui_impl_dx11 and imgui_impl_win32 7 years ago
omar 90dffb5a06 Examples: Vulkan: Extracted into imgui_impl_vulkan.*, reused imgui_impl_glfw* files. 7 years ago
omar ef521d1e0b Examples: SDL: Extracted into imgui_impl_sdl.*, reused imgui_impl_opengl* files. 7 years ago
omar 42c32bf00c Examples: OpenGL2, OpenGL3: Added glPixelStorei() calls borrowed from SDL examples. 7 years ago
omar c8a9969511 Examples: GLFW+GL2: Moved glfw, gl2 files to root folder, split imgui_impl_glfw_gl2 into _opengl2 and reused imgui_impl_glfw 7 years ago
omar b0a8734c92 Examples: GLFW+GL3: Split imgui_impl_glfw_gl3 into imgui_impl_glfw and imgui_impl_gl3 (wip) 7 years ago
omar f5f3730b16 Examples: GLFW+GL2/GL3: Added glPixelStorei() calls borrowed from SDL examples. 7 years ago
omar 9e713b115f Examples: Renamed .sln file. 7 years ago
omar 243fd67b1c Examples: Vulkan: Fix for empty draw data (init time) + fixed warning. 7 years ago
omar 10752423ec Examples: Vulkan: Added .vcproj files. 7 years ago
omar 31158e575f Examples: SDL: Fixed minor warning. 7 years ago
omar 00b24f27c2 Examples: SDL: Added .vcproj files. 7 years ago
omar 03a44acf6f Examples: SDL: Minor stylistic tweaks. Fixed handling of ImGuiMouseCursor_None so it doesn't underflow array. Fixed harmless uninitialized pointer. (#1626) 7 years ago
omar 7c75835200 Renamed misleading ImGuiMouseCursor_Move to ImGuiMouseCursor_ResizeAll. SDL: Fixed cursor. (#1626) 7 years ago
Oliver Faircliff ffb6e89f30 Use SDL system cursors in SDL examples. (#1626) 
(Squashed 4 commits)
 7 years ago
omar 63332d152a Obsoleted the io.RenderDrawListsFn callback, you can call your graphics engine render function after ImGui::Render(). Use ImGui::GetDrawData() to retrieve the ImDrawData* to display..(#1599) 
Examples: Updated examples.
 7 years ago
omar 0cefd40888 Examples: Added Changelog to make updates easier. 7 years ago
omar 41ecebff5a Examples: SDL: Added Changelog at the top of the imgui_impl files. (#1618) 7 years ago
omar 7cc1bc7635 Added IsAnyMouseDown() helper. 
Examples: DirectX9/10/11: Using IsAnyMouseDown() instead of local function.
 7 years ago
omar 2493f609ef Examples: Vulkan: Fix (something changed in GLFW not including vulkan.h, was unwillingly relying on that) 7 years ago
omar f0364aa359 Merge branch 'context' 
# Conflicts:
#	examples/allegro5_example/main.cpp
#	examples/directx10_example/main.cpp
#	examples/directx11_example/main.cpp
#	examples/directx9_example/main.cpp
#	examples/marmalade_example/main.cpp
#	examples/opengl2_example/main.cpp
#	examples/opengl3_example/main.cpp
#	examples/sdl_opengl2_example/main.cpp
#	examples/sdl_opengl3_example/main.cpp
#	examples/vulkan_example/main.cpp
 7 years ago
omar ae30efc0fd Nav: Examples: Added commented out io.NavFlags |= ImGuiNavFlags_EnableKeyboard to all examples. (#787) 7 years ago
omar 3171f90a1a Nav: Keyboard is now automatically mapped based on io.KeyDown[]. (#787) 7 years ago
omar 057807f4a7 Added ImGuiKey_Space, mapped in every examples. Will be required for navigation. (#787) 7 years ago
omar 7e32fc7109 Nav: Toward automatically mapping keyboard input. Renamed ImGuiNavInput_PadXXX to ImGuiNavInput_XXX. Renamed ImGuiNavInput_KeyXXX to ImGuiNavInput_KeyXXX_ (internal). (#787) 7 years ago
omar cea8017e0b Merge branch 'master' into context 7 years ago
omar 4b49f03a40 Examples: SDL+GL3: Added Navigation keyboard mapping. (#787) 7 years ago
omar 7e1496e994 Merge branch 'master' into navigation 7 years ago
omar fcf1c9d151 Examples: SDL: Using SDL_GetPerformanceCounter() / SDL_GetPerformanceFrequency() to handle framerate over 1000 fps properly. Noticed bad inputs artefacts in Nav branch at 2000 fps without this. (#996) 7 years ago
omar 60fb7d31fd Examples: SDL2: Enabling vsync. Using scancode consistently, fixed keyboard weirdness. 7 years ago
omar 73d493c780 Examples: Organized header files to make available features more visible. 7 years ago
omar 533fe8cb55 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
 7 years ago
Gerry Hernandez 4786321754 Fix iOS code; fixes entire XCode build for Apple example 7 years ago
omar 27980d9688 Merge branch 'master' into context 7 years ago
omar 47e81a6194 Merge branch 'master' into navigation 7 years ago
omar cd3dd886de Moved extra_fonts/ to misc/fonts/. Moved .natvis file to misc/natvis/ (#1569) 7 years ago
omar 23c11e9764 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
 7 years ago
omar 6c38aa2dc7 Examples: Apple: Tweak code and sync with other examples better (untested). 7 years ago
omar cca9c3e3da Examples: Using Dark theme by default. (#707). Tweaked demo code. 7 years ago
omar 955d86199f Examples: Tweaks formatting. 7 years ago
omar 2933e6765c Merge branch 'master' into navigation 7 years ago
omar 6a25a8720a Examples: Using #include "imgui.h" instead of <imgui.h> appear correct-er as per standard? xcode+clang are very nitpicky there. 7 years ago
omar 91d77be36e Examples: Makefile leave CXX alone, instead leave commented out options. (nb: codeship doesn't seem have clang++) 7 years ago
Omar Cornut 3cdd2096ec Examples: Use Clang in old Makefile. 7 years ago
omar ddff378daf Examples: Synced Makefile comments. Added build/ folder into git ignore list/ 7 years ago
Omar Cornut 858d75ab59 Examples: Apple: Fixed filenames in OSX xcode project. 7 years ago
omar 66d5712a8a Examples: Vulkan: FIxed warnings in 32-bit modes (vulkan uses VkDeviceSize which is always 64-bit long) 7 years ago
omar 3ded262776 Merge branch 'master' into navigation 7 years ago
omar 827f4b17d3 Nav: Examples: Glfw+GL3: Added basic gamepad mapping code when io.NavFlags & ImGuiNavFlags_EnableGamepad is set. (will iterate/tweak before spreading to other examples). (#787) 7 years ago
omar 3967ff58b2 Nav: Examples: DirectX11, Glfw+GL3: Basic code to map keyboard inputs when io.NavFlags & ImGuiNavFlags_EnableKeyboard is set. (will iterate/tweak before spreading to other examples). (#787) 7 years ago
Jérôme Pasquier 94ed44b5cb Fix allegro5_example build instructions 7 years ago
Jérôme Pasquier c226e02ca0 Fix sdl_opengl2_example filename in README.md's build instructions 7 years ago
omar 2c7324da56 TODO list, added uSynergy README 7 years ago
omar f3776055d6 Merge branch 'master' into context 7 years ago
omar 8c57d8cc1e Natvis: Fix ImRect expanded height display being broken and dumb. (#1569) 7 years ago
omar 6f27d6b5b8 Natvis: Made ImGuiWindow display shorter. 7 years ago
omar c2e92ab61b Added imgui.natvis helper for visual studio users. Added to examples projects. 7 years ago
omar 277f6e7842 Examples: Comments 7 years ago
omar dd89c9ea59 Examples: Made the Win32 proc handlers not assert if there is no active context yet, to be more flexible with creation order. (#1565) 7 years ago
omar d3e826c247 Examples: Updated for reorganized context functions. Calling CreateContext(), DestroyContext() in example code. Removed Shutdown() from binding code. (#1565, #586, #992, #1007, #1558) 7 years ago
omar 7e7c017b75 Examples: Simplified mouse wheel handling. (#1463) 7 years ago
omar 7dea158175 Examples: Allegro, Apple, DirectX9/10/11, Glfw+Vulkan :Added support for horizontal mouse wheel. (#1463) 7 years ago
omar 0b1fecb792 Horizontal mouse wheel: renamed io.MouseHorizWheel to io.MouseWheelH. Reorganized the code in NewFrame(). Examples: Updated GLFW+GL and SDL+GL accordingly. (#1463) 7 years ago
omar 6f6b6194b2 Merge branch 'tseeker/20171127-feature-horiz-wheel' of https://github.com/tseeker/imgui into tseeker-tseeker/20171127-feature-horiz-wheel 
# Conflicts:
#	examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
#	examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
 7 years ago
omar f3e510a9bf Examples: SDL: Using SDL_CaptureMouse() to retrieve coordinates outside of client area when dragging. (#1559) 
Digging into sdl window/mouse stuff will also be useful for multi-viewport work.
 7 years ago
omar 00351ee2ab Examples: SDL: Minor renaming. 7 years ago
omar ba99900023 Examples: GLFW+GL2: Renamed imgui_impl_glfw.* to imgui_impl_glfw_gl2.* for consistency and to emphasis on GL2-ness. 7 years ago
omar 79dca9d5e6 Examples: SDL+GL2: Renamed imgui_impl_sdl.* to imgui_impl_sdl_gl2.* for consistency and to emphasis on GL2-ness. 7 years ago
omar 15fd5b6c4c Examples: SDL: Minor renaming. 7 years ago
omar ce17e0f274 Examples: SDL: Using SDL_WINDOW_INPUT_FOCUS instead of SDL_WINDOW_MOUSE_FOCUS (which is ~~hovered). We should use SDL_CaptureMouse + SDL_WINDOW_MOUSE_CAPTURE_FLAG which requires SDL 2.0.4 will give it a try shortly. (#1559) 7 years ago
omar 60d5dc7902 Examples: SDL: Fixed mapping of Insert key (#1555, fix bug introduced in #1541) 7 years ago
omar ce95b84825 Added ImGuiKey_Insert for future use. Setup in all example bindings. (#1541) 7 years ago
omar 39cb56c39e Examples: OpenGL3+GLFW: Using 3.2 context + GLSL version 150 (#1466) 7 years ago
omar 7484c63449 Examples: OpenGL3+SDL: Changed GLSL shader version to 150 (#1466, #1504) 7 years ago
omar 3d24a9eb40 Examples: DirectX9/10/11: Comments about CS_DBLCLKS + formatting tweaks. (#1538) 7 years ago
omar 65dd55cb2b
Merge pull request #1538 from ndandoulakis/ndandoulakis-CS_DBLCLKS-patch 
Examples: DirectX9,10,10: Support for CS_DBLCLKS by treating double-click down messages are regular down. (#1538, #754)
 7 years ago
omar 407955d9fb Examples: Using IM_OFFSETOF macro. + Comments 7 years ago
Nick Dandoulakis bfc25bc8a3
CS_DBLCLKS support for DirectX 11 7 years ago
Nick Dandoulakis 583e97b297
CS_DBLCLKS support for DirectX 10 7 years ago
Nick Dandoulakis 20ae6439ea
CS_DBLCLKS support for Directx9 7 years ago