Commit Graph

57 Commits (b667d5a9e745bd79ac723da157602b51b9e2dee4)

Author SHA1 Message Date
omar 03700ad15e Merge remote-tracking branch 'origin' into 2016-07-navigation
omar 99ff2ec6fb Examples: DirectX9/10/11: Comments
omar 51c200ac0d Examples: DirectX9: Clarified texture release code ()
ocornut fdc70456f4 Merge branch 'master' into 2016-07-navigation
ocornut d74a3349e9 Examples: DirectX9: Explicitely setting viewport to match that other examples are doing ()
ocornut 3028ccc25b Merge remote-tracking branch 'origin' into 2016-07-navigation
ocornut 7c2b35704d Examples: DirectX9-10-11: Only call Windows' SetCursor(NULL) when io.MouseDrawCursor is set (, )
ocornut ed279c0095 Merge remote-tracking branch 'origin' into 2016-07-navigation
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 1349d0aacf Examples: DirectX9: Removing spaces ()
Trezanik 790275eae2 Example: DirectX9: Backup and restore all state
ocornut 50df86985d Examples: DirectX9: Removed dependency on dx3x9.h so it can be used in a DirectXMath.h only environment ()
ocornut 4466a7b3b0 Examples: DirectX9: save/restore some more device 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 7661b1e778 Trim trailing spaces
ocornut 04396ed7a9 FAQ and comments about the use of ImTextureID (, , , , , ...)
ocornut 07e379a950 Examples: DirectX9: Wastefully use a RGBA8 texture for the font texture to make compability more evident with user's textures ()
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 e46c7b70eb Examples: Most examples apps detect if ImDrawIdx was changed to 32-bits instead of 16
Gargaj e4d916a4b3 NULL out font texture on invalidate
If this isn't done, NewFrame won't re-create the font.
ocornut 5d53f37a5d Examples: Possibly clarified the intent of imgui_impl_* files.
ocornut 7d6ddbe5c8 Examples: comment on setting the RenderDrawListsFn function.
ocornut 822eaf1751 Examples: DX9, DX11: mapping missing middle mouse button.
ocornut 9a0650dbd0 Examples: imgui_impl* functions declared with IMGUI_API to ease copy & pasting into projects using DLL
ocornut 215747635d Examples: DirectX11: resizing buffers dynamically ()
ocornut c016f6c171 Examples: DirectX9: tweaks.
ocornut 698c7cae85 Examples: DirectX9: resizing vertex and index buffers dynamically ()
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 8b4a470e1d Examples: DirectX9: fixed size passed to vertex and index buffer Lock() + readjust default buffer sizes.
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. ()
ocornut f00662a5ad Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
ocornut ad7f600e0d Examples: DirectX9/11: hide os curosr if ImGui is drawing it ()
ocornut 18a00c7060 Examples: DirectX9/11: Fixed key mapping for down arrow.
ocornut 1746b04065 Indexed rendering. Not in main branch because breaks rendering code too much. Will merge in trunk along with more major graphics changes lat
ocornut d9ff617ff8 Examples: Formatting
heroboy e09e2cbd28 set pixel shader and vertex shader to NULL
Previous graphic render may use shaders,so set pixel shader and vertex shader to NULL to force use fixed pipeline.
ocornut d3e444dfd9 Examples: DirectX9: fixed duplicate creation of vertex buffer. Size of static vertex buffer at top of the code.
ocornut e97d02a294 Examples: Fixed Clang warnings in DirectX examples
ocornut 2b0acc128c Examples: MSVC: increase warning level from /W3 to /W4 for DirectX examples