c038339a4c
Merge branch 'master' into 2015-02-colorpicker
2017-05-26 13:43:36 +02:00
9da53bcecd
ImFontConfig: Removed MergeGlyphCenterV in favor of a more multipurpose ImFontConfig::GlyphOffset. (Breaking change)
2017-05-26 13:42:36 +02:00
026d021df1
Demo: Fixed warnings introduced in 0828a1fd6c
2017-05-26 13:40:53 +02:00
c5c77a3476
ImFontConfig: Added GlyphOffset to explicitely offset glyphs at font build time, useful for merged fonts. May remove MergeGlyphCenterV soon.
2017-05-26 13:36:52 +02:00
3a7111cfcd
casting to GLint on init
2017-05-17 21:42:34 +02:00
ad3c1e68ab
save and restore sampler in GL 3 examples
2017-05-16 16:43:59 -07:00
0981d8e381
fixes types
2017-05-16 12:49:47 +02:00
0828a1fd6c
Fixed computation of ImFont::MetricsTotalSurface not taking oversampling into account
2017-05-14 16:27:10 +02:00
bd9868f447
Scrollbar: Avoid rendering when sizes are negative to reduce glitches (not sure how this ever slipped through - perhaps because of WindowMinSize settings).
2017-05-13 20:25:09 +02:00
df52f46b13
Comments, documentation ( #1121 )
2017-05-02 10:43:00 +02:00
9614552eba
README.md added link to Nicolas Guillemot flashtalk ( #1099 )
2017-05-01 17:16:40 +02:00
b0db625cab
Examples: Vulkan: Fixed an extra validation (tested on Windows with VulkanSDK 1.0.46.0) ( #1042 )
2017-05-01 17:07:53 +02:00
f87b152522
Examples: Vulkan: Various very minor stylistic fixes, fixing typos in comments, etc. ( #1042 #1043 )
2017-05-01 17:07:05 +02:00
201d589714
Image presentation now depends on the completeness of command buffer submission through semaphores.
...
To maintain maximum frame rate we render to the last acquired swapchain image but present the last but one drawn image. This behavior is optional through conditional compilation macros.
2017-05-01 16:54:49 +02:00
a9add1ce63
Removed redundant VkResult plugged into VkPresentInfoKHR pResults attribute. This is only meaningful when we present directly to multiple swapchains. In that case we can an VkResult per swapchain.
2017-05-01 16:53:54 +02:00
eaae754211
Removed redundant barrier.
...
The transition of the swapchain image(s) can happen implicitly in the renderpass. This approach has been stated to be more efficient than using an explicit barrier.
See "Vulkan Programming Guide", Chapter 7: "Graphics Pipelines", section "Renderpasses".
2017-05-01 16:52:52 +02:00
33874073dc
Fixed all issues found by vulkan debug report. Reasons for the major design changes are commented.
2017-05-01 16:48:16 +02:00
89d03d5cca
Examples: Vulkan: Disable IMGUI_VULKAN_DEBUG_REPORT by default. Update .bat files for newer VulkanSDK.
2017-05-01 16:46:57 +02:00
56dff3a080
Vulkan backend: optionally enabling vulkan validation layers and debug report callback
...
Additional layer, extension and the callback itself are used/created when IMGUI_VULKAN_DEBUG_REPORT is defined. The callback reports seven (potential!) errors which will be fixed with another pull request.
2017-05-01 16:32:45 +02:00
55be2f0722
Merge branch 'ParticlePeter-g_FrameIndex_not_used_fix'
2017-05-01 16:23:27 +02:00
9fd3ba871b
Merge branch 'g_FrameIndex_not_used_fix' of https://github.com/ParticlePeter/imgui into ParticlePeter-g_FrameIndex_not_used_fix
2017-05-01 16:21:43 +02:00
5418bb19ff
Examples: Vulkan: windows batch file for 64-bits.
2017-05-01 16:14:13 +02:00
497381dc3d
Comments
2017-05-01 15:53:50 +02:00
23e7cdcee8
Merge branch 'martty-vk_small_fix'
2017-05-01 15:27:05 +02:00
ac2eb4b960
Merge branch 'vk_small_fix' of https://github.com/martty/imgui into martty-vk_small_fix
2017-05-01 15:26:29 +02:00
c3d9e0a6eb
Examples: SDL2: Tweaked batch files for Win32.
2017-05-01 15:00:42 +02:00
475446b8b9
Merge pull request #1080 from SaschaWillems/master
...
Examples: Vulkan: Small changes to be in line with specs and fix validation layer errors/warnings
2017-05-01 14:50:34 +02:00
b3d237a5ce
Examples: SDL2: Added build .bat files for win32.
2017-05-01 13:47:59 +02:00
dbfd5d6e9a
Ignoring unreasonnable Clang -wformat-pedantic warning ( #1090 )
...
See e.g.
http://clang-developers.42468.n3.nabble.com/The-p-conversion-and-cast-to-void-td4044226.html
2017-05-01 12:55:47 +02:00
27b83a2cac
Merge branch 'master' into 2016-07-navigation
2017-05-01 12:38:33 +02:00
89b1497843
Merge branch 'master' into 2016-02-colorpicker
2017-05-01 12:37:34 +02:00
a0a6c8a2ef
Renamed ImDrawList::PathFill() to ImDrawList::PathFillConvex() for clarity. (breaking API)
2017-05-01 12:36:46 +02:00
7cd55ce939
Merge branch 'ecraven-addimagequad'
2017-05-01 12:34:45 +02:00
6517d68cdf
ImDrawList::AddImage* renamed uv_ parameters to be more consistent. Fix AddImageQuad to use IM_COL32_A_MASK ( #1009 )
2017-05-01 12:34:32 +02:00
f06b20185f
Merge branch 'addimagequad' of https://github.com/ecraven/imgui into ecraven-addimagequad
2017-05-01 12:25:25 +02:00
884c435fd3
Merge branch 'greggman-fix-opengl3-example'
2017-05-01 12:21:05 +02:00
9fdd66330f
Examples: SDL2+GL3: Fix blend func state save/restore ( #1120 )
2017-05-01 12:20:51 +02:00
01286f6636
Fix blend func state save/restore
...
AFAIK there's no such enum as `GL_BLEND_SRC` or `GL_BLEND_DST` in OpenGL3 and OpenGL4.
Maybe they're left over from previous versions? They don't even seem to exist in OpenGL 2.1. In fact checking they were deprecated in OpenGL 1.5 (they exist in 1.3)
2017-05-01 16:05:45 +09:00
d878462866
End() avoid calling Columns() if no columns set is open, not sure what it wasn't the case.
...
Pros: Faster. Avoid early crashes StackId underflow that are meant to be more gracefully caught by CheckStacksSize() (with more explicit assert). Cons: Excercise less code.
2017-04-30 12:10:45 +02:00
bbd44b4edd
Clarified asserts in CheckStacksSize() when there is a stack mismatch
2017-04-30 12:10:45 +02:00
a606f2dcb5
Update README.md
2017-04-28 13:43:11 +02:00
9ab9a846a1
Update README.md
2017-04-28 13:40:50 +02:00
6e69923e35
Update README.md
2017-04-28 13:32:04 +02:00
32390a252f
Added UnrealEngine_ImGui link
2017-04-28 10:28:52 +02:00
659b3fd259
Add ImDrawList::AddImageQuad
...
Adds a function
AddImageQuad(user_texture_id, a, b, c, d, uva, uvb, uvc, uvd, col)
that shows a texture on a full quad. This allows showing arbitrary
rotations of a texture.
2017-04-28 10:04:20 +02:00
104936ab1a
imconfig: Added comment about redefining ImDrawIdx
2017-04-26 19:12:46 +02:00
f030087f8e
Comments to redirect people to OpenGL3 examples ( #1116 )
2017-04-26 18:27:10 +02:00
50b4b29beb
Examples: GLFW+GL3, SDL+GL3: Fixed modifying bound Texture0 ( #1087 , #1088 , #1116 )
2017-04-26 18:16:59 +02:00
8df58e2cfd
MenuItem should only be selected on release
2017-04-25 15:15:56 +02:00
670775ac22
Added assert/comment about using MergeMode ( #1100 )
2017-04-13 20:01:24 +02:00