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
|
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
|
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
|
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
|
1eb89d7e3b
|
Viewport: Changed signature of ResizeViewport to be consistent with other similar functions.
|
2018-03-08 20:32:34 +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
|
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
|
fc3c3de70d
|
Examples: DX10: Multi viewport/platform support (based on DX11 version). (#1542)
|
2018-02-28 18:35:16 +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
|
f7ef10e547
|
Examples: Titles/comments in headers
|
2018-02-21 23:05:17 +01:00 |
|
omar
|
bcdfd5d61c
|
Merge branch 'master' into examples_refactor
|
2018-02-20 16:18:02 +01:00 |
|
omar
|
3bd3693fb7
|
Examples: DirectX10, DirectX11, OpenGL2, OpenGL3: Added support for io.DisplayPos.
|
2018-02-18 21:09:28 +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 |
|