789 Commits

Author	SHA1	Message	Date
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