ae405b83a4
Examples: Added missing per-renderer local changelogs. ( #2037 , #1639 , #2452 )
6 years ago
7c6ba3a1da
ImDrawCallback_ResetRenderState: Added Metal.
6 years ago
5c1cd5c8c7
ImDrawCallback_ResetRenderState, Examples: Added support for reset render state callback. ( #2037 , #1639 , #2452 )
6 years ago
a649d904d7
Examples: Emscripten: Fixed not enabling Docking and Nav by default. ( #2494 )
6 years ago
dfb82d5c22
Merge branch 'master' into docking
...
# Conflicts:
# examples/example_sdl_opengl2/main.cpp
# examples/example_sdl_opengl3/main.cpp
# examples/example_sdl_vulkan/main.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_sdl.h
# imgui.cpp
6 years ago
1ca6e5b59f
Examples: Glut: Added note about missing cursor support. ( #2375 , #2465 )
6 years ago
6789ea3482
Examples: SDL: Gamepad support minor amend. Fixes ImGuiBackendFlags_HasGamepad not being set. Enable in Emscripten demo. Tweaks. ( #2509 , #2484 ).
6 years ago
994a92d79d
Added support to use controllers via SDL_GameController. ( #2509 )
...
Updated sdl examples to use SDL_INIT_GAMECONTROLLER flag
6 years ago
f159eb35fb
Examples: SDL: Removed unused code. ( #2484 )
6 years ago
03b64defa5
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
6 years ago
74a3878be4
emscripten: replace shell_minimal.html with 'soft fullscreen' version
6 years ago
1f25cdd6b4
Clarified asserts comments + todo entries. ( #2500 )
6 years ago
655ebe4eaf
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
6 years ago
8130fd9816
Examples: DirectX10/11/12, Allegro, Marmalade: Render functions early out when display size is zero (minimized). ( #2496 )
6 years ago
1fe6533192
Examples: Emscripten: Tweaks for size. ( #2494 )
6 years ago
b89202824e
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_sdl.cpp
6 years ago
35cbf9c052
Examples: Visual Studio: Updated default platform toolset+sdk in vcproj files from v100+sdk7 (vs2010) to v110+sdk8 (vs2012). This is mostly so we can remove reliance on DXSDK_DIR for the DX10/DX11 example, which if existing and when switching to recent SDK ends up conflicting and creating warnings.
6 years ago
eeea7da3d0
Examples: Emscripten: Fixed error in shell template. ( #2494 )
6 years ago
c1848b185c
Examples: Emscripten: Switched to WebGL1/ES2, Added Changelog, Updated links, Added ignore list, Fixed warning with older versions. Removed reliance on C++11 (would warn on some compiler). Improved html template, removed undesirable options, reduced log size. Tweaked main.cpp. ( #2494 )
6 years ago
882d480b5e
Examples: Removed unused variable (will be used in docking branch tho, undo when merging!)
6 years ago
a936d0669c
Adding standalone Emscripten example.
6 years ago
328e4fa7e7
Merge branch 'master' into docking
...
# Conflicts:
# imgui_demo.cpp
6 years ago
b8fe0df7df
Examples: Null: Added Makefile.
6 years ago
cf029b3e1c
Merge branch 'master' into docking
6 years ago
42423d5ea4
Examples: Makefile: Tweaks so they are more consistent with each others. Added -g./opt/local includes for MacPorts on Mac OS X. ( #297 )
6 years ago
1295205cd4
Examples: Vulkan: Fixed warnings. ( #2480 )
6 years ago
7056032483
Merge branch 'vulkan_fix_docking' into docking
6 years ago
50ceb25003
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_vulkan.cpp
6 years ago
c43dab2414
Vulkan: Fix not incrementing semaphore index. ( #2472 , #2071 )
6 years ago
9c364b16ff
Merge branch 'vulkan_fix_master' into vulkan_fix_docking
6 years ago
e099a7dc74
Vulkan: Bits. Using IM_ALLOC/IM_FREE instead of new[] / delete[].
6 years ago
d61caf5714
Vulkan, Viewports: ImGui_ImplVulkan_RenderDrawData and renderer back-end automatically manage ImGui_ImplVulkanH_WindowRenderBuffers for each viewports so user doesn't have to do it. ( #2461 , #2348 , #2378 , #2097 )
6 years ago
e70f866ed2
Merge branch 'vulkan_fix_master' into vulkan_fix_docking (WARNING: as is the validation layer will error on same vertex/index buffer being used for all frames)
...
# Conflicts:
# examples/imgui_impl_vulkan.cpp
# examples/imgui_impl_vulkan.h
6 years ago
6bc47dfe48
Vulkan: Removed superfluous vkInstance parameters being passed along.
6 years ago
452047c7ca
Vulkan: Removed requirement for user to pass their own render buffer storage to ImGui_ImplVulkan_RenderDrawData(), this is managed internally.
6 years ago
ec76722d2d
Vulkan: Added ImageCount to InitInfo structure (!= MinImageCount) will be needed for viewports. Renamed FramesQueueSize -> ImageCount. ( #2472 , #2071 )
6 years ago
a45840746e
Vulkan, Viewports: Fix for resizing viewport windows crashing. ( #2472 )
6 years ago
9acb158990
Vulkan, Viewports: Fix for resizing viewport windows crashing. ( #2472 )
6 years ago
1ba79baab5
Vulkan, Viewports: Fixed ImGui_ImplVulkan_SetWindowSize() not recreating command-buffers, fence etc. ( #2472 , #2461 , #2071 )
6 years ago
01de69de36
Vulkan: Note for unsupported feature with multi-viewports. ( #2071 )
6 years ago
8ec24036d7
Vulkan: Viewports: Removed redundant field.
6 years ago
29269d2aa8
Merge branch 'vulkan_fix_master' into vulkan_fix_docking
...
# Conflicts:
# examples/imgui_impl_vulkan.cpp
6 years ago
0034e65c26
Vulkan: Renaming demo/helper structures. Tidying up examples main.cpp.
6 years ago
4f54a527ab
Vulkan: Renaming, we want InitInfo to source MinImageCount which is the "source" value (so viewport creation can use this). Made ImGui_ImplVulkan_DestroyFrameRenderBuffers public. ( #2071 )
6 years ago
86f5945f49
Vulkan: Storing user info into a single g_VulkanInitInfo structure to simplify code.
6 years ago
66f4be2e13
Vulkan: Added extra parameter to ImGui_ImplVulkan_RenderDrawData(). User is in charge of owning/storing 1 ImGui_ImplVulkan_FrameRenderBuffers per in-flight rendering frame. Removed ImGui_ImplVulkan_SetFramesQueueSize. ( #2461 , #2348 , #2378 , #2097 , #2071 , #1677 )
6 years ago
6bf981c85c
Vulkan: More renaming. Comments.
6 years ago
f586764cdd
Examples: Vulkan: Merged helpers into ImGui_ImplVulkanH_CreateWindowData. Removed ImGui_ImplVulkan_InvalidateFrameDeviceObjects from API. Comments. ( #2071 )
6 years ago
54b8a65d9e
Examples: Vulkan: Renamed QueuedFramesCount to FramesQueueSize. Moved Framebuffer, Backbuffer to FrameData structure. ( #2071 )
6 years ago
317859a3da
Examples: Vulkan: Updated Changelog, removed debug code, tweaked code, made GLFW/SDL match each others. Initialize FrameDataForRender fields. Added Assertion. Clearing fields on DestroyFrameData(). ( #2071 )
6 years ago
c7eef99a33
Examples: Vulkan: Fixed tabs->space, removed extraneous braces and empty lines. ( #2071 )
6 years ago
b88a3b2711
Examples: Vulkan: Added calls to supports runtime changing back buffer count. ( #2071 )
6 years ago
43a85dd02e
Merge branch 'master' into docking
6 years ago
1c3311e4d6
Vulkan: Avoid passing negative coordinates to vkCmdSetScissor, which debug validation layers do not like.
6 years ago
fc52364652
Tabs to Spaces, comments.
6 years ago
cdb109f617
Renamed freeglut vcxproj files + Comments, Changelog ( #2465 )
6 years ago
ece322ff12
freeglut -> glut rename
6 years ago
3fad375f5f
ifdef freeglut extensions properly
6 years ago
81f70e5b7c
Fixups for OSX
6 years ago
a402f5b9a9
Add makefile for freeglut
6 years ago
5c4cc370bb
Examples: Vulkan: Added shader sources/references in the .cpp source.
6 years ago
49fb8e6c45
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_opengl3.cpp
6 years ago
da035ced97
InputText, Examples/SDL: Emulate \t input if back-end doesn't provide it. ( #1336 , #2467 )
...
+ Fix some output filename in SDL build batch files.
6 years ago
e3cd6b1cbb
Examples: Vulkan: Using IM_ARRAYSIZE() where possible.
6 years ago
3a737e665a
Examples: Vulkan: Added missing support for 32-bit indices (#define ImDrawIdx unsigned int). + demo typo
6 years ago
e21bbee311
Examples: DirectX9: Fixed erroneous assert in ImGui_ImplDX9_InvalidateDeviceObjects(). FreeType: Fixed suggested code to not require an initial build call.. ( #2454 )
6 years ago
163779da51
Examples: DirectX12: Various tidying up.
6 years ago
512d39d031
Examples: OpenGL3: Minor tweaks, clarifications + not calling glBindBuffer more than necessary in the render loop.
6 years ago
a33d45d7cd
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
6 years ago
20188b19d6
Comments ( #2441 ) + Freeglut fixes ( #2430 )
6 years ago
9350158d61
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_internal.h
6 years ago
221bf93a55
Comments, todo list, remove trailing spaces.
6 years ago
ff03ae503b
Examples: OpenGL: Added a dummy GL call + comments in ImGui_ImplOpenGL3_Init() to detect uninitialized GL function loaders early, and help users understand what they are missing. ( #2421 )
6 years ago
cf2c52282d
Version 1.70 WIP
6 years ago
b1af4d36ce
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# 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
55c02099c5
Version 1.69, comments, typos
6 years ago
a26085ed53
Internals: Fixed Navigation from reaching ImGuiItemFlags_Disabled items ( #211 ) + Examples comments
6 years ago
9afb849e16
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_sdl.cpp
6 years ago
cfa8f672f6
Examples: GLFW, SDL: Preserve DisplayFramebufferScale when main viewport is minimized. (This is particularly useful for the viewport branch because we are not supporting per-viewport frame-buffer scale. It fixes windows not refreshing when main viewport is minimized.) ( #2416 )
6 years ago
f7db4fad31
Merge branch 'master' into docking
...
# Conflicts:
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# examples/example_win32_directx9/main.cpp
# imgui.cpp
6 years ago
6767b0a1b0
Examples: Win32+DirectX: moved helper functions below main.
6 years ago
3eedb542a6
Viewports: Renamed ConfigViewportsNoParent to ConfigViewportsNoDefaultParent. Fix outdated comments in examples.
6 years ago
b5d57a6615
Fix typos. ( #2413 )
6 years ago
0a6c5bc234
Examples: DirectX9: Added support for multi-viewport ( #2394 )
6 years ago
e91d275b10
Merge branch 'master' into docking
...
# Conflicts:
# imgui_demo.cpp
6 years ago
510342f024
Examples: DirectX9: Minor changes to match the other DirectX examples more closely. ( #2394 )
6 years ago
49eb5f0280
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_opengl3.cpp
6 years ago
beb3062dc5
Examples: OpenGL: Fix to be able to run on ES 2.0 / WebGL 1.0. [@rmitton, @gabrielcuvillier]
6 years ago
9d1a392d7d
Examples: OpenGL: Comments about versions and loaders. ( #2393 , #2351 )
6 years ago
7a536f1bd2
Examples + Viewport: GLFW: context wasn't set when using multiple windows. ( #2392 )
6 years ago
ff0c6c2bde
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
6 years ago
75641926e1
Merge branch 'allegro-touch' of https://github.com/dos1/imgui into dos1-allegro-touch
...
# Conflicts:
# examples/imgui_impl_allegro5.cpp
6 years ago
87ded34f9f
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui_widgets.cpp
6 years ago
2068dd509c
Examples: OpenGL: Fix for OSX not supporting OpenGL 4.5, we don't try to read GL_CLIP_ORIGIN even if the OpenGL headers/loader happens to define the value. ( #2366 , #2186 )
6 years ago
d0c98bf880
Examples: VS: Made project paths independant of SolutionDir so they can be built aside from the solution.
6 years ago
ff0f9aa856
Comments for Linux/Mac ( #2117 )
6 years ago
5bf9029bf9
Merge branch 'master' into docking
6 years ago
d972533d09
Examples: Vulkan: Rewrote scissor processing to match other examples more closely. Removed extraneous +1 of scissor extent height.
6 years ago
dd14adc731
Examples: Vulkan: Support draw_data->FramebufferScale correctly matching a79785c for on Metal/GL2/GL3. ( #2306 , #1676 )
6 years ago
f977871854
ImFont: Minor adjustment to the structure.
...
Examples: Removed unused variable.
6 years ago
09c9bf2edb
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
6 years ago
93d1179805
Examples: Extracted gamepad code into ImGui_ImplGlfw_UpdateGamepads(). Renamed matching Win32 function for consistency.
...
Added more link to nothing's oversample document. Spacing bits.
6 years ago
b46076458c
Examples: Win32: Removed unused code left-over from merge e9c625a1dc
6 years ago
8691b56136
Merge branch 'master' into docking
6 years ago
cc80d8e118
Examples: Metal: Compilation fix.
6 years ago
169e3981fd
Examples: OpenGL2: Added #define GL_SILENCE_DEPRECATION to cope with newer XCode warnings.
6 years ago
7f6a025c93
Viewport: SDL: Inherit SDL_WINDOW_ALLOW_HIGHDPI flag from main viewport. ( #2306 )
6 years ago
2cada3c143
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_widgets.cpp
6 years ago
d16dbc5b87
Examples: SDL: Using the SDL_WINDOW_ALLOW_HIGHDPI flag. ( #2306 , #1676 ) [@rasky]
6 years ago
a79785c0b9
ImDrawData: Added FramebufferScale field (currently a copy of the value from io.DisplayFramebufferScale).
...
This is to allow render functions being written without pulling any data from ImGuiIO, allowing incoming multi-viewport feature to behave on Retina display and with multiple displays. If you are not using a custom binding, please update your render function code ahead of time, and use draw_data->FramebufferScale instead of io.DisplayFramebufferScale. (#2306 , #1676 )
Examples: Metal, OpenGL2, OpenGL3: Fixed offsetting of clipping rectangle with ImDrawData::DisplayPos != (0,0) when the display frame-buffer scale scale is not (1,1). While this doesn't make a difference when using master branch, this is effectively fixing support for multi-viewport with Mac Retina Displays on those examples. (#2306 ) Also using ImDrawData::FramebufferScale instead of io.DisplayFramebufferScale.
Examples: Clarified the use the ImDrawData::DisplayPos to offset clipping rectangles.
6 years ago
ef7940699e
Examples: Metal: Removed unnecessary loop. Fixed OSX Clang warning in imstb_truetype. ( #1929 , #1873 )
6 years ago
4a3a895be9
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
6 years ago
f366828dd2
Minor tweaks to reduce false positive of PVS Studio static analyzer.
6 years ago
f6fbb99a9c
Examples: SDL: Fix for Emscripten/Android/iOS on Docking branch.
6 years ago
7227454dca
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui.h
6 years ago
03b0266b59
Examples: Made imgui_impl_win32 drag gdi32.lib for GetDeviceCaps(). ( #2327 )
6 years ago
5fc6899dc2
Examples: OpenGL3: Using GLSL 4.10 shaders for any GLSL version over 410 (e.g. 430, 450). ( #2329 ) [@BrutPitt]
6 years ago
e1143377c2
Viewport: Added ImGuiViewportFlags_NoFocusOnClick + support in imgui_impl_win32. Made windows with no decoration always set the _NoFocus flags. ( #1542 , #2117 )
...
Fix e.g. clicking on protruding combo box stealing highlight from parent window with decoration.
6 years ago
13a5f5ba8b
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
6 years ago
ab9cd44c89
Examples: DirectX9: Fix Clang warning.
6 years ago
0947fa3de0
Merge branch 'viewport' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
6 years ago
cb9a6b8a8b
Merge branch 'master' into viewport
...
# Conflicts:
# examples/README.txt
# imgui.cpp
6 years ago
54ba8a643e
Removed trailing spaces from text files. ( #2038 , #2299 )
6 years ago
f94af2f5c5
Merge branch 'viewport' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui_draw.cpp
6 years ago
8079344cee
Merge branch 'master' into viewport
...
# Conflicts:
# examples/example_sdl_vulkan/main.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_vulkan.h
# imgui.cpp
6 years ago
259f3c78a2
Examples: OpenGL2: Added (yet another) comment/instruction against using opengl2 with modern OpenGL. ( #2297 )
6 years ago
2c38b32db1
Removed trailing spaces ( #2038 , #2299 )
6 years ago
82e31d34f0
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_win32.cpp
6 years ago
295ada0364
Examples: Win32: Using wc.lpszClassName instead of duplicating the literal. + tweak README format.
6 years ago
b8020032f9
Examples: Win32: Added support for mouse buttons 4 and 5 via WM_XBUTTON* messages. ( #2264 )
6 years ago
acdb4823dd
Examples: Win32: Fix for older Windows SDK.
6 years ago
b5144e477f
Merge branch 'viewport' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
6 years ago
e9c625a1dc
Merge branch 'master' into viewport
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_win32.cpp
# imgui_demo.cpp
6 years ago
872477548b
Examples: Win32: Using IsChild() to be compatible with windows created within a parent. ( #1951 , #2087 , #2156 , #2232 )
6 years ago
14c40242db
Examples: DirectX9: Explicitly disable fog (D3DRS_FOGENABLE) before drawing in case user state has it set. ( #2288 , #2290 )
6 years ago
882f1bc135
Examples: DirectX12: Targeting 10.0.14393.0 instead of 10.0.16299.0 (available on AppVeyor, and higher version doesn't seem necessary).
6 years ago
8a45c56c2c
Merge branch 'viewport' into docking
6 years ago
9391a97fbf
Merge branch 'master' into viewport
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
6 years ago
f435aa193b
Examples: Win32: Added support for XInput games (if ImGuiConfigFlags_NavEnableGamepad is enabled).
6 years ago
133f112af0
Examples: Win32: Using GetForegroundWindow() instead of GetActiveWindow() to be compatible with windows created in a different thread. ( #1951 , #2087 , #2156 , #2232 ) [many people]
6 years ago
6b32570644
Merge branch 'viewport' into docking
...
# Conflicts:
# imgui_internal.h
# imgui_widgets.cpp
6 years ago
5af930f97a
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
6 years ago
4483320f0a
Examples: Allegro 5: Properly destroy all globals on shutdown. ( #2262 )
6 years ago
25ac85f15d
Examples: Downgrading projects to xcode 9.2 (maybe 8.0) ( #2134 )
...
* example_apple_opengl2: The deployment target was set to 10.12 from XCode 9.2.
* imgui_impl_metal: header not found by XCode 9.2.
* example_apple_metal: The deployment target was set to 10.12 from XCode 9.2.
6 years ago
ce1626a51e
Merge branch 'viewport' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
6 years ago
0cabe4dedf
Viewport: Added ImGuiWindowClass / SetNextWindowClass() (concept imported from Docking ImGuiDockFamily), which currently allows to overwrite viewport flags on a per-window basis. Exposed FindViewportByID(). Win32: Support for ParentViewportId. ( #1542 )
6 years ago
cfcad42b89
Viewport: Win32: Workaround to the fact that ::WindowFromPoint() seems to return Windows using ImGuiViewportFlags_NoInputs / HTTRANSPARENT when dragging nearby the platform title bar. This is to allow using platform decoration. I don't understand this well atm. ( #1542 )
6 years ago
4a6f95acc8
Viewport: Added Platform_UpdateWindow hook for general purpose: Rework Win32 code to reflect viewport flags changes into Win32 while the window is active.
6 years ago
951c9dd68b
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_sdl.cpp
6 years ago
d9a4cbc429
Examples: Comments about GLFW/SDL versions
6 years ago
omar
Max Thrun
David Amador
Andre Weissflog
Nicolas "Pixel" Noble
MindSpunk
Andrew Willmott
Bruce Mitchener
Gilad Reich
Richard Mitton
DomRe
Alzathar