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
|
00b9e70ba2
|
Viewport: Always be lenient with invalid mouse position during dragging, since they are provided by back-end and technically acceptable inputs + comments. (#1542)
|
2018-03-01 20:19:36 +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
|
df8a9c49eb
|
Allow user to override ImTextureId. (#1641)
|
2018-03-01 16:29:32 +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
|
6797ee4b68
|
Nav: Added links to PNG/PSD files for PS4 and Switch. Fixed suggested Joy-con mapping as per typical Nintendo-style mapping. (#787)
|
2018-03-01 13:03:12 +01:00 |
|
omar
|
c994796e26
|
Internal: Moved IM_NEWLINE helper to imgui_internal.h
|
2018-02-28 21:45:02 +01:00 |
|
omar
|
b3594a6407
|
Added ImGuiConfigFlags_IsSRGB, ImGuiConfigFlags_IsTouchScreen (strictly for user storage)
|
2018-02-28 21:16:47 +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
|
735267d27c
|
Viewport: Initial viewport branch+ platform api commit (squashed from previous commits, still very WIP) (#1542)
|
2018-02-27 23:25:39 +01:00 |
|
omar
|
b5ced477f4
|
Metrics: Added option to show begin order, useful for debugging.
|
2018-02-27 23:02:50 +01:00 |
|
omar
|
67319a71e5
|
Internal: Minor renaming.
|
2018-02-27 22:58:27 +01:00 |
|
omar
|
184a6f1198
|
Internals: Moving window: test mouse validity while translating window + using SetWindowPos().
|
2018-02-27 22:56:22 +01:00 |
|
omar
|
b32bb4e6e3
|
Removed DisplayVisibleMin/DisplayVisibleMax facility (as part of # 1542). Misc comments.
|
2018-02-27 22:55:18 +01:00 |
|
omar
|
0e62b7d68a
|
Clearing next window data at the end of Begin() more reliably. Misc comments.
|
2018-02-27 22:47:45 +01:00 |
|
omar
|
a761779b12
|
Internals: Settings: Added ReadCloseFn to allow handlers to sanitize data on a per-entry basis.
|
2018-02-27 22:32:45 +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 |
|
Hossam Ayman
|
a869e944b0
|
README.md typo fix
|
2018-02-26 17:43:41 +01:00 |
|
omar
|
c7835dd189
|
ImRect: Removed misleading IsFinite() function used by some Nav code.
|
2018-02-26 16:35:46 +01:00 |
|
omar
|
5427eca960
|
Compacted some old Breaking Changes notes (Pre July 2015 stuff)
|
2018-02-25 19:05:31 +01:00 |
|
omar
|
bd267ad739
|
Changelog: Added all change infos since 1.53 up to the current version.
|
2018-02-25 14:15:38 +01:00 |
|
omar
|
133f06d658
|
Changelog: Added Changelog with info from 1.48 to 1.53. Haven't added 1.53..current yet.
|
2018-02-25 14:15:37 +01:00 |
|
omar
|
27667fc035
|
TreeNode: Renamed Beta ImGuiTreeNodeFlags_NavCloseFromChild to ImGuiTreeNodeFlags_NavLeftJumpsBackHere. (#1079)
|
2018-02-25 14:15:37 +01:00 |
|
omar
|
403b2d7d59
|
ImDrawList: Better looking non-AA rectangle (lower-right corner and rounding). (#1646)
|
2018-02-25 14:15:37 +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
|
6662fe7b18
|
stb_truetype: Fixed unused variable warnings for configuration where asserts are disabled. (#1642)
|
2018-02-23 11:07:51 +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
|
79969931e6
|
ImDrawList: PushTextureID(): Removed unnecessary param by reference.
|
2018-02-23 00:01:34 +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
|
a1a36e762e
|
Merge branch 'podgorskiy-master'
|
2018-02-22 23:24:44 +01:00 |
|
omar
|
8040cf1425
|
Merge branch 'master' of https://github.com/podgorskiy/imgui into podgorskiy-master
|
2018-02-22 23:22:16 +01:00 |
|