27b83a2cac
Merge branch 'master' into 2016-07-navigation
2017-05-01 12:38:33 +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
50b4b29beb
Examples: GLFW+GL3, SDL+GL3: Fixed modifying bound Texture0 ( #1087 , #1088 , #1116 )
2017-04-26 18:16:59 +02:00
3028ccc25b
Merge remote-tracking branch 'origin' into 2016-07-navigation
2016-11-27 18:25:20 +01:00
a68ac96bc4
Examples: GL3: Comments about gl3w ( #880 )
2016-11-12 12:48:33 +01:00
81eefb704b
Minor const fixes for overzealous warnings ( #883 )
2016-11-11 18:40:13 +01:00
bdb34d1c11
Merge branch 'master' into 2016-07-navigation
2016-10-16 14:01:13 +02:00
0d3f8807c7
Added a void* user_data parameter to Clipboard function handlers. ( #875 )
2016-10-15 11:36:43 +02:00
e4deb7a190
Merge remote-tracking branch 'origin' into 2016-07-navigation
2016-10-07 09:52:14 +02:00
2919c77bee
Examples: GLFW+OpenGL3: Fixed Shutdown() calling GL functions with NULL parameters if NewFrame was never called ( #800 )
2016-10-01 14:59:28 +02:00
ed279c0095
Merge remote-tracking branch 'origin' into 2016-07-navigation
2016-09-25 12:59:24 +02:00
02399852fe
Examples: OpenGL2: Uploading font texture as RGBA32 to increase compatibility with users shaders for beginners ( #824 )
2016-09-10 17:43:17 +02:00
bc57fd5d1d
Examples: OpenGL*: Savnig/restoring existing scissor rectangle for completeness ( #807 )
2016-09-05 23:39:52 +02:00
2825eaa0be
Examples: Accessing ImVector fields directly, feel less stl-ey and fix renderer side assert when render list only contains a callback ( #810 )
2016-09-03 19:24:57 +02:00
79e7ece259
Nav/Examples: honoring the io.WantMoveMouse flag in most common examples ( #323 )
...
Missing support Vulkan (#549 ), Apple (#575 , #247 ), SDL (#58 , #356 ),
Allegro, Marmalade (#368 , #375 )
2016-07-30 23:17:11 +02:00
bfb2dc2290
Examples: OpenGL3: Saving/restoring glActiveTexture() state ( #602 )
2016-04-30 19:02:19 +02:00
a6399f120f
IO: Added "Super" keyboard modifiers (corresponding to Cmd on Mac and Windows key in theory although the later is hard to read) ( #473 )
...
NB: Value not used.
2016-04-02 18:22:40 +02:00
04396ed7a9
FAQ and comments about the use of ImTextureID ( #562 , #561 , #521 , #510 , #497 , #475 ...)
2016-03-24 11:00:47 +01:00
1dcb9c877d
Examples: OpenGL: Fix early return on zero-sized framebuffer breaking GL state ( #486 , #547 )
2016-03-06 10:46:57 +01:00
2813a44dcc
Examples: OpenGL: skip rendering and calling glViewport() if we have a zero-fixed buffer ( #486 )
2016-02-16 09:14:38 +01:00
87a6110994
Examples: OpenGL3: Fix BindVertexArray/BindBuffer order ( #527 )
2016-02-15 10:55:20 +01:00
217a6c875a
Examples: OpenGL: Tentative fix for miscaled call to glViewport on high-DPI screens ( #441 )
...
Fix for 980ca286fe
2015-12-19 20:54:23 +01:00
6cee2fca94
Examples: Not clearing input data/tex data in atlas (will be required for dynamic atlas anyway). Effectively fix resizing in DX examples.
...
+ Standardized comments.
2015-11-29 14:54:05 +00:00
6800939e73
Examples: Header comments.
2015-11-29 11:19:30 +00:00
1d76890526
Examples: OpenGL3: Implement ImGui_ImplGlfwGL3_InvalidateDeviceObjects() like other examples.
2015-11-08 22:52:25 +00:00
e46c7b70eb
Examples: Most examples apps detect if ImDrawIdx was changed to 32-bits instead of 16
2015-11-08 11:00:31 +00:00
0a23e2c832
Tabs to spaces
2015-10-30 15:57:03 +01:00
980ca286fe
Examples: OpenGL2/3: Save/setup/restore viewport as part of render function. Update SDL example to match GL2 one. ( fix #392 )
2015-10-30 15:44:47 +01:00
5d53f37a5d
Examples: Possibly clarified the intent of imgui_impl_* files.
2015-10-13 17:53:43 +02:00
963f6b782d
Examples: OpenGL3: saving more of blend state ( #347 )
2015-09-27 22:21:11 +02:00
d5502cdd6d
Examples: OpenGL3: Saving/restoring the Enable state, better than nothing ( #347 )
2015-09-23 09:14:27 +02:00
1793c1a991
Comments
2015-09-09 14:15:17 +01:00
7d6ddbe5c8
Examples: comment on setting the RenderDrawListsFn function.
2015-09-07 14:58:26 +01:00
0bb46c824e
Examples: OpenGL2/3: save/restore some more state correctly.
...
Might save an hour of staring at blank-screen to 5% of the population,
worth it.
2015-08-29 17:44:52 +01:00
e58f99179a
Examples: OpenGL: fix for retina screens + io.DisplayFramebufferScale storage ( #287 )
2015-08-27 19:51:02 +01:00
23ce837dc7
Revert "Examples: GLFW: using glfwSetCharModsCallback() to ensure characters aren't passed when using mods ( fix #279 )"
...
This reverts commit d80869189a
2015-08-21 00:16:07 +02:00
d80869189a
Examples: GLFW: using glfwSetCharModsCallback() to ensure characters aren't passed when using mods ( fix #279 )
2015-08-20 22:32:07 +01:00
3604aecf8f
Minor Windows adjustments
2015-08-09 17:24:10 +02:00
0eb196d544
Examples: OpenGL3: simplified code using glBufferData for vertices as well ( #277 , #278 )
2015-07-19 10:52:51 -06:00
dc1cb9e625
Tweak
2015-07-19 10:49:56 -06:00
bc9bae6d01
To support drivers with strict core profiles, a buffer is used for the indices as well ( fixes ocornut/imgui#277 ).
2015-07-19 17:56:14 +02:00
e3b9a61883
Examples: OpenGL3: simplified code. Upload each vertex array separately. (cf #264 )
2015-07-08 08:27:36 -06:00
d03b046ef4
AA branch: Agressively renamed all fields of ImDrawList, ImDrawCmd, ImDrawData to match the rest of our coding convention ( #133 )
2015-07-07 20:17:07 -06:00
25882c47a3
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
examples/directx11_example/imgui_impl_dx11.cpp
examples/directx9_example/imgui_impl_dx9.cpp
examples/opengl3_example/imgui_impl_glfw_gl3.cpp
examples/opengl_example/imgui_impl_glfw.cpp
imgui.cpp
2015-07-07 12:15:35 -06:00
502e360ee5
Removed the majority of size_t from the code. ImVector<> now uses int. ( #262 )
...
May trigger new compilation warnings?
2015-07-07 12:09:25 -06:00
6a22835f63
AA branch: ImDrawList: rename commands to cmd_buffer
...
Not strictly necessary but while we're doing minor breakage let's do
them at all once.
2015-07-06 21:09:05 -06:00
b2b616be00
AA branch: ImDrawCmd idx_count -> elem_count
2015-07-05 22:09:15 -06:00
f3303fa84f
AA branch: io.RenderDrawListsFn signature changed to take ImDrawData, neater and future proof breaking of the render API ( #133 #254 )
2015-07-05 22:03:46 -06:00
61e551e0ee
AA branch: fixed warning
2015-07-04 13:41:51 -06:00
f435e42561
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
examples/opengl_example/imgui_impl_glfw.cpp
2015-07-04 12:44:25 -06:00
