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
omar
997d1bd0eb
Examples: NULL pointers for consistency.
2018-02-27 23:34:28 +01:00
omar
baef79415b
Examples: DX12: Empty skeleton toward implementing the multi-viewport api for DirectX12. (WIP/test API) ( #1542 , #301 )
2018-02-27 23:34:28 +01:00
omar
cb601d79e8
Examples: SDL: Initial attempt at implementing the viewport/platform api. (WIP/test API) ( #1542 )
...
ImGui_ImplSDL2_Init() now takes a SDL GL context.
2018-02-27 23:34:27 +01:00
omar
4cee46f909
Examples: GLFW + OpenGL3: Initial attempt at implementing the viewport/platform api. (WIP/test API) ( #1542 )
2018-02-27 23:27:41 +01:00
omar
25349b31d7
Examples: DX11 + Win32: Initial attempt at implementing the viewport/platform api. (WIP/test API) ( #1542 )
2018-02-27 23:26:51 +01:00
omar
29510fcb83
Examples: Misc tweaks/fixes.
2018-02-27 10:29:37 +01:00
omar
3f335b0d42
Merge branch 'master' into examples_refactor
...
# Conflicts:
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
2018-02-26 18:22:36 +01:00
omar
d7f97922b8
Examples: Fix d749d49903
missing the deletion code. ( #1217 )
2018-02-23 22:46:14 +01:00
omar
d749d49903
Examples: OpenGL3: Create the VAO in the render function so the setup can more easily be used with multiple shared GL context. ( #1217 )
2018-02-23 12:37:49 +01:00
omar
ffda84cfae
Examples: DirectX12: Merged to new example format, imgui_impl_dx12.cpp contains the DX12 stuff, couple with imgui_impl_win32.cpp
2018-02-23 10:56:06 +01:00
omar
e6bc840f6f
Merge branch 'master' into examples_refactor
2018-02-23 10:47:32 +01:00
omar
288351a801
Examples: DirectX12: Tweaked assertion to more accurately represent what it wants to say. ( #301 )
2018-02-23 00:00:43 +01:00
omar
63be3e7c82
Update README.txt
2018-02-22 23:20:37 +01:00
omar
7e24ce0956
Examples: DirectX12: Fixed shutdown issue. ( #301 )
2018-02-22 23:04:28 +01:00
omar
9be7d048c8
Examples: DirectX12: Merge, various styling tweaks, update for 1.60 wip, synchronized Win32 features with other examples. ( #301 )
2018-02-22 23:03:47 +01:00
omar
913f3692a2
Examples: DirectX12: Removed from current solution which is meant to be VS2010 compatible for now (will change soon).
2018-02-22 22:38:22 +01:00
omar
0d063585e8
Merge branch 'jdm3_master'
2018-02-22 17:04:15 +01:00
omar
f43068c543
Examples: DirectX10, DirectX11: Simplified main example code.
2018-02-22 13:15:16 +01:00
omar
0b26387a2b
Simplified .gitignore list
2018-02-21 23:14:55 +01:00
omar
493ec0bc98
Simplified .gitignore list
2018-02-21 23:13:53 +01:00
omar
f7ef10e547
Examples: Titles/comments in headers
2018-02-21 23:05:17 +01:00
omar
91cadc1130
Merge branch 'master' into examples_refactor
2018-02-21 22:47:03 +01:00
omar
9b9d9321cf
Examples: SDL: Using %SDL2_DIR% in the .vcproj instead of %SDL_DIR%, the earlier is more standard.
2018-02-21 22:46:49 +01:00
omar
47d1360124
Examples: Using SDL2_DIR instead of SDL_DIR (more standard).
2018-02-21 22:41:46 +01:00
omar
f67699456c
Examples: Added SDL+Vulkan example, the abstraction worked here :) (ref #1367 )
2018-02-21 22:41:04 +01:00
omar
387f724d33
Examples: Vulkan: Formatting and tweaks (to match SDL's main).
2018-02-21 22:39:49 +01:00
omar
bcdfd5d61c
Merge branch 'master' into examples_refactor
2018-02-20 16:18:02 +01:00
omar
9c20a40b36
Examples: OpenGL: Cast call to glPolygonMode(). ( #1628 ).
2018-02-20 15:49:17 +01:00
omar
daddd09cd5
Examples: Mouse cursor handling comments/tweaks to homogenize. ( #1495 )
2018-02-20 14:23:22 +01:00
omar
d534207622
Examples: GLFW: Added support for mouse cursors (ImGui::GetMouseCursor() value and WM_SETCURSOR message handling). ( #1495 )
2018-02-20 14:18:02 +01:00
omar
11b12488e8
Examples: GLFW*: Renamed GLFW callbacks exposed in .h to not include GL2/GL3/Vulkan in their name.
2018-02-20 14:09:46 +01:00
omar
7e2e0535dd
Examples: DirectX 9,10,11: Inputs: Added support for mouse cursors (ImGui::GetMouseCursor() value and WM_SETCURSOR message handling). ( #1495 )
2018-02-20 13:55:09 +01:00
omar
e660d92fa5
Examples: GLFW: Added mouse cursors support ( #1495 )
2018-02-19 22:29:52 +01:00
omar
9fdf72e42b
Examples: WIn32: Prefixing every Win32 function calls with :: to denote global namespace in a consistent manner.
2018-02-18 21:23:11 +01:00
omar
df9051ded2
Examples: Vulkan: Added support for io.DisplayPos.
2018-02-18 21:15:51 +01:00
omar
230c5ca735
Examples: Vulkan: Fixed GLFW calls.
2018-02-18 21:15:41 +01:00
omar
3bd3693fb7
Examples: DirectX10, DirectX11, OpenGL2, OpenGL3: Added support for io.DisplayPos.
2018-02-18 21:09:28 +01:00
omar
6d0f9244b8
Examples: Allegro5, Marmalade: Moved bindings to parent folder. Renamed Allegro stuff from *A5_ to *Allegro5_
2018-02-18 20:26:20 +01:00
omar
80a8aea7e3
Examples: Added SDL, Vulkan examples to .sln file.
2018-02-18 20:26:20 +01:00
omar
4f0db01f7c
Examples: DirectX9: Reusing imgui_impl_win32, removed that code from imgui_impl_dx9
2018-02-18 20:26:20 +01:00
omar
6cd4e30b58
Examples: DirectX10: Reusing imgui_impl_win32, removed that code from imgui_impl_dx10
2018-02-18 20:26:20 +01:00
omar
19540479d4
Examples: DirectX11: Extracted imgui_impl_dx11.* instead imgui_impl_dx11 and imgui_impl_win32
2018-02-18 20:26:20 +01:00
omar
90dffb5a06
Examples: Vulkan: Extracted into imgui_impl_vulkan.*, reused imgui_impl_glfw* files.
2018-02-18 20:26:20 +01:00
omar
ef521d1e0b
Examples: SDL: Extracted into imgui_impl_sdl.*, reused imgui_impl_opengl* files.
2018-02-18 20:26:20 +01:00
omar
42c32bf00c
Examples: OpenGL2, OpenGL3: Added glPixelStorei() calls borrowed from SDL examples.
2018-02-18 20:26:20 +01:00
omar
c8a9969511
Examples: GLFW+GL2: Moved glfw, gl2 files to root folder, split imgui_impl_glfw_gl2 into _opengl2 and reused imgui_impl_glfw
2018-02-18 20:26:20 +01:00
omar
b0a8734c92
Examples: GLFW+GL3: Split imgui_impl_glfw_gl3 into imgui_impl_glfw and imgui_impl_gl3 (wip)
2018-02-18 20:26:19 +01:00
omar
f5f3730b16
Examples: GLFW+GL2/GL3: Added glPixelStorei() calls borrowed from SDL examples.
2018-02-16 23:19:38 +01:00
omar
9e713b115f
Examples: Renamed .sln file.
2018-02-16 22:38:19 +01:00
omar
243fd67b1c
Examples: Vulkan: Fix for empty draw data (init time) + fixed warning.
2018-02-16 22:37:46 +01:00
omar
10752423ec
Examples: Vulkan: Added .vcproj files.
2018-02-16 22:37:41 +01:00
omar
31158e575f
Examples: SDL: Fixed minor warning.
2018-02-16 22:37:29 +01:00
omar
00b24f27c2
Examples: SDL: Added .vcproj files.
2018-02-16 22:37:24 +01:00
omar
03a44acf6f
Examples: SDL: Minor stylistic tweaks. Fixed handling of ImGuiMouseCursor_None so it doesn't underflow array. Fixed harmless uninitialized pointer. ( #1626 )
2018-02-16 19:55:16 +01:00
omar
7c75835200
Renamed misleading ImGuiMouseCursor_Move to ImGuiMouseCursor_ResizeAll. SDL: Fixed cursor. ( #1626 )
2018-02-16 19:49:33 +01:00
Oliver Faircliff
ffb6e89f30
Use SDL system cursors in SDL examples. ( #1626 )
...
(Squashed 4 commits)
2018-02-16 19:41:27 +01:00
omar
63332d152a
Obsoleted the io.RenderDrawListsFn callback, you can call your graphics engine render function after ImGui::Render(). Use ImGui::GetDrawData() to retrieve the ImDrawData* to display..( #1599 )
...
Examples: Updated examples.
2018-02-16 19:18:16 +01:00
omar
0cefd40888
Examples: Added Changelog to make updates easier.
2018-02-16 17:20:18 +01:00
omar
41ecebff5a
Examples: SDL: Added Changelog at the top of the imgui_impl files. ( #1618 )
2018-02-15 11:11:31 +01:00
omar
7cc1bc7635
Added IsAnyMouseDown() helper.
...
Examples: DirectX9/10/11: Using IsAnyMouseDown() instead of local function.
2018-02-10 16:50:19 +01:00
omar
2493f609ef
Examples: Vulkan: Fix (something changed in GLFW not including vulkan.h, was unwillingly relying on that)
2018-02-06 20:57:33 +01:00
omar
f0364aa359
Merge branch 'context'
...
# Conflicts:
# examples/allegro5_example/main.cpp
# examples/directx10_example/main.cpp
# examples/directx11_example/main.cpp
# examples/directx9_example/main.cpp
# examples/marmalade_example/main.cpp
# examples/opengl2_example/main.cpp
# examples/opengl3_example/main.cpp
# examples/sdl_opengl2_example/main.cpp
# examples/sdl_opengl3_example/main.cpp
# examples/vulkan_example/main.cpp
2018-02-06 20:16:03 +01:00
omar
ae30efc0fd
Nav: Examples: Added commented out io.NavFlags |= ImGuiNavFlags_EnableKeyboard to all examples. ( #787 )
2018-02-06 19:58:23 +01:00
omar
3171f90a1a
Nav: Keyboard is now automatically mapped based on io.KeyDown[]. ( #787 )
2018-02-06 19:54:30 +01:00
omar
057807f4a7
Added ImGuiKey_Space, mapped in every examples. Will be required for navigation. ( #787 )
2018-02-06 19:29:31 +01:00
omar
7e32fc7109
Nav: Toward automatically mapping keyboard input. Renamed ImGuiNavInput_PadXXX to ImGuiNavInput_XXX. Renamed ImGuiNavInput_KeyXXX to ImGuiNavInput_KeyXXX_ (internal). ( #787 )
2018-02-06 19:23:12 +01:00
omar
cea8017e0b
Merge branch 'master' into context
2018-02-06 18:04:44 +01:00
omar
4b49f03a40
Examples: SDL+GL3: Added Navigation keyboard mapping. ( #787 )
2018-02-05 23:16:40 +01:00
omar
7e1496e994
Merge branch 'master' into navigation
2018-02-05 23:14:42 +01:00
omar
fcf1c9d151
Examples: SDL: Using SDL_GetPerformanceCounter() / SDL_GetPerformanceFrequency() to handle framerate over 1000 fps properly. Noticed bad inputs artefacts in Nav branch at 2000 fps without this. ( #996 )
2018-02-05 23:13:53 +01:00
omar
60fb7d31fd
Examples: SDL2: Enabling vsync. Using scancode consistently, fixed keyboard weirdness.
2018-02-05 22:35:29 +01:00
omar
73d493c780
Examples: Organized header files to make available features more visible.
2018-02-05 20:34:11 +01:00
omar
533fe8cb55
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2018-02-05 14:55:57 +01:00
Gerry Hernandez
4786321754
Fix iOS code; fixes entire XCode build for Apple example
2018-02-04 21:47:08 -05:00
omar
27980d9688
Merge branch 'master' into context
2018-01-31 16:02:26 +01:00
omar
47e81a6194
Merge branch 'master' into navigation
2018-01-31 16:00:25 +01:00
omar
cd3dd886de
Moved extra_fonts/ to misc/fonts/. Moved .natvis file to misc/natvis/ ( #1569 )
2018-01-31 16:00:07 +01:00
omar
23c11e9764
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2018-01-31 15:43:19 +01:00
omar
6c38aa2dc7
Examples: Apple: Tweak code and sync with other examples better (untested).
2018-01-31 00:16:44 +01:00
omar
cca9c3e3da
Examples: Using Dark theme by default. ( #707 ). Tweaked demo code.
2018-01-31 00:15:47 +01:00
omar
955d86199f
Examples: Tweaks formatting.
2018-01-30 23:55:23 +01:00
omar
2933e6765c
Merge branch 'master' into navigation
2018-01-29 17:42:39 +01:00
omar
6a25a8720a
Examples: Using #include "imgui.h" instead of <imgui.h> appear correct-er as per standard? xcode+clang are very nitpicky there.
2018-01-29 14:38:46 +01:00
omar
91d77be36e
Examples: Makefile leave CXX alone, instead leave commented out options. (nb: codeship doesn't seem have clang++)
2018-01-29 00:55:16 +01:00
Omar Cornut
3cdd2096ec
Examples: Use Clang in old Makefile.
2018-01-29 00:48:21 +01:00
omar
ddff378daf
Examples: Synced Makefile comments. Added build/ folder into git ignore list/
2018-01-29 00:38:00 +01:00
Omar Cornut
858d75ab59
Examples: Apple: Fixed filenames in OSX xcode project.
2018-01-28 23:24:57 +01:00