imgui

mirror of https://github.com/ocornut/imgui.git synced 2024-12-14 16:53:00 +01:00

Author	SHA1	Message	Date
Max Thrun	ed79b4d22e	Examples/Backends: Metal: Added support for large meshes (64k+ vertices) with 16-bits indices, enable 'ImGuiBackendFlags_HasVtxOffset' config flag in back-end. (#2591 , #2592 )	2019-05-29 19:45:15 +02:00
omar	8dc04a4c9f	Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx9.cpp # examples/imgui_impl_opengl3.cpp # imgui.h # imgui_demo.cpp	2019-05-29 16:32:27 +02:00
omar	7755cbbef2	Renamed ImGuiBackendFlags_HasVtxOffset to ImGuiBackendFlags_RendererHasVtxOffset to match naming convention already used in viewport/docking branch. (#2591 ) + Fix OpenGL3 code missing flag.	2019-05-29 16:29:17 +02:00
omar	c72040a715	Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx10.h # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx11.h # examples/imgui_impl_dx9.cpp # examples/imgui_impl_dx9.h # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_opengl3.h # examples/imgui_impl_osx.h # examples/imgui_impl_osx.mm # imgui.cpp # imgui.h # imgui_demo.cpp # imgui_internal.h	2019-05-29 16:20:26 +02:00
omar	b3dd03f582	Examples/Backends: DirectX9/10/11/12, Vulkan, OpenGL3 (Desktop GL only): Added support for large meshes (64k+ vertices) with 16-bits indices, enable 'ImGuiBackendFlags_HasVtxOffset' config flag in back-end. (#2591 )	2019-05-29 16:13:38 +02:00
omar	2742663ad2	Changelog, minor tweaks. (#2585 )	2019-05-28 11:23:04 +02:00
actboy168	c0e690318a	Examples: imgui_impl_osx: Added mouse cursor support. (#2585 , #1873 )	2019-05-28 11:15:59 +02:00
Mario Botsch	affa7e2422	Examples: imgui_impl_opengl3: Fix empty printout on shader load. (#2584 ) Fixed minor bug in CheckShader and CheckProgram The log_length reported by glGetProgramiv(handle, GL_INFO_LOG_LENGTH, &log_length) will at least return 1, since the string delimiter is also counted. The old version would always print and empty string to stderr. This is annoying in the emscripten port, since it prints a red error message to the Javascript console. The new version fixes this behavior.	2019-05-27 10:47:18 +02:00
omar	04022114d9	Merge branch 'master' into docking # Conflicts: # imgui.cpp	2019-05-21 14:47:29 +02:00
omar	31e3e861ef	Update changelog, comments, made empty/no-text clipboard return NULL as with other implementation. Minor style tweaks. (#2546 ) Fixed IMGUI_DISABLE_WIN32_FUNCTIONS not disabling IME code.	2019-05-18 17:44:09 +02:00
Andrew Willmott	02de498a41	Add native mac copy/paste support to match win32 (#2546 )	2019-05-18 17:34:58 +02:00
omar	4158cba1ff	Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_glfw.cpp # examples/imgui_impl_win32.cpp # imgui.cpp # imgui_internal.h	2019-05-13 19:23:18 +02:00
Alzathar	02d6d2d487	Platform Binding for GLFW updated with the release of GLFW 3.3 (#2547 ) * With the release of GLFW 3.3, it is now possible to detect correctly monitors working area (see GLFW_HAS_MONITOR_WORK_AREA). GLFW 3.3 also introduced the window hint GLFW_FOCUS_ON_SHOW. This fixed the case where a new created window (viewport) takes the focus even if not visible. * Disable a GLFW 3.2 windows hack when GLFW 3.3 is detected (related to window focused when shown).	2019-05-11 10:54:56 +02:00
omar	ef13d95466	IO: changed AddInputCharacter(unsigned short c) signature to AddInputCharacter(unsigned int c). Examples/Backends: Don't filter characters under 0x10000 before calling io.AddInputCharacter(), the filtering is done in io.AddInputCharacter() itself. This is in prevision for fuller Unicode support. (#2538, #2541)	2019-05-11 10:33:56 +02:00
omar	835a8b2c9b	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # imgui.cpp	2019-05-10 22:56:43 +02:00
omar	42fc563fed	Version 1.71 WIP + fixed minor typo	2019-05-07 16:36:08 +02:00
omar	d1d5075b66	Version 1.70	2019-05-06 14:17:39 +02:00
omar	e6c982509d	Examples: DirectX9: Fixes for multi-viewports. Avoid using a depth/stencil target for secondary viewport. (#2520 , #2502 )	2019-05-06 12:12:32 +02:00
omar	9ddb8493d5	Examples: DirectX9: Fixes for multi-viewports, destroying all swap chains. (#2520 , #2502 )	2019-05-06 12:07:29 +02:00
omar	76e61958fd	Merge branch 'master' into docking # Conflicts: # examples/README.txt # examples/imgui_impl_dx9.cpp # imgui.cpp # imgui.h	2019-05-06 10:16:43 +02:00
omar	d88121ff5b	Examples: DirectX9/10/11: Taking reference to device + subsequent merge of this in docking will fix DX9 issue #2524	2019-05-06 10:15:22 +02:00
omar	6c196cf432	Examples Readme and Changelog tweaks, added #2527 , re-ordered examples/README alphabetically.	2019-05-06 10:02:59 +02:00
Max Thrun	5ecc9d5865	Examples: Metal: Add GLFW+Metal example	2019-05-06 09:51:21 +02:00
ibachar	4f22a45cb5	Removed git merge leftovers	2019-05-04 15:02:28 +02:00
omar	825b61e4ba	Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx12.cpp # examples/imgui_impl_dx9.cpp # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_vulkan.cpp # imgui.cpp	2019-05-02 14:56:47 +02:00
omar	ae405b83a4	Examples: Added missing per-renderer local changelogs. (#2037 , #1639 , #2452 )	2019-04-30 22:28:29 +02:00
Max Thrun	7c6ba3a1da	ImDrawCallback_ResetRenderState: Added Metal.	2019-04-30 22:18:25 +02:00
omar	5c1cd5c8c7	ImDrawCallback_ResetRenderState, Examples: Added support for reset render state callback. (#2037 , #1639 , #2452 )	2019-04-30 22:15:59 +02:00
omar	a649d904d7	Examples: Emscripten: Fixed not enabling Docking and Nav by default. (#2494 )	2019-04-26 00:28:28 +02:00
omar	dfb82d5c22	Merge branch 'master' into docking # Conflicts: # examples/example_sdl_opengl2/main.cpp # examples/example_sdl_opengl3/main.cpp # examples/example_sdl_vulkan/main.cpp # examples/imgui_impl_sdl.cpp # examples/imgui_impl_sdl.h # imgui.cpp	2019-04-25 17:53:11 +02:00
omar	1ca6e5b59f	Examples: Glut: Added note about missing cursor support. (#2375 , #2465 )	2019-04-25 12:01:01 +02:00
omar	6789ea3482	Examples: SDL: Gamepad support minor amend. Fixes ImGuiBackendFlags_HasGamepad not being set. Enable in Emscripten demo. Tweaks. (#2509 , #2484 ).	2019-04-23 12:38:59 +02:00
David Amador	994a92d79d	Added support to use controllers via SDL_GameController. (#2509 ) Updated sdl examples to use SDL_INIT_GAMECONTROLLER flag	2019-04-23 12:14:05 +02:00
omar	f159eb35fb	Examples: SDL: Removed unused code. (#2484 )	2019-04-22 10:43:14 +02:00
omar	03b64defa5	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui.h	2019-04-19 19:52:45 +02:00
Andre Weissflog	74a3878be4	emscripten: replace shell_minimal.html with 'soft fullscreen' version	2019-04-17 11:59:26 +02:00
omar	1f25cdd6b4	Clarified asserts comments + todo entries. (#2500 )	2019-04-17 09:59:03 +02:00
omar	655ebe4eaf	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_demo.cpp	2019-04-16 13:14:10 +02:00
omar	8130fd9816	Examples: DirectX10/11/12, Allegro, Marmalade: Render functions early out when display size is zero (minimized). (#2496 )	2019-04-15 18:47:36 +02:00
omar	1fe6533192	Examples: Emscripten: Tweaks for size. (#2494 )	2019-04-15 17:18:31 +02:00
omar	b89202824e	Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_sdl.cpp	2019-04-15 16:03:17 +02:00
omar	35cbf9c052	Examples: Visual Studio: Updated default platform toolset+sdk in vcproj files from v100+sdk7 (vs2010) to v110+sdk8 (vs2012). This is mostly so we can remove reliance on DXSDK_DIR for the DX10/DX11 example, which if existing and when switching to recent SDK ends up conflicting and creating warnings.	2019-04-15 15:48:38 +02:00
omar	eeea7da3d0	Examples: Emscripten: Fixed error in shell template. (#2494 )	2019-04-15 01:46:34 +02:00
omar	c1848b185c	Examples: Emscripten: Switched to WebGL1/ES2, Added Changelog, Updated links, Added ignore list, Fixed warning with older versions. Removed reliance on C++11 (would warn on some compiler). Improved html template, removed undesirable options, reduced log size. Tweaked main.cpp. (#2494 )	2019-04-15 01:28:44 +02:00
omar	882d480b5e	Examples: Removed unused variable (will be used in docking branch tho, undo when merging!)	2019-04-15 01:01:39 +02:00
Nicolas "Pixel" Noble	a936d0669c	Adding standalone Emscripten example.	2019-04-13 22:39:42 +02:00
omar	328e4fa7e7	Merge branch 'master' into docking # Conflicts: # imgui_demo.cpp	2019-04-11 15:53:38 +02:00
omar	b8fe0df7df	Examples: Null: Added Makefile.	2019-04-08 19:16:45 +02:00
omar	cf029b3e1c	Merge branch 'master' into docking	2019-04-08 18:05:52 +02:00
omar	42423d5ea4	Examples: Makefile: Tweaks so they are more consistent with each others. Added -g./opt/local includes for MacPorts on Mac OS X. (#297 )	2019-04-07 23:02:07 +02:00
omar	1295205cd4	Examples: Vulkan: Fixed warnings. (#2480 )	2019-04-07 22:27:45 +02:00
omar	7056032483	Merge branch 'vulkan_fix_docking' into docking	2019-04-07 16:23:34 +02:00
omar	50ceb25003	Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_vulkan.cpp	2019-04-07 16:23:31 +02:00
omar	c43dab2414	Vulkan: Fix not incrementing semaphore index. (#2472 , #2071 )	2019-04-07 15:57:07 +02:00
omar	9c364b16ff	Merge branch 'vulkan_fix_master' into vulkan_fix_docking	2019-04-05 20:30:42 +02:00
omar	e099a7dc74	Vulkan: Bits. Using IM_ALLOC/IM_FREE instead of new[] / delete[].	2019-04-05 20:27:46 +02:00
omar	d61caf5714	Vulkan, Viewports: ImGui_ImplVulkan_RenderDrawData and renderer back-end automatically manage ImGui_ImplVulkanH_WindowRenderBuffers for each viewports so user doesn't have to do it. (#2461 , #2348 , #2378 , #2097 )	2019-04-05 18:52:45 +02:00
omar	e70f866ed2	Merge branch 'vulkan_fix_master' into vulkan_fix_docking (WARNING: as is the validation layer will error on same vertex/index buffer being used for all frames) # Conflicts: # examples/imgui_impl_vulkan.cpp # examples/imgui_impl_vulkan.h	2019-04-05 18:27:15 +02:00
omar	6bc47dfe48	Vulkan: Removed superfluous vkInstance parameters being passed along.	2019-04-05 18:24:28 +02:00
omar	452047c7ca	Vulkan: Removed requirement for user to pass their own render buffer storage to ImGui_ImplVulkan_RenderDrawData(), this is managed internally.	2019-04-05 18:24:28 +02:00
omar	ec76722d2d	Vulkan: Added ImageCount to InitInfo structure (!= MinImageCount) will be needed for viewports. Renamed FramesQueueSize -> ImageCount. (#2472 , #2071 )	2019-04-05 17:22:24 +02:00
MindSpunk	a45840746e	Vulkan, Viewports: Fix for resizing viewport windows crashing. (#2472 )	2019-04-05 17:04:12 +02:00
MindSpunk	9acb158990	Vulkan, Viewports: Fix for resizing viewport windows crashing. (#2472 )	2019-04-05 16:51:35 +02:00
omar	1ba79baab5	Vulkan, Viewports: Fixed ImGui_ImplVulkan_SetWindowSize() not recreating command-buffers, fence etc. (#2472 , #2461 , #2071 )	2019-04-05 16:33:41 +02:00
omar	01de69de36	Vulkan: Note for unsupported feature with multi-viewports. (#2071 )	2019-04-05 00:25:42 +02:00
omar	8ec24036d7	Vulkan: Viewports: Removed redundant field.	2019-04-05 00:01:25 +02:00
omar	29269d2aa8	Merge branch 'vulkan_fix_master' into vulkan_fix_docking # Conflicts: # examples/imgui_impl_vulkan.cpp	2019-04-04 23:55:33 +02:00
omar	0034e65c26	Vulkan: Renaming demo/helper structures. Tidying up examples main.cpp.	2019-04-04 23:40:28 +02:00
omar	4f54a527ab	Vulkan: Renaming, we want InitInfo to source MinImageCount which is the "source" value (so viewport creation can use this). Made ImGui_ImplVulkan_DestroyFrameRenderBuffers public. (#2071 )	2019-04-04 23:13:31 +02:00
omar	86f5945f49	Vulkan: Storing user info into a single g_VulkanInitInfo structure to simplify code.	2019-04-04 23:13:31 +02:00
omar	66f4be2e13	Vulkan: Added extra parameter to ImGui_ImplVulkan_RenderDrawData(). User is in charge of owning/storing 1 ImGui_ImplVulkan_FrameRenderBuffers per in-flight rendering frame. Removed ImGui_ImplVulkan_SetFramesQueueSize. (#2461 , #2348 , #2378 , #2097 , #2071 , #1677 )	2019-04-04 22:27:29 +02:00
omar	6bf981c85c	Vulkan: More renaming. Comments.	2019-04-04 22:20:01 +02:00
omar	f586764cdd	Examples: Vulkan: Merged helpers into ImGui_ImplVulkanH_CreateWindowData. Removed ImGui_ImplVulkan_InvalidateFrameDeviceObjects from API. Comments. (#2071 )	2019-04-04 22:12:16 +02:00
omar	54b8a65d9e	Examples: Vulkan: Renamed QueuedFramesCount to FramesQueueSize. Moved Framebuffer, Backbuffer to FrameData structure. (#2071 )	2019-04-04 22:12:15 +02:00
omar	317859a3da	Examples: Vulkan: Updated Changelog, removed debug code, tweaked code, made GLFW/SDL match each others. Initialize FrameDataForRender fields. Added Assertion. Clearing fields on DestroyFrameData(). (#2071 )	2019-04-04 22:11:13 +02:00
omar	c7eef99a33	Examples: Vulkan: Fixed tabs->space, removed extraneous braces and empty lines. (#2071 )	2019-04-04 22:10:43 +02:00
MindSpunk	b88a3b2711	Examples: Vulkan: Added calls to supports runtime changing back buffer count. (#2071 )	2019-04-04 22:10:43 +02:00
omar	43a85dd02e	Merge branch 'master' into docking	2019-04-04 22:10:18 +02:00
omar	1c3311e4d6	Vulkan: Avoid passing negative coordinates to vkCmdSetScissor, which debug validation layers do not like.	2019-04-04 22:09:26 +02:00
omar	fc52364652	Tabs to Spaces, comments.	2019-04-03 17:25:02 +02:00
omar	cdb109f617	Renamed freeglut vcxproj files + Comments, Changelog (#2465 )	2019-04-03 16:25:35 +02:00
Andrew Willmott	ece322ff12	freeglut -> glut rename	2019-04-03 07:19:31 -07:00
Andrew Willmott	3fad375f5f	ifdef freeglut extensions properly	2019-04-03 07:19:31 -07:00
Andrew Willmott	81f70e5b7c	Fixups for OSX	2019-04-03 07:19:31 -07:00
Andrew Willmott	a402f5b9a9	Add makefile for freeglut	2019-04-03 07:19:31 -07:00
omar	5c4cc370bb	Examples: Vulkan: Added shader sources/references in the .cpp source.	2019-04-03 11:23:54 +02:00
omar	49fb8e6c45	Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_dx9.cpp # examples/imgui_impl_opengl3.cpp	2019-04-03 11:17:26 +02:00
omar	da035ced97	InputText, Examples/SDL: Emulate \t input if back-end doesn't provide it. (#1336 , #2467 ) + Fix some output filename in SDL build batch files.	2019-04-03 11:04:00 +02:00
omar	e3cd6b1cbb	Examples: Vulkan: Using IM_ARRAYSIZE() where possible.	2019-04-02 15:34:16 +02:00
omar	3a737e665a	Examples: Vulkan: Added missing support for 32-bit indices (#define ImDrawIdx unsigned int). + demo typo	2019-04-02 10:36:35 +02:00
omar	e21bbee311	Examples: DirectX9: Fixed erroneous assert in ImGui_ImplDX9_InvalidateDeviceObjects(). FreeType: Fixed suggested code to not require an initial build call.. (#2454 )	2019-03-29 18:32:57 +01:00
omar	163779da51	Examples: DirectX12: Various tidying up.	2019-03-29 16:23:37 +01:00
omar	512d39d031	Examples: OpenGL3: Minor tweaks, clarifications + not calling glBindBuffer more than necessary in the render loop.	2019-03-29 16:17:30 +01:00
omar	a33d45d7cd	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # imgui.cpp	2019-03-28 15:48:25 +01:00
omar	20188b19d6	Comments (#2441 ) + Freeglut fixes (#2430 )	2019-03-26 12:16:23 +01:00
omar	9350158d61	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_opengl3.cpp # imgui.cpp # imgui_internal.h	2019-03-25 16:08:09 +01:00
omar	221bf93a55	Comments, todo list, remove trailing spaces.	2019-03-17 00:56:21 +01:00
omar	ff03ae503b	Examples: OpenGL: Added a dummy GL call + comments in ImGui_ImplOpenGL3_Init() to detect uninitialized GL function loaders early, and help users understand what they are missing. (#2421 )	2019-03-15 13:09:07 +01:00
omar	cf2c52282d	Version 1.70 WIP	2019-03-15 13:07:30 +01:00
omar	b1af4d36ce	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # examples/example_win32_directx10/main.cpp # examples/example_win32_directx11/main.cpp # examples/example_win32_directx12/main.cpp # examples/example_win32_directx9/main.cpp	2019-03-13 15:30:35 +01:00
omar	55c02099c5	Version 1.69, comments, typos	2019-03-13 15:29:43 +01:00
omar	a26085ed53	Internals: Fixed Navigation from reaching ImGuiItemFlags_Disabled items (#211 ) + Examples comments	2019-03-12 22:23:56 +01:00
omar	9afb849e16	Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_glfw.cpp # examples/imgui_impl_sdl.cpp	2019-03-12 18:28:47 +01:00
omar	cfa8f672f6	Examples: GLFW, SDL: Preserve DisplayFramebufferScale when main viewport is minimized. (This is particularly useful for the viewport branch because we are not supporting per-viewport frame-buffer scale. It fixes windows not refreshing when main viewport is minimized.) (#2416 )	2019-03-12 18:27:14 +01:00
omar	f7db4fad31	Merge branch 'master' into docking # Conflicts: # examples/example_win32_directx11/main.cpp # examples/example_win32_directx12/main.cpp # examples/example_win32_directx9/main.cpp # imgui.cpp	2019-03-11 16:08:16 +01:00
omar	6767b0a1b0	Examples: Win32+DirectX: moved helper functions below main.	2019-03-11 16:00:18 +01:00
omar	3eedb542a6	Viewports: Renamed ConfigViewportsNoParent to ConfigViewportsNoDefaultParent. Fix outdated comments in examples.	2019-03-11 11:07:23 +01:00
Bruce Mitchener	b5d57a6615	Fix typos. (#2413 )	2019-03-09 10:10:17 +01:00
Gilad Reich	0a6c5bc234	Examples: DirectX9: Added support for multi-viewport (#2394 )	2019-03-06 21:36:42 +01:00
omar	e91d275b10	Merge branch 'master' into docking # Conflicts: # imgui_demo.cpp	2019-03-06 21:18:46 +01:00
omar	510342f024	Examples: DirectX9: Minor changes to match the other DirectX examples more closely. (#2394 )	2019-03-06 18:00:04 +01:00
omar	49eb5f0280	Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_opengl3.cpp	2019-03-03 23:34:56 +01:00
omar	beb3062dc5	Examples: OpenGL: Fix to be able to run on ES 2.0 / WebGL 1.0. [@rmitton, @gabrielcuvillier]	2019-03-03 23:34:28 +01:00
omar	9d1a392d7d	Examples: OpenGL: Comments about versions and loaders. (#2393 , #2351 )	2019-03-03 23:25:51 +01:00
Richard Mitton	7a536f1bd2	Examples + Viewport: GLFW: context wasn't set when using multiple windows. (#2392 )	2019-03-03 23:01:43 +01:00
omar	ff0c6c2bde	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui.h	2019-02-27 19:00:09 +01:00
omar	75641926e1	Merge branch 'allegro-touch' of https://github.com/dos1/imgui into dos1-allegro-touch # Conflicts: # examples/imgui_impl_allegro5.cpp	2019-02-27 14:39:41 +01:00
omar	87ded34f9f	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_opengl3.cpp # imgui_widgets.cpp	2019-02-22 12:29:18 +01:00
omar	2068dd509c	Examples: OpenGL: Fix for OSX not supporting OpenGL 4.5, we don't try to read GL_CLIP_ORIGIN even if the OpenGL headers/loader happens to define the value. (#2366 , #2186 )	2019-02-20 14:31:19 +01:00
omar	d0c98bf880	Examples: VS: Made project paths independant of SolutionDir so they can be built aside from the solution.	2019-02-19 20:13:06 +01:00
omar	ff0f9aa856	Comments for Linux/Mac (#2117 )	2019-02-19 16:36:06 +01:00
omar	5bf9029bf9	Merge branch 'master' into docking	2019-02-18 12:16:13 +01:00
omar	d972533d09	Examples: Vulkan: Rewrote scissor processing to match other examples more closely. Removed extraneous +1 of scissor extent height.	2019-02-16 12:33:38 +01:00
omar	dd14adc731	Examples: Vulkan: Support draw_data->FramebufferScale correctly matching `a79785c` for on Metal/GL2/GL3. (#2306 , #1676 )	2019-02-16 12:32:44 +01:00
omar	f977871854	ImFont: Minor adjustment to the structure. Examples: Removed unused variable.	2019-02-15 18:56:08 +01:00
omar	09c9bf2edb	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui.h	2019-02-14 20:35:11 +01:00
omar	93d1179805	Examples: Extracted gamepad code into ImGui_ImplGlfw_UpdateGamepads(). Renamed matching Win32 function for consistency. Added more link to nothing's oversample document. Spacing bits.	2019-02-14 19:29:09 +01:00
omar	b46076458c	Examples: Win32: Removed unused code left-over from merge `e9c625a1dc`	2019-02-13 18:29:49 +01:00
omar	8691b56136	Merge branch 'master' into docking	2019-02-12 10:30:48 +01:00
omar	cc80d8e118	Examples: Metal: Compilation fix.	2019-02-12 10:30:09 +01:00
omar	169e3981fd	Examples: OpenGL2: Added #define GL_SILENCE_DEPRECATION to cope with newer XCode warnings.	2019-02-11 19:09:54 +01:00
omar	7f6a025c93	Viewport: SDL: Inherit SDL_WINDOW_ALLOW_HIGHDPI flag from main viewport. (#2306 )	2019-02-11 19:00:33 +01:00
omar	2cada3c143	Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl3.cpp # imgui.cpp # imgui_widgets.cpp	2019-02-11 18:59:49 +01:00
omar	d16dbc5b87	Examples: SDL: Using the SDL_WINDOW_ALLOW_HIGHDPI flag. (#2306 , #1676 ) [@rasky]	2019-02-11 18:52:08 +01:00
omar	a79785c0b9	ImDrawData: Added FramebufferScale field (currently a copy of the value from io.DisplayFramebufferScale). This is to allow render functions being written without pulling any data from ImGuiIO, allowing incoming multi-viewport feature to behave on Retina display and with multiple displays. If you are not using a custom binding, please update your render function code ahead of time, and use draw_data->FramebufferScale instead of io.DisplayFramebufferScale. (#2306, #1676) Examples: Metal, OpenGL2, OpenGL3: Fixed offsetting of clipping rectangle with ImDrawData::DisplayPos != (0,0) when the display frame-buffer scale scale is not (1,1). While this doesn't make a difference when using master branch, this is effectively fixing support for multi-viewport with Mac Retina Displays on those examples. (#2306) Also using ImDrawData::FramebufferScale instead of io.DisplayFramebufferScale. Examples: Clarified the use the ImDrawData::DisplayPos to offset clipping rectangles.	2019-02-11 18:52:08 +01:00
Omar Cornut	ef7940699e	Examples: Metal: Removed unnecessary loop. Fixed OSX Clang warning in imstb_truetype. (#1929 , #1873 )	2019-02-11 17:38:34 +01:00
omar	4a3a895be9	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_demo.cpp	2019-02-06 14:47:53 +01:00
omar	f366828dd2	Minor tweaks to reduce false positive of PVS Studio static analyzer.	2019-02-06 13:16:52 +01:00
omar	f6fbb99a9c	Examples: SDL: Fix for Emscripten/Android/iOS on Docking branch.	2019-02-05 15:45:26 +01:00
omar	7227454dca	Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_opengl3.cpp # imgui.cpp # imgui.h	2019-02-03 17:31:16 +01:00
omar	03b0266b59	Examples: Made imgui_impl_win32 drag gdi32.lib for GetDeviceCaps(). (#2327 )	2019-02-01 15:23:25 +01:00
omar	5fc6899dc2	Examples: OpenGL3: Using GLSL 4.10 shaders for any GLSL version over 410 (e.g. 430, 450). (#2329 ) [@BrutPitt]	2019-02-01 15:13:54 +01:00
omar	e1143377c2	Viewport: Added ImGuiViewportFlags_NoFocusOnClick + support in imgui_impl_win32. Made windows with no decoration always set the _NoFocus flags. (#1542 , #2117 ) Fix e.g. clicking on protruding combo box stealing highlight from parent window with decoration.	2019-01-30 21:39:05 +01:00
omar	13a5f5ba8b	Merge branch 'master' into docking # Conflicts: # imgui.cpp	2019-01-27 16:46:35 +01:00
omar	ab9cd44c89	Examples: DirectX9: Fix Clang warning.	2019-01-22 13:47:15 +01:00
omar	0947fa3de0	Merge branch 'viewport' into docking # Conflicts: # imgui.cpp # imgui_internal.h	2019-01-21 16:54:37 +01:00
omar	cb9a6b8a8b	Merge branch 'master' into viewport # Conflicts: # examples/README.txt # imgui.cpp	2019-01-21 16:52:22 +01:00
omar	54ba8a643e	Removed trailing spaces from text files. (#2038 , #2299 )	2019-01-20 22:23:29 +01:00
omar	f94af2f5c5	Merge branch 'viewport' into docking # Conflicts: # docs/CHANGELOG.txt # imgui.cpp # imgui_draw.cpp	2019-01-20 22:13:35 +01:00
omar	8079344cee	Merge branch 'master' into viewport # Conflicts: # examples/example_sdl_vulkan/main.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx12.cpp # examples/imgui_impl_glfw.cpp # examples/imgui_impl_sdl.cpp # examples/imgui_impl_vulkan.h # imgui.cpp	2019-01-20 22:12:06 +01:00
omar	259f3c78a2	Examples: OpenGL2: Added (yet another) comment/instruction against using opengl2 with modern OpenGL. (#2297 )	2019-01-20 18:13:39 +01:00
omar	2c38b32db1	Removed trailing spaces (#2038 , #2299 )	2019-01-20 17:56:17 +01:00
omar	82e31d34f0	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_win32.cpp	2019-01-18 12:31:33 +01:00
omar	295ada0364	Examples: Win32: Using wc.lpszClassName instead of duplicating the literal. + tweak README format.	2019-01-17 18:30:15 +01:00
omar	b8020032f9	Examples: Win32: Added support for mouse buttons 4 and 5 via WM_XBUTTON* messages. (#2264 )	2019-01-17 16:55:23 +01:00
omar	acdb4823dd	Examples: Win32: Fix for older Windows SDK.	2019-01-17 14:35:26 +01:00
omar	b5144e477f	Merge branch 'viewport' into docking # Conflicts: # docs/CHANGELOG.txt	2019-01-17 14:06:42 +01:00
omar	e9c625a1dc	Merge branch 'master' into viewport # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_win32.cpp # imgui_demo.cpp	2019-01-17 14:05:40 +01:00
omar	872477548b	Examples: Win32: Using IsChild() to be compatible with windows created within a parent. (#1951 , #2087 , #2156 , #2232 )	2019-01-17 11:45:32 +01:00
Gilad Reich	14c40242db	Examples: DirectX9: Explicitly disable fog (D3DRS_FOGENABLE) before drawing in case user state has it set. (#2288 , #2290 )	2019-01-17 11:39:40 +01:00
omar	882f1bc135	Examples: DirectX12: Targeting 10.0.14393.0 instead of 10.0.16299.0 (available on AppVeyor, and higher version doesn't seem necessary).	2019-01-16 15:10:31 +01:00
omar	8a45c56c2c	Merge branch 'viewport' into docking	2019-01-15 21:22:29 +01:00
omar	9391a97fbf	Merge branch 'master' into viewport # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_win32.cpp # examples/imgui_impl_win32.h	2019-01-15 21:22:21 +01:00
omar	f435aa193b	Examples: Win32: Added support for XInput games (if ImGuiConfigFlags_NavEnableGamepad is enabled).	2019-01-15 21:19:02 +01:00
omar	133f112af0	Examples: Win32: Using GetForegroundWindow() instead of GetActiveWindow() to be compatible with windows created in a different thread. (#1951 , #2087 , #2156 , #2232 ) [many people]	2019-01-15 20:27:32 +01:00
omar	6b32570644	Merge branch 'viewport' into docking # Conflicts: # imgui_internal.h # imgui_widgets.cpp	2019-01-07 21:29:15 +01:00
omar	5af930f97a	Merge branch 'master' into viewport # Conflicts: # imgui.cpp # imgui.h # imgui_internal.h	2019-01-07 21:28:29 +01:00
DomRe	4483320f0a	Examples: Allegro 5: Properly destroy all globals on shutdown. (#2262 )	2019-01-04 13:30:55 +01:00
Alzathar	25ac85f15d	Examples: Downgrading projects to xcode 9.2 (maybe 8.0) (#2134 ) * example_apple_opengl2: The deployment target was set to 10.12 from XCode 9.2. * imgui_impl_metal: header not found by XCode 9.2. * example_apple_metal: The deployment target was set to 10.12 from XCode 9.2.	2019-01-03 14:01:14 +01:00
omar	ce1626a51e	Merge branch 'viewport' into docking # Conflicts: # imgui.cpp # imgui.h # imgui_internal.h	2019-01-02 21:36:21 +01:00
omar	0cabe4dedf	Viewport: Added ImGuiWindowClass / SetNextWindowClass() (concept imported from Docking ImGuiDockFamily), which currently allows to overwrite viewport flags on a per-window basis. Exposed FindViewportByID(). Win32: Support for ParentViewportId. (#1542 )	2019-01-02 21:33:23 +01:00
omar	cfcad42b89	Viewport: Win32: Workaround to the fact that ::WindowFromPoint() seems to return Windows using ImGuiViewportFlags_NoInputs / HTTRANSPARENT when dragging nearby the platform title bar. This is to allow using platform decoration. I don't understand this well atm. (#1542 )	2019-01-02 19:03:45 +01:00
omar	4a6f95acc8	Viewport: Added Platform_UpdateWindow hook for general purpose: Rework Win32 code to reflect viewport flags changes into Win32 while the window is active.	2019-01-02 19:03:36 +01:00
omar	951c9dd68b	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_sdl.cpp	2019-01-02 19:00:31 +01:00
omar	d9a4cbc429	Examples: Comments about GLFW/SDL versions	2019-01-02 16:04:13 +01:00
omar	a9a60a24c1	Tweaked asserts	2018-12-23 17:51:50 +01:00
omar	a71d3c8cb3	Viewport: Misc comments following user feedbacks..	2018-12-21 18:40:16 +01:00
omar	238321c159	Fix merge in Docking branch, remove ConfigDockingWithShift flag from DX11 example + misnamed function.	2018-12-21 16:56:26 +01:00
omar	e181b0c3fc	Merge branch 'viewport' into docking	2018-12-21 16:53:13 +01:00
omar	2889a14f86	Build fix for master.	2018-12-21 16:45:24 +01:00
omar	9d0bc3f9ab	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_sdl.cpp	2018-12-21 16:43:12 +01:00
omar	b1cd52b674	Examples: SDL: Avoid testing for SDL_GetKeyboardFocus() on Android and iOS (like Emscripten). (#421 )	2018-12-21 16:41:29 +01:00
omar	afe9c5c5f7	Examples: SDL: Fixed compilation for SDL 2..0.3 and less (running on our test servers) and clarified a bit of the messy situation. Followup to `8dd83c5`. (#1542 , #2117 )	2018-12-21 16:26:17 +01:00
omar	81a2546cea	Merge branch 'viewport' into docking # Conflicts: # examples/example_allegro5/main.cpp # examples/example_win32_directx9/main.cpp	2018-12-20 23:06:29 +01:00
omar	ee5560a958	Merge branch 'master' into viewport + added style tweak block when viewports are enabled # Conflicts: # examples/example_glfw_opengl3/main.cpp # examples/example_sdl_opengl3/main.cpp # examples/example_win32_directx11/main.cpp	2018-12-20 23:04:40 +01:00
omar	d5b22fb635	Examples: Setting up style before bindings, so in complex binding (vulkan/dx12) it isn't miles away from the context creation.	2018-12-20 22:58:34 +01:00
omar	62cfdceac1	Examples: Viewport: Moved the "make current GL context" to reduce the amount of call and hopefully be more explicit about viewport enabled vs disabled requirements. (#1542 )	2018-12-20 22:40:22 +01:00
omar	8dd83c5fe8	Examples: SDL: SDL_GetMouseState() seems problematic, movements feels laggy in the non-viewport code path. (#1542 , #2117 )	2018-12-20 22:28:31 +01:00
omar	088ef6623a	Merge branch 'viewport' into docking	2018-12-18 15:03:01 +01:00
omar	5d20da1b36	Viewport, DPI: Now using DpiScale from the ImGuiPlatformMonitor array instead of calling Platform_GetWindowDpiScale() before the platform window creation. Might even tentatively see if things work out without Platform_GetWindowDpiScale. (#1676 )	2018-12-14 12:12:26 +01:00
omar	e6439e1a16	Merge branch 'viewport' into docking + moved io.ConfigFlags ImGuiConfigFlags_DockingNoSplit to io.ConfigDockingNoSplit # Conflicts: # imgui.cpp # imgui.h # imgui_demo.cpp	2018-12-10 16:21:49 +01:00
omar	f768727284	Merge branch 'viewport' into docking # Conflicts: # imgui.cpp	2018-12-06 16:36:17 +01:00
omar	f3a0b17bb8	Viewport: Win32, GLFW, SDL: Clarified back-ends by using global mouse position direction. GLFW: disabled io.MouseHoveredViewport setting under Mac/Linux. (#1542 , #2117 ) + various comments.	2018-12-06 16:30:10 +01:00
omar	5105c6c0d0	Merge branch 'viewport' into docking # Conflicts: # docs/CHANGELOG.txt # imgui.cpp	2018-12-04 00:06:26 +01:00
omar	3a678d48b1	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp	2018-12-04 00:05:45 +01:00
omar	8d58055a54	Examples: DirectX10/11/12: Made imgui_impl_dx10/dx11/dx12.cpp link d3dcompiler.lib from the .cpp file to ease integration.	2018-12-03 17:47:10 +01:00
omar	ac10889bde	Merge branch 'viewport' into docking # Conflicts: # docs/CHANGELOG.txt	2018-12-03 11:44:51 +01:00
omar	89a530b442	Somehow VS keeps modifying this GUID so I am going to playing along with it.	2018-12-03 11:44:08 +01:00
omar	65e579e558	Merge branch 'master' into viewport # Conflicts: # docs/CHANGELOG.txt # 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_opengl3.cpp # examples/imgui_impl_sdl.cpp # examples/imgui_impl_vulkan.cpp # examples/imgui_impl_win32.cpp # imgui.h # imgui_demo.cpp	2018-12-03 11:41:53 +01:00
omar	801645d350	Version 1.66b (will revisit how to change IMGUI_VERSION_NUM across versions, this commit reduces the numerical IMGUI_VERSION_NUM compared to the commit on Nov 22).	2018-12-03 10:17:17 +01:00
omar	48f6fdb349	Fixed typo.	2018-11-30 18:30:21 +01:00
omar	7658035e5a	About, IO: Added io.BackendPlatformName, io.BackendRendererName for informational/QA purpose.	2018-11-30 18:30:21 +01:00
omar	f78b5a0cdb	Merge branch 'viewport' into docking	2018-11-30 18:27:14 +01:00
omar	afeefadb4e	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_glfw.cpp # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_sdl.cpp # examples/imgui_impl_win32.cpp # imgui.h	2018-11-30 18:24:43 +01:00
omar	a423f032ee	About, IO: Added io.BackendPlatformName, io.BackendRendererName for informational/QA purpose.	2018-11-30 18:18:15 +01:00
Sebastian Krzyszkowiak	b2e7a3806a	Examples: Allegro5: Add touchscreen support	2018-11-30 16:54:30 +01:00
omar	3c114b280a	Merge branch 'viewport' into docking # Conflicts: # imgui_internal.h	2018-11-29 21:30:26 +01:00
omar	01f940dc9a	Viewport: imgui_impl_sdl2: Added support for PlatformIO Platform_SetWindowAlpha.	2018-11-28 22:50:48 +01:00
omar	19c4fa8dd5	Examples: DX12: Fixed compilation of imgui_impl_dx12.cpp in viewport branch. Multi-viewport is still not functional.	2018-11-28 15:43:00 +01:00
omar	b8d9c5c130	Merge branch 'viewport' into docking # Conflicts: # imgui.cpp	2018-11-26 21:36:48 +01:00
omar	12a1e7d04e	Viewport: Comment to suggest making WindowBg opaque when viewports are enabled.	2018-11-26 19:20:37 +01:00
omar	ddc3f8f069	Merge branch 'viewport' into docking # Conflicts: # docs/CHANGELOG.txt # imgui.cpp # imgui_internal.h	2018-11-26 15:32:04 +01:00
omar	5261e5a6ba	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_sdl.cpp	2018-11-26 14:53:51 +01:00
omar	35d648341b	Examples: SDL: changed the signature of ImGui_ImplSDL2_ProcessEvent() to use a const SDL_Event*. (#2187 )	2018-11-23 18:12:37 +01:00
omar	d8ab2c1ac9	Viewport: Added support for minimized window which caused problem when ImGuiBackendFlags_HasMouseHoveredViewport was not supported. (#1542 ) + todo	2018-11-23 16:55:33 +01:00
omar	862781b195	Viewport: Avoid unnecessary reapplying platform pos/size every frame. (#2205 ) + Fix GLFW ImGui_ImplGlfw_CreateWindow() from not applying position immediately. Clear LastNameHash properly (bug already fixed in Docking branch)	2018-11-23 16:35:17 +01:00
omar	2515413080	Merge branch 'viewport' into docking # Conflicts: # docs/CHANGELOG.txt # imgui_widgets.cpp	2018-11-22 15:29:18 +01:00
omar	d87b80c6c1	Merge branch 'master' into viewport # Conflicts: # imgui.cpp	2018-11-22 15:28:27 +01:00
omar	c00a3bd98f	Examples: SDL2+Vulkan: Fixed application shutdown which could deadlock on Linux + Xorg. (#2181 )	2018-11-21 18:43:25 +01:00
omar	be66f94639	Examples: OpenGL3: More explicit testing for == GL_UPPER_LEFT in case glGetIntegerv(GL_CLIP_ORIGIN is not honored properly. (#2186 , #2195 ) Fix `f52f0a5277`	2018-11-21 18:24:24 +01:00
omar	4a43f347bb	Merge branch 'viewport' into docking # Conflicts: # examples/example_allegro5/main.cpp # examples/example_marmalade/main.cpp	2018-11-15 14:00:01 +01:00
omar	dcbf976a8e	Merge branch 'master' into viewport + comments # Conflicts: # examples/imgui_impl_opengl3.cpp # imgui.cpp	2018-11-15 13:58:46 +01:00
omar	f52f0a5277	Examples: OpenGL3: Added support for GL 4.5's glClipControl(GL_UPPER_LEFT). (#2186 )	2018-11-13 18:54:02 +01:00
omar	a3d6554e8e	Merge branch 'master' into viewport + specific changes for GLFW callbacks # Conflicts: # examples/example_glfw_opengl3/main.cpp # examples/example_win32_directx11/main.cpp # examples/example_win32_directx9/main.cpp # examples/imgui_impl_glfw.cpp	2018-11-08 16:56:51 +01:00
omar	772354377b	Examples: GLFW: User previously installed GLFW callbacks are now saved and chain-called by the default callbacks. (#1759 )	2018-11-08 16:24:41 +01:00
omar	9d155c73bc	Examples: Misc comments mainly related to GLFW callbacks. (#1759 )	2018-11-08 16:06:22 +01:00
omar	a419d46205	Examples: OpenGL3+GLFW/SDL: Made main.cpp compile with IMGUI_IMPL_OPENGL_LOADER_CUSTOM (may be missing init). (#2178 )	2018-11-08 15:14:09 +01:00
omar	565af90958	Merge branch 'viewport' into docking	2018-11-06 09:52:38 +01:00
omar	131bf5ee4a	Examples: SDL: Tweaked Windows instructions and batch files. (#2175 )	2018-11-06 09:51:21 +01:00
omar	797f2044cd	Viewport: Fixed SDL+OpenGL2 example to work with multi-viewports. (#2175 )	2018-11-06 09:51:09 +01:00
omar	5ea08394f5	Examples: SDL: Tweaked Windows instructions and batch files. (#2175 )	2018-11-06 09:46:43 +01:00
omar	9ee86f22b7	Examples: Win32: Handle UTf-8 in platform window title setting. (#2164 )	2018-11-05 17:37:06 +01:00
omar	52ca91ca57	Merge branch 'master' into viewport	2018-11-05 17:29:31 +01:00
omar	f388216ff0	Examples: GLFW: VS2015 project link with legacy_stdio_definitions.lib in order to link with the precompiled VS2010 GLFW3.lib we provide. (#2010 , #2043 , #2091 )	2018-11-05 17:28:09 +01:00
Michał Janiszewski	2e6e1bec58	Examples: Add missing include guards (#2166 )	2018-11-01 20:56:36 +01:00
Cort	ed0f7004d0	Examples: Vulkan: Avoid unreferenced parameter warning. (#2162 )	2018-10-30 21:15:30 +01:00
Hui	e6db078eda	gladLoadGL() return 0 to indicate failure (#2157 )	2018-10-29 15:51:32 +01:00
omar	168af9b377	Merge branch 'viewport' into docking # Conflicts: # imgui_demo.cpp	2018-10-25 23:45:19 +02:00
omar	50f6e12d31	Merge branch 'master' into viewport # Conflicts: # imgui.cpp	2018-10-25 23:41:13 +02:00
omar	ac9aaf4b6e	Comments in demo and opengl code + Internals: Added HoveredIdNotActiveTimer tracking hovering time unless the item is active, which is a commonly useful pattern.	2018-10-25 17:45:48 +02:00
omar	5f8c9ae0ef	Merge branch 'viewport' into docking # Conflicts: # imgui.cpp # imgui.h	2018-10-18 10:57:54 +02:00
omar	056af2b1af	Merge branch 'master' into viewport # Conflicts: # imgui.cpp # imgui.h	2018-10-18 10:56:26 +02:00
Brandon	5f79a28a07	Examples: SDL: Fixed usage of SDL_GetDisplayDPI (#2137 , #1676 )	2018-10-18 10:48:18 +02:00
omar	745f01022e	Examples: Downgraded Xcode project object version (50->48) to support Xcode 9.2 (last version supported on macOS 10.12) (#2133 , #1929 )	2018-10-17 10:48:53 +02:00
Warren Moore	b4488d4f48	Examples: Downgraded Xcode project object version (50->48) to support Xcode 9.2 (last version supported on macOS 10.12) (#2133 )	2018-10-17 10:46:49 +02:00
omar	e73217d6f7	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_sdl.cpp # imgui.cpp	2018-10-12 15:50:48 +02:00
omar	c398153b40	Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_sdl.cpp # imgui.cpp # imgui_internal.h	2018-10-12 13:01:20 +02:00
hesiod	500a60debc	Examples: OpenGL3: Cast compile/link status to GLboolean (#2112 , #2125 ) Some OpenGL loaders/bindings do not allow comparisons between GLints and GLbooleans.	2018-10-07 18:14:24 +02:00
omar	02afbaeef0	Examples: imgui_imp_opengl3.cpp explicit casting for overly aggressive glbinding compatibility. (#2112 ) [@hesiod]	2018-10-06 11:35:05 +02:00
omar	a3b0e0acfa	Examples: DirectX10, DirectX11: Removed seemingly unnecessary calls to invalidate and recreate device objects in the WM_SIZE handler. (#2088 )	2018-10-05 11:36:49 +02:00
Michael Vetter	084c26aa41	Fix spacing in imgui_imp_sdl example (#2111 )	2018-10-05 10:04:10 +02:00
omar	2cff3f6a65	Docking: Renamed io.ConfigDockingWithKeyMode to io.ConfigDockingWithShift.	2018-10-01 18:35:21 +02:00
omar	c6193d0605	Merge branch 'viewport' into docking	2018-09-26 21:35:09 +02:00
omar	6cc380fc41	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_win32.cpp # examples/imgui_impl_win32.h # imgui.cpp	2018-09-26 21:34:52 +02:00
omar	788febf044	Examples: Vulkan: Fixed some minor discrepency in the SDL+Vulkan example to match the Glfw+Vulkan example. (cc #2097 )	2018-09-24 10:13:01 +02:00
omar	fda57f48d5	Merge branch 'viewport' into docking # Conflicts: # examples/example_glfw_opengl2/main.cpp # examples/example_glfw_opengl3/main.cpp # examples/example_glfw_vulkan/main.cpp # examples/example_sdl_opengl2/main.cpp # examples/example_sdl_opengl3/main.cpp # examples/example_sdl_vulkan/main.cpp # examples/example_win32_directx10/main.cpp # examples/example_win32_directx11/main.cpp # examples/example_win32_directx12/main.cpp # examples/example_win32_directx9/main.cpp	2018-09-21 11:52:32 +02:00
omar	7abc368927	Viewport: GLFW: Build fix for pre GLFW 3.2 (#1542 )	2018-09-20 18:46:36 +02:00
omar	7c3b9172ad	Examples: Referring to missing gamepad support in back-end that are missing it.	2018-09-20 10:37:55 +02:00
omar	b57baa5ba0	Viewport: Enabled viewports by default in more example apps.	2018-09-20 10:31:23 +02:00
omar	e32256b4b4	Merge branch 'viewport' into docking # Conflicts: # docs/CHANGELOG.txt # imgui_demo.cpp # imgui_internal.h	2018-09-14 11:38:10 +02:00
omar	b85f345369	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_dx9.cpp # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_vulkan.cpp	2018-09-14 11:32:55 +02:00
omar	1afd29d382	Examples: Using "dear imgui" terminology in all examples headers/comments + fix minor typo.	2018-09-13 16:50:13 +02:00
omar	9cc63ba279	Internals: Replace unsigned short with ImWchar when dealing with character storage (missing cases) + in imgui_impl_ file keep using neutral type everywhere, added missing explicit cast in three bindings. (#2078 )	2018-09-11 22:00:57 +02:00
omar	df65d4a14f	Merge branch 'master' into viewport # Conflicts: # imgui.cpp # imgui_internal.h	2018-09-11 11:18:46 +02:00
omar	b872aa5c8e	Docking: io.ConfigResizeWindowsFromEdges default to true in Docking branch. Moved code in BeginTabItem().	2018-09-10 11:24:27 +02:00
MindSpunk	7eadcf7d7d	example_glfw_vulkan was missing a reference to imgui_widgets.cpp (#2071 , #2036 )	2018-09-09 21:09:58 +02:00
omar	a82be53407	Merge branch 'docking2' into viewport_docking # Conflicts: # examples/example_glfw_opengl2/main.cpp # examples/example_glfw_opengl3/main.cpp # examples/example_glfw_vulkan/main.cpp # examples/example_sdl_opengl3/main.cpp # examples/example_sdl_vulkan/main.cpp # examples/example_win32_directx10/main.cpp # examples/example_win32_directx11/main.cpp # examples/example_win32_directx12/main.cpp # imgui.cpp # imgui.h # imgui_demo.cpp # imgui_internal.h	2018-09-06 22:28:21 +02:00
omar	49533bc86e	Examples: Enabled Docking + Nav by default in the branch. (#351 )	2018-09-06 21:53:35 +02:00
omar	bdb30d7145	Merge branch 'master' into viewport	2018-09-05 11:08:57 +02:00
Jiří Šebele	f8b7e4d94f	Examples: imgui_impl_opengl3 Fix GLAD error condition (#2059 , #2002 ) `gladLoadGL` returns 0 on fail, not the other way around.	2018-09-03 19:36:02 +02:00
omar	fd201a90f1	Merge branch 'master' into viewport # Conflicts: # imgui.cpp	2018-08-31 18:39:02 +02:00
omar	5d40d295b3	Comments, readme updates	2018-08-31 11:37:14 +02:00
Omar Cornut	be6ea86f8d	OSX: Added imgui_widgets.cpp to xcode project files.	2018-08-31 11:29:25 +02:00
omar	e312363007	Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036 )	2018-08-30 19:00:33 +02:00
omar	01586d33f3	Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036 )	2018-08-30 14:29:11 +02:00
omar	36b2f64051	Merge branch 'master' into viewport # Conflicts: # examples/example_glfw_opengl3/main.cpp # examples/imgui_impl_opengl3.cpp # imgui.cpp # imgui_internal.h	2018-08-29 17:40:52 +02:00
omar	1b61b6b208	Examples: Vulkan: Minor tweaks.	2018-08-28 18:22:36 +02:00
omar	b127027cbd	Examples: OpenGL: Added support for glew and glad OpenGL loaders out of the box. (#2001 , #2002 ). Changelog, tweaks, applied changes to SDL+OpenGL3 example.	2018-08-28 16:08:04 +02:00
Jérémie Dumas	e476b7e727	WIP on configurable OpenGL loader. (#2001 , #2002 )	2018-08-28 16:07:58 +02:00
omar	705ff49400	Examples: Vulkan: Viewport: Tweak to improve framerate on multiple-viewport situations, tho it is still halving the unthrottled framerate on nvidia for some reason.. Followup to `4dea032` (#1542 )	2018-08-25 21:21:14 +02:00
omar	f81caac459	Merge branch 'master' into viewport # Conflicts: # imgui.cpp # imgui.h	2018-08-25 21:19:42 +02:00
omar	4dea0327e7	Examples: Vulkan: Fixed handling of VkSurfaceCapabilitiesKHR::maxImageCount = 0 case. Tweaked present mode selections.	2018-08-25 21:16:08 +02:00
omar	0ada716184	Examples: Viewport: Disabling swap intervals / vsync on secondary context to match what the DX11 bindings is doing. (#1542 )	2018-08-25 20:15:18 +02:00
omar	a4191857c1	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_vulkan.h # imgui.cpp	2018-08-22 21:35:44 +02:00
omar	7268c65d73	Examples: imgui_impl_vulkan: Comments (re)	2018-08-22 17:59:58 +02:00
omar	3fdfac3377	Examples: imgui_impl_vulkan: Comments	2018-08-22 16:43:29 +02:00
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 )	2018-08-15 16:15:44 -07:00
omar	e5f2295398	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl3.cpp # imgui.cpp	2018-08-13 17:50:48 -07:00
omar	421dc19798	Examples: Cast to ImTextureID instead of void* when assigning to TexId. Applied to all examples. (#2015 )	2018-08-09 17:49:48 +02:00
Ryan Crandall	9c0805010f	imgui_impl_dx12: Cast to ImTextureID instead of void* to enable redefinition of ImTextureID (#2015 , #301 )	2018-08-09 17:44:29 +02:00
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 )	2018-08-09 17:42:53 +02:00
Ryan Crandall	34203d5008	imgui_impl_win32: Don't redefine WIN32_LEAN_AND_MEAN if already defined (#2014 )	2018-08-09 17:32:31 +02:00
luk1337	e3eb4111cc	Examples: Fix 'How to build' instructions for SDL2 examples (#2012 )	2018-08-08 18:55:09 +02:00
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).	2018-08-08 17:41:30 +02:00
omar	00e29832d4	Examples: OpenGL2: Disabling/restoring GL_LIGHTING and GL_COLOR_MATERIAL to increase compatibility with legacy OpenGL applications. (#1996 )	2018-08-03 15:04:35 +02:00
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	2018-08-01 12:27:56 +02:00
omar	d69b2a1c1d	Changelog for #1989	2018-08-01 12:23:59 +02:00
Matthias Moulin	6011ddf1e5	imgui_impl_dx11: Using ID3D11Factory instead of ID3D11Factory1 (#1989 )	2018-08-01 12:22:04 +02:00
omar	b1fc988c6b	imgui_impl_glfw, imgui_impl_sdl: Workaround for Emscripten which doesn't seem to handle focus related calls. (#1941 )	2018-08-01 11:34:17 +02:00
omar	b217251a63	Added Visual Studio 2017+ build cruft to Ignore List (.vs/ folder)	2018-07-31 18:48:24 +02:00
omar	9824bf1ba1	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_opengl3.cpp # imgui.cpp	2018-07-31 12:12:56 +02:00
omar	067edd09f9	imgui_impl_opengl3: Comments. (#1987 )	2018-07-30 18:44:58 +02:00
Dado	81562b2b5a	Examples: imgui_impl_opengl3.cpp Using #ifdef GL_SAMPLER_BINDING instead of if (glBindSampler) (#1985 )	2018-07-30 15:38:13 +02:00
Marcel Smit	faa7dad537	Examples: imgui_impl_osx: Fix for incorrect DeltaTime calculation on mac OS. (#1978 )	2018-07-30 14:15:24 +02:00
omar	544db70852	Examples: OpenGL3: Tweaks, added changelog. (#1941 )	2018-07-30 14:00:53 +02:00
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	2018-07-30 13:52:18 +02:00
omar	352695bc57	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_sdl.cpp # imgui.cpp	2018-07-24 16:50:49 +02:00
omar	ff83d0e369	Examples: Using fully qualified "Dear ImGui" name in window titles.	2018-07-23 17:31:13 +02:00
omar	d016ef1825	Examples: SDL: Removed SDL_HAS_WARP_MOUSE_GLOBAL in the non-viewport branch. (#1954 ) (+1 squashed commits)	2018-07-19 12:51:20 +02:00
omar	7b4fbf4301	Viewport: Removed the need for the back-end to fill io.MousePosViewport, it seems unnecessary at this point. (#1542 )	2018-07-17 16:37:10 +02:00
omar	ee98a069f0	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp # imgui_demo.cpp	2018-07-16 22:25:36 +02:00
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.	2018-07-16 22:17:34 +02:00
omar	abe7b190dc	Examples: DX10, DX11: Fixed unreleased resources in Init and Shutdown functions. (#1944 )	2018-07-13 11:25:54 +02:00
omar	88df66ec83	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_opengl3.cpp # imgui.cpp # imgui.h # imgui_draw.cpp # imgui_internal.h	2018-07-12 10:03:18 +02:00
omar	59fb3274a7	Examples: include for intptr_t on tdm-gcc + mingw32 (#1936 ) + mouse buttons comments	2018-07-11 20:03:47 +02:00
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.)	2018-07-10 18:29:57 +02:00
omar	de13261f1b	OpenGL3: Added error output when shaders fail to compile / link. (#1938 )	2018-07-10 16:09:34 +02:00
omar	14cef31467	Merge branch 'master' into viewport # Conflicts: # imgui.cpp	2018-07-09 16:24:01 +02:00
omar	6201cad2b4	Examples: Comments, Demo: Log early out, TODO. (#1553 )	2018-07-09 11:43:53 +02:00
omar	6277781e83	Merge branch 'master' into viewport # Conflicts: # imgui.cpp	2018-07-08 13:08:16 +02:00
omar	89e2ddf07f	Examples: Comments + shallow coding convention tweak to be consistent across examples and with imgui_impl_osx	2018-07-08 11:16:11 +02:00
omar	569e0f07f1	Examples: Removed old example_apple/ + tweak comments (#1873 )	2018-07-08 10:57:16 +02:00
Omar Cornut	839e4d34bd	Merge branch 'warrenm_osx'	2018-07-08 10:47:55 +02:00
Omar Cornut	c3f9220c15	Apple: Fixed example_osx_opengl2, renamed to example_apple_opengl2 + misc comments	2018-07-08 10:47:31 +02:00
Warren Moore	d64157e803	Introduced a new Metal renderer implementation and a new example illustrating usage of Metal on macOS and iOS (partially addresses #1873 )	2018-07-05 21:58:15 +09:00
omar	7b2662d245	Examples: Comments, bits of documentation	2018-07-04 19:06:28 +02:00
omar	deb7aa29cd	OSX: Various tweaks to imgui_impl_osx courtesy of @warrenm + fix NewFrame position which has been moved recently master. (#1873 )	2018-07-04 13:24:16 +02:00
omar	0d7e779b37	Merge branch 'master' into osx # Conflicts: # examples/.gitignore # examples/README.txt	2018-07-04 13:13:11 +02:00
omar	a765c83bad	Ignore list: added emscripten output	2018-07-03 15:57:34 +02:00
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	2018-07-02 20:13:16 +02:00
Konstantin Podsvirov	ddb09c6011	Examples: Ignore all *.user files (#1919 ) For example `Qt Creator` create `CMakeLists.txt.user` file with user settings.	2018-07-02 19:43:33 +02:00
omar	c4e34aaace	Examples: Comments to clarify how the keyboard data is indexed.	2018-06-30 14:33:45 +02:00
codecnotsupported	b62cc5c150	Fix include Example_glfw_vulkan cmake (#1916 ) Probably got broken because of the refactor.	2018-06-30 10:53:36 +02:00
omar	62b3d7c51e	Fixed software Hand cursor from not actually working. Fixed demo from crashing. Fixed typo and extraneous trailing space. Added Changelogs. (#1913 , #1914 )	2018-06-29 16:36:40 +02:00
Aiekick	ecd9a223e3	add hand cursor support (+11 squashed commit)	2018-06-29 16:36:40 +02:00
Omar Cornut	42a919f303	Examples: Apple: Fixed paths of GLFW+GL2 example. (#1906 ) Update ignore list.	2018-06-27 09:39:52 +02:00
omar	c38fe6b0e1	Merge branch 'master' into viewport # Conflicts: # imgui.cpp	2018-06-26 12:41:36 +02:00
omar	a1ec7723ef	Examples: OpenGL3: Remove misleading or unnecessary "#version 150" strings.	2018-06-25 09:50:06 +02:00
omar	20e89201cb	Examples: Fixes.	2018-06-23 09:42:47 +02:00
omar	d3ee3e7ab5	Fixed merge.	2018-06-23 09:39:05 +02:00
omar	ce500f8727	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_glfw.cpp # examples/imgui_impl_win32.cpp	2018-06-22 12:01:42 +02:00
omar	d68633398b	Examples: Vulkan: nverted the parameters to ImGui_ImplVulkan_RenderDrawData() to be consistent with other bindings.	2018-06-22 10:02:02 +02:00
omar	f9a5ff7a19	Examples: DirectX12: Moved the ID3D12GraphicsCommandList* parameter from ImGui_ImplDX12_NewFrame() to ImGui_ImplDX12_RenderDrawData() which makes a lots more sense. (#301 )	2018-06-21 12:13:04 +02:00
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	2018-06-21 12:04:00 +02:00
omar	528b0b4af6	Examples: SDL+OpenGL2: Fixed Makefile. (#1886 )	2018-06-20 11:17:33 +02:00
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 )	2018-06-20 11:06:29 +02:00
omar	2ce121b7d0	Readme, Links, Bindings	2018-06-16 10:43:05 +02:00
omar	40845852b9	Fixed warnings + readme	2018-06-16 10:23:11 +02:00
Omar Cornut	a402edb66c	Examples: OSX: Added clipboard support. Fixed ignore list for xcode cruft. Comments about broken keys. (#1873 )	2018-06-15 23:01:26 +02:00
omar	9a5f742e63	Fixed merge.	2018-06-15 19:48:51 +02:00
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	2018-06-14 15:30:15 +02:00
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.	2018-06-13 19:22:47 +02:00
omar	087ab2acbf	Examples: Fixed example vcproj names in Viewport branch.	2018-06-13 15:59:21 +02:00
omar	be4b8b5615	Internals: Added GetItemID(), GetFocusID() for consistency. Made GetActiveID() inline. Comments, fixed typos, demo tweaks.	2018-06-13 00:02:19 +02:00
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	2018-06-12 16:24:24 +02:00
Omar Cornut	e54b61aa0f	Examples: OSX: Fixed obsolete enums. Fixed keyboard mapping. Added missing keyboard modifiers. (#1873 )	2018-06-11 21:07:14 +02:00
omar	f96c7fac91	Examples: FreeGLUT: Fixed mapping of Space key. (#801 )	2018-06-11 20:03:35 +02:00
omar	cdf51cad2d	Comments, documentation	2018-06-11 19:52:40 +02:00
omar	a1b6766d43	Examples: FreeGLUT: Added FreeGLUT bindings. Added FreeGLUT+OpenGL2 example. (#801 )	2018-06-11 19:27:57 +02:00
omar	bdb3d72d37	Examples: Win32: Fixed handling of mouse wheel messages to support finer position messages (typically sent by track-pads). (#1874 )	2018-06-11 17:36:18 +02:00
omar	7acb46bec5	Examples: Comments to make ImGuiConfigFlags_NoMouseCursorChange more visible (#1027 ). + Allegro5: Added support for ImGuiConfigFlags_NoMouseCursorChange flag.	2018-06-11 12:33:51 +02:00
omar	fac0c801da	Examples: Added imgui_impl_osx.mm bindings (#1870 , #281 )	2018-06-11 10:19:17 +02:00
omar	6f7b7807ad	Fixed Travis path + various paths in comments/documentations	2018-06-10 16:14:43 +02:00
omar	9660657e95	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_sdl.cpp	2018-06-10 15:59:35 +02:00
omar	5a13e4dcde	Examples: Renamed imgui_impl_sdl2.cpp to imgui_impl_sdl.cpp (#1870 ) + changelog bits	2018-06-10 15:58:21 +02:00
omar	8d58fbb5ed	Examples: Renamed example folders. (#1870 )	2018-06-10 15:42:14 +02:00
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	2018-06-10 15:04:46 +02:00
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)	2018-06-08 19:37:33 +02:00
omar	24fc7c30dd	Examples: Documentation	2018-06-08 00:00:12 +02:00
omar	06aa9d8d9a	Examples: Fixed Makefile, batch files.	2018-06-07 22:30:10 +02:00
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 )	2018-06-07 22:10:31 +02:00
omar	77d51ebf24	Examples: Added .. folder in include path to remove the awkward #include "../imgui_impl_xxx.h" statements.	2018-06-07 19:20:04 +02:00
omar	929522febe	Missing examples changelog bits and todo list	2018-05-25 12:51:24 +02:00
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	2018-05-25 12:44:56 +02:00
omar	9770c8b21d	Examples: OpenGL3: Removed unnecessary backup/restore of GL_ELEMENT_ARRAY_BUFFER_BINDING since this is part of the VAO state. (#1836 )	2018-05-25 12:09:14 +02:00
omar	5fd23eeb74	Examples: iOS: Fixed missing call to CreateContext() + various shallow coding style tweaks. (#1835 )	2018-05-24 17:42:50 +02:00
omar	bef0a13283	Examples: Comments about GLSL version not being the same as GL context version. (#1828 )	2018-05-21 11:28:30 +02:00
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 )	2018-05-21 10:36:50 +02:00
ice1000	e8a72d3e72	Examples: GLFW* Make subsequent window creation possible.	2018-05-21 10:34:17 +02:00
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	2018-05-17 15:03:56 +02:00
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 )	2018-05-14 17:47:22 +02:00
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	2018-05-11 22:22:41 +02:00
omar	090eb437ed	Viewport, Platform: Cleaned up xxx_UpdateMouseCursor() functions to make them more consistent. (#1542 )	2018-05-11 16:41:43 +02:00
omar	d574604a5d	Viewport, Platform: Win32: Fixed handling of io.WantSetMousePos + added a bunch of comments. GLFW, SDL2: Added handling of io.WantSetMousePos. (#1542 )	2018-05-11 16:41:03 +02:00
omar	6eacddb50f	Viewport: Changed Monitor field to use Pos+Size (more consistent), changed FullMin,FullMax to MainPos,MainSize. Made main viewport accessible in PlatformIO on first frame. Fixed casing of ImGuiViewportFlags_TopMost flag. (#1542 )	2018-05-10 13:10:04 +02:00
omar	39f4761ff7	TODO list update + Changelog and comments for #1803 .	2018-05-09 15:48:33 +02:00
Elias Daler	895647a240	Fixed clipboard paste memory leak in SDL examples. (#1803 )	2018-05-09 15:48:33 +02:00
omar	4ff23d3306	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_dx9.cpp # imgui.cpp # imgui.h	2018-05-07 22:23:58 +02:00
omar	4310bad32a	Examples: DirectX9: Comments, updated changelog, notes about usage of imconfig.h (#1790 , #1687 )	2018-05-07 11:52:48 +02:00
SR_team	d0051ce5cb	add renderstate D3DRS_SHADEMODE for Dx9 impl add backuping transform for Dx9 impl (#1790, #1687)	2018-05-07 11:52:48 +02:00
omar	cd51f37fc0	Viewport, Platform: Refresh monitor list (win32, glfw) + avoid calling GetWindowFocus before platform window creation to not require of backend to null-check things inconsistently. (#1542 )	2018-04-26 16:18:47 +02:00
omar	da70c837da	Viewport: Removed unnecessary fields (now that the coordinate system is consistent accross viewports): MouseRefPrevViewport, MouseClickedPosViewportId. (#1542 )	2018-04-26 15:30:19 +02:00
omar	eb1c36fdfb	Added IMGUI_CHECKVERSION() macro to compare version string and data structure sizes in order to catch issues with mismatching compilation unit settings. (#1695 , #1769 )	2018-04-25 22:07:14 +02:00
omar	3b9b1956cd	Merge branch 'master' into viewport # Conflicts: # examples/allegro5_example/imgui_impl_a5.cpp # examples/allegro5_example/imgui_impl_a5.h # examples/allegro5_example/imgui_impl_allegro5.cpp # examples/allegro5_example/imgui_impl_allegro5.h # examples/allegro5_example/main.cpp # examples/imgui_impl_allegro5.cpp # examples/imgui_impl_allegro5.h # imgui.cpp # imgui_internal.h	2018-04-25 15:32:04 +02:00
omar	7a41e0b1ea	Platform: Added platform_io.Platform_SetWindowFocus, Platform_GetWindowFocus function wrappers (unused yet). Exact specs tbd because our simplified concept of focus doesn't necessary match the more complex OS native concepts. (#1542 )	2018-04-25 15:15:14 +02:00
omar	e3e4b7bdf5	Viewport: Fixed mouse hover flicker on mouse button release frame after moving a window. (#1542 ) Platform: Clarifying some comments in back-ends.	2018-04-24 17:10:27 +02:00
omar	cb78e62df9	Viewport, Platform: Fixed IME positioning for multi-viewport. Moved API from ImGuiIO to ImGuiPlatformIO. Because it is extremely unlikely to people redefined this API manually the moving-forward-breakage is ok. (#1542 ) SDL2 ime support under Win32 never worked properly because of SDL interferences.	2018-04-24 12:40:38 +02:00
omar	376f2aec54	Viewport: Clamp windows within monitors + fallback rescue window when it is out of sight (e.g. removed monitor, changed resolution) + Win32: declare primary monitor at the beginning of the list. (#1542 )	2018-04-23 23:01:37 +02:00
omar	d268471285	Viewport: Added ImGuiConfigFlags_ViewportsNoMerge flag (to enforce a platform window for all floating windows) + minor tidying up and addition of non-functional wip code.	2018-04-23 18:56:25 +02:00
omar	423577e14e	Viewport, Platforms: SDL: Fixed initial focus click being ignored as a mouse button. GLFW: Fixed mouse cursor support for multi-viewport with GLFW 3.3 (current master) - somehow doesn't appear to work with GLFW 3.2 but I'm not too fussed about it. (#1542 )	2018-04-23 16:46:25 +02:00
omar	4433ce4312	Viewport, Platform: Added work area in ImGuiPlatformMonitor. Renamed fields. (#1542 )	2018-04-23 12:38:20 +02:00
omar	456bbffcc4	Viewport: Switched to using unified platform-absolute mouse coordinates, which simplify lots of problems and simplify/reduce tricky conversions, makes ImVec2 less ambiguous. Fixed various viewport/windowing/popups/synchronization bugs. Settings on host-viewport are stored as relative (made settings decently compatible between viewport enable/disabled settings). Merged ImGuiViewport::Pos and ::PlatformPos. Tweaked thumbnails. Better, smaller code. (#1542 )	2018-04-20 21:36:36 +02:00
omar	17a7f352b5	Viewporrt. Examples: DirectX10,11: Make the platform SetWindowSize handler not crash on failure to resize, which could happen (rarely) on invalid data or bug in the code.	2018-04-19 17:23:43 +02:00
omar	637d9c42bf	Viewport: WIP for Tooltips, Popups, Menus to create their own viewport. Resizing a window allows it to leave the main viewport. (#1542 )	2018-04-19 13:12:02 +02:00
omar	bcac02809f	Examples: Allegro 5: Renamed bindings from imgui_impl_a5.cpp to imgui_impl_allegro5.cpp.	2018-04-18 21:55:12 +02:00
omar	3913297384	Examples: Allegro 5: Added support for 32-bit indices setup via defining ImDrawIdx, to avoid an unecessary conversion (Allegro 5 doesn't support 16-bit indices).	2018-04-18 21:51:14 +02:00
omar	1c385c2ca4	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx12.cpp # examples/imgui_impl_dx9.cpp # examples/opengl2_example/imgui_impl_glfw_gl2.cpp # examples/opengl3_example/imgui_impl_glfw_gl3.cpp # examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp # examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp # examples/vulkan_example/imgui_impl_glfw_vulkan.cpp # imgui.cpp # imgui_internal.h	2018-04-18 19:06:49 +02:00
daniel-murray	83d97d4a9b	Fix typos KeyDown => KeysDown	2018-04-14 10:28:10 +02:00
omar	950539b768	Viewport, Platform, DPI: Back-end store per-monitor DPI information in ImGuiPlatformMonitor. (#1542 , #1676 )	2018-04-13 20:26:36 +02:00
omar	22d6f00110	Viewport: Fixed DPI changing viewport from interfering with moving another window (disabling code) + metrics crash fix on closed viewport window + Windows 10 call to SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2) for DPI, with no noticeable improvements. (#1542 , #1676 )	2018-04-13 11:14:06 +02:00
omar	285269ef55	Viewport, Platform: Added ImGuiViewportFlags_TopMost that will be used by tooltip window (without it, clicking and holding the window emitting the tooltip would move the tooltip to the back) + GLFW backend fixes for non-win32 platforms. (#1542 )	2018-04-11 21:27:19 +02:00
omar	83bd3595a4	Viewport: Merged ImGuiPlatformData into ImGuiPlatformIO. Comments. (#1542 )	2018-04-10 22:58:39 +02:00
omar	32ee0a3947	Viewport, Platform: Added a way to register monitor bounds to imgui so they can be used to clamp individual-viewport tooltips/popups so they don't straddle monitors. (#1542 )	2018-04-10 22:32:08 +02:00
omar	7ddc22b326	Viewports, DPI: Renamed config flags. (#1542 )	2018-04-10 20:02:43 +02:00
omar	0d5042f0f3	Viewport: Popups, Tooltips can individually request no task bar icons to the platform layer. (#1542 )	2018-04-10 19:15:44 +02:00
omar	d4dd448511	Examples, Platform, Viewport: Fixed inconsistent window ownership issues. Added comments. Made Win32/SDL back-ends track ownership.	2018-04-09 22:01:58 +02:00
omar	56ad2a2d74	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_dx10.cpp # examples/opengl2_example/imgui_impl_glfw_gl2.cpp # examples/opengl3_example/imgui_impl_glfw_gl3.cpp # examples/vulkan_example/main.cpp # imgui.h	2018-04-09 19:35:14 +02:00
omar	660c157880	Examples: Added missing calls for ::DestroyWindow, glfwDestroyWindow() + fix old comments.	2018-04-09 19:16:47 +02:00
omar	54fca1d1b8	Fixed erroneous call to io.Fonts->ClearInputData() + ClearTexData() that was left in DX10 example but removed in 1.47 (Nov 2015) in every other back-ends. (fixes `6cee2fca94`) (#1733 , ~#1731) + assert	2018-04-09 13:13:06 +02:00
omar	f421e73b40	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx12.cpp # examples/imgui_impl_dx9.cpp # examples/opengl2_example/imgui_impl_glfw_gl2.cpp # examples/opengl3_example/imgui_impl_glfw_gl3.cpp # examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp # examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp # examples/vulkan_example/imgui_impl_glfw_vulkan.cpp # imgui.cpp # imgui.h # imgui_internal.h	2018-04-06 23:36:23 +02:00
omar	72b7f48870	Renamed ImGuiConfigFlags_NoSetMouseCursor to ImGuiConfigFlags_NoMouseCursorChange. Followup to `75c3793db5` two weeks ago. (#787 , #1495 , #1202 ) + comments	2018-04-06 18:12:21 +02:00
omar	72899318e6	Viewport, Platform, Examples: Added support for transparent window via PlatformIO Platform_SetWindowAlpha (#1542 ) + fixes for GLFW 3.3	2018-04-05 17:07:46 +02:00
omar	84c6ea0cee	Viewport: Comments about honoring ImGuiViewportFlags_NoInputs and MouseHoveredViewport. (#1542 )	2018-04-05 12:27:17 +02:00
omar	9d8bc79025	Viewport: Renamed RenderPlatformWindows() to RenderPlatformWindowsDefault(), tweaked examples and emphasis optional Viewport code path. (#1542 )	2018-04-05 11:06:00 +02:00
omar	0cad274b87	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx12.cpp # examples/imgui_impl_dx9.cpp # examples/opengl2_example/imgui_impl_glfw_gl2.cpp # examples/opengl3_example/imgui_impl_glfw_gl3.cpp # examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp # examples/sdl_opengl2_example/imgui_impl_sdl_gl2.h # examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp # examples/sdl_opengl3_example/imgui_impl_sdl_gl3.h # imgui.cpp	2018-04-04 19:39:42 +02:00
omar	664ab85f76	Examples: Tweak comments. (#1704 , #1708 ).	2018-04-02 17:31:51 +02:00
omar	ca39070ca0	Examples: Win32: Fixes for MingW which doesn't support a 2007 define? I have no idea why people still use MingW (#1704 , #1463 )	2018-03-28 23:32:02 +02:00
omar	cd602b8832	Examples: SDL: Note about SDL breaking the IME under Windows (I can't seem a way SDL2 Windows IME implementation can possibly work, the functions are never called/referenced).	2018-03-23 12:03:57 +01:00
omar	200754b013	Examples: GLFW: Don't alter cursor mode if GLFW_CURSOR input mode is GLFW_CURSOR_DISABLED. (#1202 ) [@PhilCK]	2018-03-20 22:42:05 +01:00
omar	94116f1143	Examples: GLFW: Don't alter cursor mode if GLFW_CURSOR input mode is GLFW_CURSOR_DISABLED. (#1202 ) [@PhilCK]	2018-03-20 22:41:05 +01:00
omar	42ad3c1dd3	Examples: OpenGL2: Added multi-viewport support in the OpenGL2 back-end. (#1542 ) + Metrics: Fix undisplayed flag.	2018-03-20 22:19:41 +01:00
omar	172570acae	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx12.cpp # examples/imgui_impl_dx9.cpp # examples/opengl2_example/imgui_impl_glfw_gl2.cpp # examples/opengl3_example/imgui_impl_glfw_gl3.cpp # examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp # examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp # examples/vulkan_example/imgui_impl_glfw_vulkan.cpp # imgui.h	2018-03-20 22:14:34 +01:00
omar	75c3793db5	IO: Added ImGuiConfigFlags_NoSetMouseCursors. Added ImGuiBackendFlags_HasMouseCursors, ImGuiBackendFlags_HasSetMousePos. (#787 , #1495 , #1202 )	2018-03-20 21:19:23 +01:00
omar	dcf7c3d188	Added ImGuiBackendFlags for backend to expose its capabilities. Added ImGuiBackendFlags_HasGamepad. (#787 , #1542 )	2018-03-20 20:39:44 +01:00
omar	170f44e6f0	IO: Renamed io.WantMoveMouse to io.WantSetMousePos (was added in 1.52, _not_ used by core and only honored by some binding ahead of merging the Nav branch) + internal renaming (#787 )	2018-03-20 20:12:34 +01:00
omar	c29971cf72	Merge branch 'master' into viewport # Conflicts: # examples/sdl_opengl2_example/main.cpp # examples/sdl_opengl3_example/main.cpp # examples/vulkan_example/main.cpp	2018-03-20 16:05:31 +01:00
omar	74b7dce394	Examples: Renamed applications to emphasis on use of GLFW as a platform framework + minor local tweaks	2018-03-20 16:00:59 +01:00
Christian Forfang	4485e56e02	Examples: Vulkan: Fix missing subpass dependency Without a dependency between pWaitDstStageMask (COLOR_ATTACHMENT_OUTPUT) and the render-pass, the UNDEFINED -> COLOR_ATTACHMENT_OPTIMAL transition might happen before the image is ready to be used.	2018-03-19 16:48:03 +01:00
omar	a73f6d06e0	Examples: Vulkan: Using VK_PRESENT_MODE_MAILBOX_KHR. Disable IMGUI_UNLIMITED_FRAME_RATE by default. Fixed warnings. (#1042 )	2018-03-19 16:47:28 +01:00
omar	2fecd332fc	Viewport, Platform: Added void* to render/swap buffer functions. Comments. (#1542 , #1042 )	2018-03-19 15:20:47 +01:00
omar	0e09032750	Viewport, Examples: Renamed types used by examples. (#1542 )	2018-03-18 22:19:02 +01:00
omar	46b61427e1	Viewport, Platform: Refactored platform interface. Removed need to use imgui_internal.h in backends. Split viewport into public facing ImGuiViewport and internal structure. Exposing enough data to provide custom tweaked renderers. Renamed handlers, fixed lots of inconsistencies. (#1542 , #1042 )	2018-03-18 18:44:57 +01:00
omar	1ab236d9df	Viewport, Platform: Internal renaming to use more consistent (OsDesktopPos > PlatformPos). (#1542 )	2018-03-15 20:07:48 +01:00
omar	2e1ac0f683	Viewport, Platform: SDL: Makes the CreateViewport function restore current GL context so in theory it is free from side-effect. That said, it seems like there is a bug in SDL because our CreateViewport (currently in Render(), not for long) have affect a jerky side-effect if SDL_GL_MakeCurrent() is called before Render(). (#1542 )	2018-03-15 19:25:23 +01:00
omar	8364d1ca6c	Viewport: Removed back-end renderer code that implied we need to clear with WindowBg color. Added NoRendererClear flag. (#1542 , #1042 )	2018-03-15 18:17:04 +01:00
omar	09d8943967	Examples Refactor: GLFW: Explicit functions to init GLFW with OpenGL or Vulkan since we cannot read the api hints from glfw.	2018-03-15 16:42:21 +01:00
omar	6e58a95a01	Viewport, Platform, Examples: Changes to resizing flow + restored support for Platform events affecting the ImGui windows (so Decorated windows are functional). (#1542 , #1042 ) .. SDL: Added platform move/resize/close support. GLFW: Added platform move/resize support. Moved Close to use callback for consistency. Win32: Vulkan: Fixed resize support. Naming is WIP "PlatforrmRequestXXX" is too ambiguous. Basically we either have a ImGui->Platform flow or a Platform->ImGui flow. Working a bigger refactor now.	2018-03-15 10:57:22 +01:00
omar	83ef61fa56	Examples: SDL: Fix for versions olders than 2.0.6	2018-03-14 14:14:16 +01:00
omar	d0e0b106f0	Examples: SDL,GLFW,Vulkan: The Platform<>Renderer link is handled by SDL/GLFW platforms, both can compile without Vulkan headers, SDL+Vulkan is now on part with GLFW+Vulkan (aka broken the same way!). (#1542 )	2018-03-13 23:16:15 +01:00
omar	98b66a5fc9	Examples: Using draw_data->DisplaySize, followup to `c50198debe`. Fix Vulkan secondary viewport rendering. SDL+Vulkan: Matched changes. Fix vcprojs. (#1542 , #1042 )	2018-03-13 23:07:12 +01:00
omar	c50198debe	Viewport: Obsoleted io.DisplayPos (which was a Viewport branch thing), added ImDrawData::DisplayPos, DisplaySize (#1542 ) wip	2018-03-13 16:20:27 +01:00
omar	b88492746e	Examples, Viewport: Vulkan: Experiment (broken) multi-viewport support, merging code from ParticlePeter branches. (#1542 , #1042 )	2018-03-12 18:43:25 +01:00
omar	f6fc28dfd2	Merge branch 'master' into viewport (inc Vulkan resize fix merge #1042 )	2018-03-12 17:50:32 +01:00
omar	cdeef65b05	Examples: Vulkan: Passing Queue, QueueFamily to binding. Fixed scissor (fixed in master). ImGui_ImplVulkanH_DestroyWindowData() waits for device to be idle. (#1042 )	2018-03-12 17:37:28 +01:00
omar	1e81a53e75	Examples: DPI: Minor warning fix. (#1676 )	2018-03-12 16:22:24 +01:00
omar	37cb177745	Examples: Vulkan: Only resize swap chain and framebuffer once. (#1042 )	2018-03-12 14:47:41 +01:00
omar	1c18d65313	Examples: Renamed glfw error callback for clarity.	2018-03-12 14:43:37 +01:00
Peter Particle	b2453d7e8f	Fixed resize window validation errors with removing frame prerender once and present last but one frame functionality. Frame rate is still similar.	2018-03-12 14:34:36 +01:00
omar	5e63711084	Viewport, DPI: Some early work on per-viewport DPI support. At the moment the easiest way is to replace fonts during the ChangedViewport callback, but down the line we should aim at handling some of it at ImFont level. (#1542 , #1676 )	2018-03-12 10:31:39 +01:00
omar	a2fbcc9ad4	Examples: DPI: Portable DPI related helpers in the _Win32 examples. Using one in examples's main.cpp, the GetDpiScale functions are not wired anywhere for now. (#1542 , #1676 )	2018-03-12 10:31:39 +01:00
omar	1eb89d7e3b	Viewport: Changed signature of ResizeViewport to be consistent with other similar functions.	2018-03-08 20:32:34 +01:00
omar	4d46383100	Viewport: Coupling non-main viewport to one window. Viewport name derived from the window. Added ImGuiConfigFlags_PlatformNoTaskBar, off by default (aka re-established task-bars by default for now). (#1542 )	2018-03-08 20:27:01 +01:00
omar	aa3fe81c87	Examples: DPI: Hacked in a quick compile-and-run-everywhere call to SetProcessDpiAwareness(), will need to revisit.	2018-03-08 18:46:30 +01:00
omar	9ea16e344a	Viewport: Disable extra viewports from hosting other windows. (#1542 )	2018-03-07 16:34:18 +01:00
omar	d8719cf59b	Fixed warnings.	2018-03-07 14:46:53 +01:00
omar	9dcc07422e	Viewport: Reorganized viewport enable flags. Both user + platform + renderer need to enable a flag. (#1542 )	2018-03-07 12:35:26 +01:00
omar	52c78820aa	Examples: SDL: Fix for pre 2.0.4.	2018-03-07 12:19:19 +01:00
omar	19b92751b9	Examples: Updated Makefile and batch files to work with new examples. Using lowercase "gl.h" as it seems this is what Linux wants.	2018-03-07 12:05:47 +01:00
omar	f318f2d5ea	Examples: Added Makefile for SDL+OpenGL2 example. (#1668 )	2018-03-07 11:51:41 +01:00
omar	7fd62baa42	Examples: Added Makefile for SDL+OpenGL2 example. (#1668 )	2018-03-07 11:50:56 +01:00
omar	3637193556	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_glfw.h # 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 # imgui.cpp	2018-03-06 20:02:40 +01:00
omar	a2ed3ee2cf	Examples: OpenGL3: Added a way to override the glsl version number through the Init call. (#1667 , #1466 )	2018-03-06 19:48:30 +01:00
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	2018-03-03 23:13:31 +01:00
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 )	2018-03-03 22:53:31 +01:00
omar	cab41d954e	Examples: Vulkan: Further refactor.	2018-03-03 22:38:24 +01:00
omar	69e700f869	Renamed ImGuiStyleVar_Count_ to ImGuiStyleVar_COUNT for consistency with other enums. Added	2018-03-03 20:15:10 +01:00
omar	e0cbfd74d7	Examples: Vulkan: Moved CreateOrResizeWindowData func to imgui_impl_vulkan.h	2018-03-02 23:59:21 +01:00
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.	2018-03-02 23:05:23 +01:00
omar	e9fa17e1bf	Viewport: Replaced UpdatePlatformWindows/RenderPlatformWindows by RenderAdditionalViewports(). The update is always called in EndFrame(). (#1542 )	2018-03-02 22:44:06 +01:00
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).	2018-03-02 21:37:14 +01:00
omar	e0f283cfcb	Examples: Vulkan: Fix `7b968b098e`	2018-03-02 20:09:21 +01:00
omar	7b968b098e	Examples: Vulkan: Reduced duplicate code by skipping present on the first frame. Amend `201d589714` by @ParticlePeter	2018-03-02 20:01:18 +01:00
omar	e927a6ac4a	Examples: Vulkan: Various tweak. Misc refactor into per-frame data. Duplicate buffer creation code moved to CreateOrResizeBuffer().	2018-03-02 19:40:09 +01:00
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.	2018-03-02 19:24:24 +01:00
omar	5b282bdd48	Examples: Renamed glfw error callback so it's more clear what it is.	2018-03-02 19:24:23 +01:00
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	2018-03-01 23:27:11 +01:00
omar	68e9ef9885	Examples: Vulkan: SDL: Fixed missing resize handler (not properly merged from #1367 ) + tweaks.	2018-03-01 23:22:02 +01:00
omar	296db2ed33	Examples: Vulkan: Moved code into shared helpers: ImGui_ImplVulkan_SelectSurfaceFormat, ImGui_ImplVulkan_SelectPresentMode.	2018-03-01 23:22:02 +01:00
omar	3171d61dfc	Examples: Vulkan: Various tweaks to name variable more consistently like Vulkan + a few comments + a few imgui style code compaction.	2018-03-01 23:22:01 +01:00
omar	57e9f61852	Examples: Vulkan: Debug report tweak + always enable in Debug build.	2018-03-01 18:59:07 +01:00
omar	cf365ed00b	Examples: Fixed enabling IMGUI_VULKAN_DEBUG_REPORT which was broken during refactor because of duplicate 'extensions' local variable.	2018-03-01 18:41:19 +01:00
omar	b37ef20c5c	Makefile: updated sdl_opengl3_example with all changes from #885 .	2018-03-01 15:54:12 +01:00
Sam Hocevar	124d8522b1	Do not store compiled objects outside the project tree.	2018-03-01 15:50:39 +01:00
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.	2018-03-01 15:46:43 +01:00
Sam Hocevar	d4f63c3844	Use make variables $@ and $^ where appropriate.	2018-03-01 15:45:34 +01:00
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.	2018-03-01 15:45:23 +01:00
omar	d98a5d54aa	Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. (#787 )	2018-02-28 19:03:39 +01:00
omar	8074d56bdd	Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. (#787 )	2018-02-28 18:58:34 +01:00
omar	2c9f45bbe7	Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. (#787 )	2018-02-28 18:51:40 +01:00
omar	fc3c3de70d	Examples: DX10: Multi viewport/platform support (based on DX11 version). (#1542 )	2018-02-28 18:35:16 +01:00

... 8 9 10 11 12 ...

1548 Commits