omar
|
f3a0b17bb8
|
Viewport: Win32, GLFW, SDL: Clarified back-ends by using global mouse position direction. GLFW: disabled io.MouseHoveredViewport setting under Mac/Linux. (#1542, #2117) + various comments.
|
6 years ago |
|
omar
|
5105c6c0d0
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
|
6 years ago |
|
omar
|
3a678d48b1
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
|
6 years ago |
|
omar
|
8d58055a54
|
Examples: DirectX10/11/12: Made imgui_impl_dx10/dx11/dx12.cpp link d3dcompiler.lib from the .cpp file to ease integration.
|
6 years ago |
|
omar
|
ac10889bde
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
|
6 years ago |
|
omar
|
89a530b442
|
Somehow VS keeps modifying this GUID so I am going to playing along with it.
|
6 years ago |
|
omar
|
65e579e558
|
Merge branch 'master' into viewport
# Conflicts:
# docs/CHANGELOG.txt
# 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_opengl3.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_vulkan.cpp
# examples/imgui_impl_win32.cpp
# imgui.h
# imgui_demo.cpp
|
6 years ago |
|
omar
|
801645d350
|
Version 1.66b (will revisit how to change IMGUI_VERSION_NUM across versions, this commit reduces the numerical IMGUI_VERSION_NUM compared to the commit on Nov 22).
|
6 years ago |
|
omar
|
48f6fdb349
|
Fixed typo.
|
6 years ago |
|
omar
|
7658035e5a
|
About, IO: Added io.BackendPlatformName, io.BackendRendererName for informational/QA purpose.
|
6 years ago |
|
omar
|
f78b5a0cdb
|
Merge branch 'viewport' into docking
|
6 years ago |
|
omar
|
afeefadb4e
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_win32.cpp
# imgui.h
|
6 years ago |
|
omar
|
a423f032ee
|
About, IO: Added io.BackendPlatformName, io.BackendRendererName for informational/QA purpose.
|
6 years ago |
|
omar
|
3c114b280a
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui_internal.h
|
6 years ago |
|
omar
|
01f940dc9a
|
Viewport: imgui_impl_sdl2: Added support for PlatformIO Platform_SetWindowAlpha.
|
6 years ago |
|
omar
|
19c4fa8dd5
|
Examples: DX12: Fixed compilation of imgui_impl_dx12.cpp in viewport branch. Multi-viewport is still not functional.
|
6 years ago |
|
omar
|
b8d9c5c130
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
|
6 years ago |
|
omar
|
12a1e7d04e
|
Viewport: Comment to suggest making WindowBg opaque when viewports are enabled.
|
6 years ago |
|
omar
|
ddc3f8f069
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui_internal.h
|
6 years ago |
|
omar
|
5261e5a6ba
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
|
6 years ago |
|
omar
|
35d648341b
|
Examples: SDL: changed the signature of ImGui_ImplSDL2_ProcessEvent() to use a const SDL_Event*. (#2187)
|
6 years ago |
|
omar
|
d8ab2c1ac9
|
Viewport: Added support for minimized window which caused problem when ImGuiBackendFlags_HasMouseHoveredViewport was not supported. (#1542) + todo
|
6 years ago |
|
omar
|
862781b195
|
Viewport: Avoid unnecessary reapplying platform pos/size every frame. (#2205) + Fix GLFW ImGui_ImplGlfw_CreateWindow() from not applying position immediately. Clear LastNameHash properly (bug already fixed in Docking branch)
|
6 years ago |
|
omar
|
2515413080
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui_widgets.cpp
|
6 years ago |
|
omar
|
d87b80c6c1
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
6 years ago |
|
omar
|
c00a3bd98f
|
Examples: SDL2+Vulkan: Fixed application shutdown which could deadlock on Linux + Xorg. (#2181)
|
6 years ago |
|
omar
|
be66f94639
|
Examples: OpenGL3: More explicit testing for == GL_UPPER_LEFT in case glGetIntegerv(GL_CLIP_ORIGIN is not honored properly. (#2186, #2195) Fix f52f0a5277
|
6 years ago |
|
omar
|
4a43f347bb
|
Merge branch 'viewport' into docking
# Conflicts:
# examples/example_allegro5/main.cpp
# examples/example_marmalade/main.cpp
|
6 years ago |
|
omar
|
dcbf976a8e
|
Merge branch 'master' into viewport + comments
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
|
6 years ago |
|
omar
|
f52f0a5277
|
Examples: OpenGL3: Added support for GL 4.5's glClipControl(GL_UPPER_LEFT). (#2186)
|
6 years ago |
|
omar
|
a3d6554e8e
|
Merge branch 'master' into viewport + specific changes for GLFW callbacks
# Conflicts:
# examples/example_glfw_opengl3/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx9/main.cpp
# examples/imgui_impl_glfw.cpp
|
6 years ago |
|
omar
|
772354377b
|
Examples: GLFW: User previously installed GLFW callbacks are now saved and chain-called by the default callbacks. (#1759)
|
6 years ago |
|
omar
|
9d155c73bc
|
Examples: Misc comments mainly related to GLFW callbacks. (#1759)
|
6 years ago |
|
omar
|
a419d46205
|
Examples: OpenGL3+GLFW/SDL: Made main.cpp compile with IMGUI_IMPL_OPENGL_LOADER_CUSTOM (may be missing init). (#2178)
|
6 years ago |
|
omar
|
565af90958
|
Merge branch 'viewport' into docking
|
6 years ago |
|
omar
|
131bf5ee4a
|
Examples: SDL: Tweaked Windows instructions and batch files. (#2175)
|
6 years ago |
|
omar
|
797f2044cd
|
Viewport: Fixed SDL+OpenGL2 example to work with multi-viewports. (#2175)
|
6 years ago |
|
omar
|
5ea08394f5
|
Examples: SDL: Tweaked Windows instructions and batch files. (#2175)
|
6 years ago |
|
omar
|
9ee86f22b7
|
Examples: Win32: Handle UTf-8 in platform window title setting. (#2164)
|
6 years ago |
|
omar
|
52ca91ca57
|
Merge branch 'master' into viewport
|
6 years ago |
|
omar
|
f388216ff0
|
Examples: GLFW: VS2015 project link with legacy_stdio_definitions.lib in order to link with the precompiled VS2010 GLFW3.lib we provide. (#2010, #2043, #2091)
|
6 years ago |
Michał Janiszewski
|
2e6e1bec58
|
Examples: Add missing include guards (#2166)
|
6 years ago |
Cort
|
ed0f7004d0
|
Examples: Vulkan: Avoid unreferenced parameter warning. (#2162)
|
6 years ago |
Hui
|
e6db078eda
|
gladLoadGL() return 0 to indicate failure (#2157)
|
6 years ago |
|
omar
|
168af9b377
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui_demo.cpp
|
6 years ago |
|
omar
|
50f6e12d31
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
6 years ago |
|
omar
|
ac9aaf4b6e
|
Comments in demo and opengl code + Internals: Added HoveredIdNotActiveTimer tracking hovering time unless the item is active, which is a commonly useful pattern.
|
6 years ago |
|
omar
|
5f8c9ae0ef
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
# imgui.h
|
6 years ago |
|
omar
|
056af2b1af
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
|
6 years ago |
Brandon
|
5f79a28a07
|
Examples: SDL: Fixed usage of SDL_GetDisplayDPI (#2137, #1676)
|
6 years ago |
|
omar
|
745f01022e
|
Examples: Downgraded Xcode project object version (50->48) to support Xcode 9.2 (last version supported on macOS 10.12) (#2133, #1929)
|
6 years ago |
Warren Moore
|
b4488d4f48
|
Examples: Downgraded Xcode project object version (50->48) to support Xcode 9.2 (last version supported on macOS 10.12) (#2133)
|
6 years ago |
|
omar
|
e73217d6f7
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
|
6 years ago |
|
omar
|
c398153b40
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
# imgui_internal.h
|
6 years ago |
hesiod
|
500a60debc
|
Examples: OpenGL3: Cast compile/link status to GLboolean (#2112, #2125)
Some OpenGL loaders/bindings do not allow comparisons between GLints and GLbooleans.
|
6 years ago |
|
omar
|
02afbaeef0
|
Examples: imgui_imp_opengl3.cpp explicit casting for overly aggressive glbinding compatibility. (#2112) [@hesiod]
|
6 years ago |
|
omar
|
a3b0e0acfa
|
Examples: DirectX10, DirectX11: Removed seemingly unnecessary calls to invalidate and recreate device objects in the WM_SIZE handler. (#2088)
|
6 years ago |
Michael Vetter
|
084c26aa41
|
Fix spacing in imgui_imp_sdl example (#2111)
|
6 years ago |
|
omar
|
2cff3f6a65
|
Docking: Renamed io.ConfigDockingWithKeyMode to io.ConfigDockingWithShift.
|
6 years ago |
|
omar
|
c6193d0605
|
Merge branch 'viewport' into docking
|
6 years ago |
|
omar
|
6cc380fc41
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
# imgui.cpp
|
6 years ago |
|
omar
|
788febf044
|
Examples: Vulkan: Fixed some minor discrepency in the SDL+Vulkan example to match the Glfw+Vulkan example. (cc #2097)
|
6 years ago |
|
omar
|
fda57f48d5
|
Merge branch 'viewport' into docking
# Conflicts:
# examples/example_glfw_opengl2/main.cpp
# examples/example_glfw_opengl3/main.cpp
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_opengl2/main.cpp
# examples/example_sdl_opengl3/main.cpp
# examples/example_sdl_vulkan/main.cpp
# examples/example_win32_directx10/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# examples/example_win32_directx9/main.cpp
|
6 years ago |
|
omar
|
7abc368927
|
Viewport: GLFW: Build fix for pre GLFW 3.2 (#1542)
|
6 years ago |
|
omar
|
7c3b9172ad
|
Examples: Referring to missing gamepad support in back-end that are missing it.
|
6 years ago |
|
omar
|
b57baa5ba0
|
Viewport: Enabled viewports by default in more example apps.
|
6 years ago |
|
omar
|
e32256b4b4
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui_demo.cpp
# imgui_internal.h
|
6 years ago |
|
omar
|
b85f345369
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_vulkan.cpp
|
6 years ago |
|
omar
|
1afd29d382
|
Examples: Using "dear imgui" terminology in all examples headers/comments + fix minor typo.
|
6 years ago |
|
omar
|
9cc63ba279
|
Internals: Replace unsigned short with ImWchar when dealing with character storage (missing cases) + in imgui_impl_ file keep using neutral type everywhere, added missing explicit cast in three bindings. (#2078)
|
6 years ago |
|
omar
|
df65d4a14f
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
6 years ago |
|
omar
|
b872aa5c8e
|
Docking: io.ConfigResizeWindowsFromEdges default to true in Docking branch. Moved code in BeginTabItem().
|
6 years ago |
MindSpunk
|
7eadcf7d7d
|
example_glfw_vulkan was missing a reference to imgui_widgets.cpp (#2071, #2036)
|
6 years ago |
|
omar
|
a82be53407
|
Merge branch 'docking2' into viewport_docking
# Conflicts:
# examples/example_glfw_opengl2/main.cpp
# examples/example_glfw_opengl3/main.cpp
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_opengl3/main.cpp
# examples/example_sdl_vulkan/main.cpp
# examples/example_win32_directx10/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
|
6 years ago |
|
omar
|
49533bc86e
|
Examples: Enabled Docking + Nav by default in the branch. (#351)
|
6 years ago |
|
omar
|
bdb30d7145
|
Merge branch 'master' into viewport
|
6 years ago |
Jiří Šebele
|
f8b7e4d94f
|
Examples: imgui_impl_opengl3 Fix GLAD error condition (#2059, #2002)
`gladLoadGL` returns 0 on fail, not the other way around.
|
6 years ago |
|
omar
|
fd201a90f1
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
6 years ago |
|
omar
|
5d40d295b3
|
Comments, readme updates
|
6 years ago |
|
Omar Cornut
|
be6ea86f8d
|
OSX: Added imgui_widgets.cpp to xcode project files.
|
6 years ago |
|
omar
|
e312363007
|
Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036)
|
6 years ago |
|
omar
|
01586d33f3
|
Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036)
|
6 years ago |
|
omar
|
36b2f64051
|
Merge branch 'master' into viewport
# Conflicts:
# examples/example_glfw_opengl3/main.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_internal.h
|
6 years ago |
|
omar
|
1b61b6b208
|
Examples: Vulkan: Minor tweaks.
|
6 years ago |
|
omar
|
b127027cbd
|
Examples: OpenGL: Added support for glew and glad OpenGL loaders out of the box. (#2001, #2002). Changelog, tweaks, applied changes to SDL+OpenGL3 example.
|
6 years ago |
Jérémie Dumas
|
e476b7e727
|
WIP on configurable OpenGL loader. (#2001, #2002)
|
6 years ago |
|
omar
|
705ff49400
|
Examples: Vulkan: Viewport: Tweak to improve framerate on multiple-viewport situations, tho it is still halving the unthrottled framerate on nvidia for some reason.. Followup to 4dea032 (#1542)
|
6 years ago |
|
omar
|
f81caac459
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
|
6 years ago |
|
omar
|
4dea0327e7
|
Examples: Vulkan: Fixed handling of VkSurfaceCapabilitiesKHR::maxImageCount = 0 case. Tweaked present mode selections.
|
6 years ago |
|
omar
|
0ada716184
|
Examples: Viewport: Disabling swap intervals / vsync on secondary context to match what the DX11 bindings is doing. (#1542)
|
6 years ago |
|
omar
|
a4191857c1
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_vulkan.h
# imgui.cpp
|
6 years ago |
|
omar
|
7268c65d73
|
Examples: imgui_impl_vulkan: Comments (re)
|
6 years ago |
|
omar
|
3fdfac3377
|
Examples: imgui_impl_vulkan: Comments
|
6 years ago |
|
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)
|
7 years ago |
|
omar
|
e5f2295398
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
|
7 years ago |
|
omar
|
421dc19798
|
Examples: Cast to ImTextureID instead of void* when assigning to TexId. Applied to all examples. (#2015)
|
7 years ago |
Ryan Crandall
|
9c0805010f
|
imgui_impl_dx12: Cast to ImTextureID instead of void* to enable redefinition of ImTextureID (#2015, #301)
|
7 years ago |
|
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)
|
7 years ago |
|
Ryan Crandall
|
34203d5008
|
imgui_impl_win32: Don't redefine WIN32_LEAN_AND_MEAN if already defined (#2014)
|
7 years ago |
luk1337
|
e3eb4111cc
|
Examples: Fix 'How to build' instructions for SDL2 examples (#2012)
|
7 years ago |