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
|
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
|
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 |
|
daniel-murray
|
83d97d4a9b
|
Fix typos KeyDown => KeysDown
|
2018-04-14 10:28:10 +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
|
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
|
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
|
9d8bc79025
|
Viewport: Renamed RenderPlatformWindows() to RenderPlatformWindowsDefault(), tweaked examples and emphasis optional Viewport code path. (#1542)
|
2018-04-05 11:06:00 +02: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
|
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 |
|
omar
|
2fecd332fc
|
Viewport, Platform: Added void* to render/swap buffer functions. Comments. (#1542, #1042)
|
2018-03-19 15:20:47 +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
|
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
|
1c18d65313
|
Examples: Renamed glfw error callback for clarity.
|
2018-03-12 14:43:37 +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
|
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
|
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
|
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
|
69e700f869
|
Renamed ImGuiStyleVar_Count_ to ImGuiStyleVar_COUNT for consistency with other enums. Added
|
2018-03-03 20:15:10 +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
|
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 |
|
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
|
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
|
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
|
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
|
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
|
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
|
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 |
|