omar
|
f159eb35fb
|
Examples: SDL: Removed unused code. (#2484)
|
2019-04-22 10:43:14 +02:00 |
|
omar
|
03b64defa5
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui.h
|
2019-04-19 19:52:45 +02:00 |
|
Andre Weissflog
|
74a3878be4
|
emscripten: replace shell_minimal.html with 'soft fullscreen' version
|
2019-04-17 11:59:26 +02:00 |
|
omar
|
1f25cdd6b4
|
Clarified asserts comments + todo entries. (#2500)
|
2019-04-17 09:59:03 +02:00 |
|
omar
|
655ebe4eaf
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
|
2019-04-16 13:14:10 +02:00 |
|
omar
|
8130fd9816
|
Examples: DirectX10/11/12, Allegro, Marmalade: Render functions early out when display size is zero (minimized). (#2496)
|
2019-04-15 18:47:36 +02:00 |
|
omar
|
1fe6533192
|
Examples: Emscripten: Tweaks for size. (#2494)
|
2019-04-15 17:18:31 +02:00 |
|
omar
|
b89202824e
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_sdl.cpp
|
2019-04-15 16:03:17 +02:00 |
|
omar
|
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.
|
2019-04-15 15:48:38 +02:00 |
|
omar
|
eeea7da3d0
|
Examples: Emscripten: Fixed error in shell template. (#2494)
|
2019-04-15 01:46:34 +02:00 |
|
omar
|
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)
|
2019-04-15 01:28:44 +02:00 |
|
omar
|
882d480b5e
|
Examples: Removed unused variable (will be used in docking branch tho, undo when merging!)
|
2019-04-15 01:01:39 +02:00 |
|
Nicolas "Pixel" Noble
|
a936d0669c
|
Adding standalone Emscripten example.
|
2019-04-13 22:39:42 +02:00 |
|
omar
|
328e4fa7e7
|
Merge branch 'master' into docking
# Conflicts:
# imgui_demo.cpp
|
2019-04-11 15:53:38 +02:00 |
|
omar
|
b8fe0df7df
|
Examples: Null: Added Makefile.
|
2019-04-08 19:16:45 +02:00 |
|
omar
|
cf029b3e1c
|
Merge branch 'master' into docking
|
2019-04-08 18:05:52 +02:00 |
|
omar
|
42423d5ea4
|
Examples: Makefile: Tweaks so they are more consistent with each others. Added -g./opt/local includes for MacPorts on Mac OS X. (#297)
|
2019-04-07 23:02:07 +02:00 |
|
omar
|
1295205cd4
|
Examples: Vulkan: Fixed warnings. (#2480)
|
2019-04-07 22:27:45 +02:00 |
|
omar
|
7056032483
|
Merge branch 'vulkan_fix_docking' into docking
|
2019-04-07 16:23:34 +02:00 |
|
omar
|
50ceb25003
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_vulkan.cpp
|
2019-04-07 16:23:31 +02:00 |
|
omar
|
c43dab2414
|
Vulkan: Fix not incrementing semaphore index. (#2472, #2071)
|
2019-04-07 15:57:07 +02:00 |
|
omar
|
9c364b16ff
|
Merge branch 'vulkan_fix_master' into vulkan_fix_docking
|
2019-04-05 20:30:42 +02:00 |
|
omar
|
e099a7dc74
|
Vulkan: Bits. Using IM_ALLOC/IM_FREE instead of new[] / delete[].
|
2019-04-05 20:27:46 +02:00 |
|
omar
|
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)
|
2019-04-05 18:52:45 +02:00 |
|
omar
|
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
|
2019-04-05 18:27:15 +02:00 |
|
omar
|
6bc47dfe48
|
Vulkan: Removed superfluous vkInstance parameters being passed along.
|
2019-04-05 18:24:28 +02:00 |
|
omar
|
452047c7ca
|
Vulkan: Removed requirement for user to pass their own render buffer storage to ImGui_ImplVulkan_RenderDrawData(), this is managed internally.
|
2019-04-05 18:24:28 +02:00 |
|
omar
|
ec76722d2d
|
Vulkan: Added ImageCount to InitInfo structure (!= MinImageCount) will be needed for viewports. Renamed FramesQueueSize -> ImageCount. (#2472, #2071)
|
2019-04-05 17:22:24 +02:00 |
|
MindSpunk
|
a45840746e
|
Vulkan, Viewports: Fix for resizing viewport windows crashing. (#2472)
|
2019-04-05 17:04:12 +02:00 |
|
MindSpunk
|
9acb158990
|
Vulkan, Viewports: Fix for resizing viewport windows crashing. (#2472)
|
2019-04-05 16:51:35 +02:00 |
|
omar
|
1ba79baab5
|
Vulkan, Viewports: Fixed ImGui_ImplVulkan_SetWindowSize() not recreating command-buffers, fence etc. (#2472, #2461, #2071)
|
2019-04-05 16:33:41 +02:00 |
|
omar
|
01de69de36
|
Vulkan: Note for unsupported feature with multi-viewports. (#2071)
|
2019-04-05 00:25:42 +02:00 |
|
omar
|
8ec24036d7
|
Vulkan: Viewports: Removed redundant field.
|
2019-04-05 00:01:25 +02:00 |
|
omar
|
29269d2aa8
|
Merge branch 'vulkan_fix_master' into vulkan_fix_docking
# Conflicts:
# examples/imgui_impl_vulkan.cpp
|
2019-04-04 23:55:33 +02:00 |
|
omar
|
0034e65c26
|
Vulkan: Renaming demo/helper structures. Tidying up examples main.cpp.
|
2019-04-04 23:40:28 +02:00 |
|
omar
|
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)
|
2019-04-04 23:13:31 +02:00 |
|
omar
|
86f5945f49
|
Vulkan: Storing user info into a single g_VulkanInitInfo structure to simplify code.
|
2019-04-04 23:13:31 +02:00 |
|
omar
|
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)
|
2019-04-04 22:27:29 +02:00 |
|
omar
|
6bf981c85c
|
Vulkan: More renaming. Comments.
|
2019-04-04 22:20:01 +02:00 |
|
omar
|
f586764cdd
|
Examples: Vulkan: Merged helpers into ImGui_ImplVulkanH_CreateWindowData. Removed ImGui_ImplVulkan_InvalidateFrameDeviceObjects from API. Comments. (#2071)
|
2019-04-04 22:12:16 +02:00 |
|
omar
|
54b8a65d9e
|
Examples: Vulkan: Renamed QueuedFramesCount to FramesQueueSize. Moved Framebuffer, Backbuffer to FrameData structure. (#2071)
|
2019-04-04 22:12:15 +02:00 |
|
omar
|
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)
|
2019-04-04 22:11:13 +02:00 |
|
omar
|
c7eef99a33
|
Examples: Vulkan: Fixed tabs->space, removed extraneous braces and empty lines. (#2071)
|
2019-04-04 22:10:43 +02:00 |
|
MindSpunk
|
b88a3b2711
|
Examples: Vulkan: Added calls to supports runtime changing back buffer count. (#2071)
|
2019-04-04 22:10:43 +02:00 |
|
omar
|
43a85dd02e
|
Merge branch 'master' into docking
|
2019-04-04 22:10:18 +02:00 |
|
omar
|
1c3311e4d6
|
Vulkan: Avoid passing negative coordinates to vkCmdSetScissor, which debug validation layers do not like.
|
2019-04-04 22:09:26 +02:00 |
|
omar
|
fc52364652
|
Tabs to Spaces, comments.
|
2019-04-03 17:25:02 +02:00 |
|
omar
|
cdb109f617
|
Renamed freeglut vcxproj files + Comments, Changelog (#2465)
|
2019-04-03 16:25:35 +02:00 |
|
Andrew Willmott
|
ece322ff12
|
freeglut -> glut rename
|
2019-04-03 07:19:31 -07:00 |
|
Andrew Willmott
|
3fad375f5f
|
ifdef freeglut extensions properly
|
2019-04-03 07:19:31 -07:00 |
|
Andrew Willmott
|
81f70e5b7c
|
Fixups for OSX
|
2019-04-03 07:19:31 -07:00 |
|
Andrew Willmott
|
a402f5b9a9
|
Add makefile for freeglut
|
2019-04-03 07:19:31 -07:00 |
|
omar
|
5c4cc370bb
|
Examples: Vulkan: Added shader sources/references in the .cpp source.
|
2019-04-03 11:23:54 +02:00 |
|
omar
|
49fb8e6c45
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_opengl3.cpp
|
2019-04-03 11:17:26 +02:00 |
|
omar
|
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.
|
2019-04-03 11:04:00 +02:00 |
|
omar
|
e3cd6b1cbb
|
Examples: Vulkan: Using IM_ARRAYSIZE() where possible.
|
2019-04-02 15:34:16 +02:00 |
|
omar
|
3a737e665a
|
Examples: Vulkan: Added missing support for 32-bit indices (#define ImDrawIdx unsigned int). + demo typo
|
2019-04-02 10:36:35 +02:00 |
|
omar
|
e21bbee311
|
Examples: DirectX9: Fixed erroneous assert in ImGui_ImplDX9_InvalidateDeviceObjects(). FreeType: Fixed suggested code to not require an initial build call.. (#2454)
|
2019-03-29 18:32:57 +01:00 |
|
omar
|
163779da51
|
Examples: DirectX12: Various tidying up.
|
2019-03-29 16:23:37 +01:00 |
|
omar
|
512d39d031
|
Examples: OpenGL3: Minor tweaks, clarifications + not calling glBindBuffer more than necessary in the render loop.
|
2019-03-29 16:17:30 +01:00 |
|
omar
|
a33d45d7cd
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
|
2019-03-28 15:48:25 +01:00 |
|
omar
|
20188b19d6
|
Comments (#2441) + Freeglut fixes (#2430)
|
2019-03-26 12:16:23 +01:00 |
|
omar
|
9350158d61
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_internal.h
|
2019-03-25 16:08:09 +01:00 |
|
omar
|
221bf93a55
|
Comments, todo list, remove trailing spaces.
|
2019-03-17 00:56:21 +01:00 |
|
omar
|
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)
|
2019-03-15 13:09:07 +01:00 |
|
omar
|
cf2c52282d
|
Version 1.70 WIP
|
2019-03-15 13:07:30 +01:00 |
|
omar
|
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
|
2019-03-13 15:30:35 +01:00 |
|
omar
|
55c02099c5
|
Version 1.69, comments, typos
|
2019-03-13 15:29:43 +01:00 |
|
omar
|
a26085ed53
|
Internals: Fixed Navigation from reaching ImGuiItemFlags_Disabled items (#211) + Examples comments
|
2019-03-12 22:23:56 +01:00 |
|
omar
|
9afb849e16
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_sdl.cpp
|
2019-03-12 18:28:47 +01:00 |
|
omar
|
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)
|
2019-03-12 18:27:14 +01:00 |
|
omar
|
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
|
2019-03-11 16:08:16 +01:00 |
|
omar
|
6767b0a1b0
|
Examples: Win32+DirectX: moved helper functions below main.
|
2019-03-11 16:00:18 +01:00 |
|
omar
|
3eedb542a6
|
Viewports: Renamed ConfigViewportsNoParent to ConfigViewportsNoDefaultParent. Fix outdated comments in examples.
|
2019-03-11 11:07:23 +01:00 |
|
Bruce Mitchener
|
b5d57a6615
|
Fix typos. (#2413)
|
2019-03-09 10:10:17 +01:00 |
|
Gilad Reich
|
0a6c5bc234
|
Examples: DirectX9: Added support for multi-viewport (#2394)
|
2019-03-06 21:36:42 +01:00 |
|
omar
|
e91d275b10
|
Merge branch 'master' into docking
# Conflicts:
# imgui_demo.cpp
|
2019-03-06 21:18:46 +01:00 |
|
omar
|
510342f024
|
Examples: DirectX9: Minor changes to match the other DirectX examples more closely. (#2394)
|
2019-03-06 18:00:04 +01:00 |
|
omar
|
49eb5f0280
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_opengl3.cpp
|
2019-03-03 23:34:56 +01:00 |
|
omar
|
beb3062dc5
|
Examples: OpenGL: Fix to be able to run on ES 2.0 / WebGL 1.0. [@rmitton, @gabrielcuvillier]
|
2019-03-03 23:34:28 +01:00 |
|
omar
|
9d1a392d7d
|
Examples: OpenGL: Comments about versions and loaders. (#2393, #2351)
|
2019-03-03 23:25:51 +01:00 |
|
Richard Mitton
|
7a536f1bd2
|
Examples + Viewport: GLFW: context wasn't set when using multiple windows. (#2392)
|
2019-03-03 23:01:43 +01:00 |
|
omar
|
ff0c6c2bde
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui.h
|
2019-02-27 19:00:09 +01:00 |
|
omar
|
75641926e1
|
Merge branch 'allegro-touch' of https://github.com/dos1/imgui into dos1-allegro-touch
# Conflicts:
# examples/imgui_impl_allegro5.cpp
|
2019-02-27 14:39:41 +01:00 |
|
omar
|
87ded34f9f
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui_widgets.cpp
|
2019-02-22 12:29:18 +01:00 |
|
omar
|
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)
|
2019-02-20 14:31:19 +01:00 |
|
omar
|
d0c98bf880
|
Examples: VS: Made project paths independant of SolutionDir so they can be built aside from the solution.
|
2019-02-19 20:13:06 +01:00 |
|
omar
|
ff0f9aa856
|
Comments for Linux/Mac (#2117)
|
2019-02-19 16:36:06 +01:00 |
|
omar
|
5bf9029bf9
|
Merge branch 'master' into docking
|
2019-02-18 12:16:13 +01:00 |
|
omar
|
d972533d09
|
Examples: Vulkan: Rewrote scissor processing to match other examples more closely. Removed extraneous +1 of scissor extent height.
|
2019-02-16 12:33:38 +01:00 |
|
omar
|
dd14adc731
|
Examples: Vulkan: Support draw_data->FramebufferScale correctly matching a79785c for on Metal/GL2/GL3. (#2306, #1676)
|
2019-02-16 12:32:44 +01:00 |
|
omar
|
f977871854
|
ImFont: Minor adjustment to the structure.
Examples: Removed unused variable.
|
2019-02-15 18:56:08 +01:00 |
|
omar
|
09c9bf2edb
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui.h
|
2019-02-14 20:35:11 +01:00 |
|
omar
|
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.
|
2019-02-14 19:29:09 +01:00 |
|
omar
|
b46076458c
|
Examples: Win32: Removed unused code left-over from merge e9c625a1dc
|
2019-02-13 18:29:49 +01:00 |
|
omar
|
8691b56136
|
Merge branch 'master' into docking
|
2019-02-12 10:30:48 +01:00 |
|
omar
|
cc80d8e118
|
Examples: Metal: Compilation fix.
|
2019-02-12 10:30:09 +01:00 |
|
omar
|
169e3981fd
|
Examples: OpenGL2: Added #define GL_SILENCE_DEPRECATION to cope with newer XCode warnings.
|
2019-02-11 19:09:54 +01:00 |
|
omar
|
7f6a025c93
|
Viewport: SDL: Inherit SDL_WINDOW_ALLOW_HIGHDPI flag from main viewport. (#2306)
|
2019-02-11 19:00:33 +01:00 |
|
omar
|
2cada3c143
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_widgets.cpp
|
2019-02-11 18:59:49 +01:00 |
|