Commit Graph

77 Commits (bdb34d1c119a4913a10689acf664c41b380514a5)

Author SHA1 Message Date
ocornut bdb34d1c11 Merge branch 'master' into 2016-07-navigation
ocornut 0d3f8807c7 Added a void* user_data parameter to Clipboard function handlers. ()
ocornut e4deb7a190 Merge remote-tracking branch 'origin' into 2016-07-navigation
ocornut 2919c77bee Examples: GLFW+OpenGL3: Fixed Shutdown() calling GL functions with NULL parameters if NewFrame was never called ()
ocornut ed279c0095 Merge remote-tracking branch 'origin' into 2016-07-navigation
ocornut 02399852fe Examples: OpenGL2: Uploading font texture as RGBA32 to increase compatibility with users shaders for beginners ()
ocornut bc57fd5d1d Examples: OpenGL*: Savnig/restoring existing scissor rectangle for completeness ()
ocornut 2825eaa0be Examples: Accessing ImVector fields directly, feel less stl-ey and fix renderer side assert when render list only contains a callback ()
ocornut 79e7ece259 Nav/Examples: honoring the io.WantMoveMouse flag in most common examples ()
Missing support Vulkan (), Apple (, ), SDL (, ),
Allegro, Marmalade (, )
ocornut bfb2dc2290 Examples: OpenGL3: Saving/restoring glActiveTexture() state ()
ocornut a6399f120f IO: Added "Super" keyboard modifiers (corresponding to Cmd on Mac and Windows key in theory although the later is hard to read) ()
NB: Value not used.
ocornut 04396ed7a9 FAQ and comments about the use of ImTextureID (, , , , , ...)
ocornut 1dcb9c877d Examples: OpenGL: Fix early return on zero-sized framebuffer breaking GL state (, )
ocornut 2813a44dcc Examples: OpenGL: skip rendering and calling glViewport() if we have a zero-fixed buffer ()
ocornut 87a6110994 Examples: OpenGL3: Fix BindVertexArray/BindBuffer order ()
ocornut 217a6c875a Examples: OpenGL: Tentative fix for miscaled call to glViewport on high-DPI screens ()
Fix for 980ca286fe
ocornut 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.
ocornut 6800939e73 Examples: Header comments.
ocornut 1d76890526 Examples: OpenGL3: Implement ImGui_ImplGlfwGL3_InvalidateDeviceObjects() like other examples.
ocornut e46c7b70eb Examples: Most examples apps detect if ImDrawIdx was changed to 32-bits instead of 16
ocornut 0a23e2c832 Tabs to spaces
ocornut 980ca286fe Examples: OpenGL2/3: Save/setup/restore viewport as part of render function. Update SDL example to match GL2 one. (fix )
ocornut 5d53f37a5d Examples: Possibly clarified the intent of imgui_impl_* files.
ocornut 963f6b782d Examples: OpenGL3: saving more of blend state ()
ocornut d5502cdd6d Examples: OpenGL3: Saving/restoring the Enable state, better than nothing ()
ocornut 1793c1a991 Comments
ocornut 7d6ddbe5c8 Examples: comment on setting the RenderDrawListsFn function.
ocornut 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.
ocornut e58f99179a Examples: OpenGL: fix for retina screens + io.DisplayFramebufferScale storage ()
ocornut 23ce837dc7 Revert "Examples: GLFW: using glfwSetCharModsCallback() to ensure characters aren't passed when using mods (fix )"
This reverts commit d80869189a.
ocornut d80869189a Examples: GLFW: using glfwSetCharModsCallback() to ensure characters aren't passed when using mods (fix )
Thomas Pöchtrager 3604aecf8f Minor Windows adjustments
ocornut 0eb196d544 Examples: OpenGL3: simplified code using glBufferData for vertices as well (, )
ocornut dc1cb9e625 Tweak
Nik Voss bc9bae6d01 To support drivers with strict core profiles, a buffer is used for the indices as well (fixes ).
ocornut e3b9a61883 Examples: OpenGL3: simplified code. Upload each vertex array separately. (cf )
ocornut d03b046ef4 AA branch: Agressively renamed all fields of ImDrawList, ImDrawCmd, ImDrawData to match the rest of our coding convention ()
ocornut 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
ocornut 502e360ee5 Removed the majority of size_t from the code. ImVector<> now uses int. ()
May trigger new compilation warnings?
ocornut 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.
ocornut b2b616be00 AA branch: ImDrawCmd idx_count -> elem_count
ocornut f3303fa84f AA branch: io.RenderDrawListsFn signature changed to take ImDrawData, neater and future proof breaking of the render API ( )
ocornut 61e551e0ee AA branch: fixed warning
ocornut f435e42561 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	examples/opengl_example/imgui_impl_glfw.cpp
ocornut 7437b43b2d Fixed warnings for more pedantic settings ()
ocornut b69d7d9df3 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
ocornut 2f03511062 Added ImGuiKey_PageUp, ImGuiKey_PageDown for user.
ocornut 71e9f2a3dd Fixed warnings for 64-bits builds
ocornut e9b6e437eb Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
	imgui.cpp
	imgui.h
ocornut 5df542c3c0 ImFontAtlas: doesn't clear input data, left to the application. ()