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