579 Commits (6fe22e629742628eb84c1d1c98e7b951de1b9afd)

Author SHA1 Message Date
Marcell Kiss 53126cd713 Add location decorators & change to use structs as in/out in glsl, update embedded spv (produced with glslangValidator -x) 8 years ago
Marcell Kiss 44250caf50 Null the released resources 8 years ago
ocornut 0d3f8807c7 Added a void* user_data parameter to Clipboard function handlers. (#875) 8 years ago
ocornut 2919c77bee Examples: GLFW+OpenGL3: Fixed Shutdown() calling GL functions with NULL parameters if NewFrame was never called (#800) 8 years ago
ocornut b96471143f Merge branch 'master' of https://github.com/madeso/imgui into madeso-master 8 years ago
ocornut 612b17ef57 Fixing minor english typos (#827) 8 years ago
ocornut 02399852fe Examples: OpenGL2: Uploading font texture as RGBA32 to increase compatibility with users shaders for beginners (#824) 8 years ago
Felipe Oliveira Carvalho 6e6f04f513 Fix Mac OS X build and remove cruft from Makefile 8 years ago
ocornut bc57fd5d1d Examples: OpenGL*: Savnig/restoring existing scissor rectangle for completeness (#807) 8 years ago
ocornut 031d4e689d Examples: OpenGL3: Revert Makefile change for OSX for now (#812) 8 years ago
ocornut 2825eaa0be Examples: Accessing ImVector fields directly, feel less stl-ey and fix renderer side assert when render list only contains a callback (#810) 8 years ago
Kun Lin aa0cb13aa4 Correct name for linking opengl3_example
According to glfw offcial site, linking `libglfw.3.dylib` etc should
use `-lglfw`.

Changed this made the compilation on my Mac successfully.
8 years ago
Gustav 08a9e78da5 fixed space issues 8 years ago
Håvard Mathisen 99b4f951b9 Fix Vulkan example for use when a depth buffer is active. 8 years ago
Gustav 5def10c3a0 Fixed OpenGL error when calling Shutdown without calling NewFrame 8 years ago
ocornut 5ae71aa04a Examples: Renaming opengl_example/ to opengl2_example/ for clarity (1/2 because git) 8 years ago
ocornut 3c384c2f10 Examples: Renaming opengl_example/ to opengl2_example/ for clarity (1/2 because git) 8 years ago
ocornut 82768e05f3 Ignore list for Visual Studio 8 years ago
Marcell Kiss 4bc6a951fe tabs to space, remove braces 8 years ago
Marcell Kiss 3234f81cb1 maxImageCount may be 0; add missing sType; change to 1 push constant range 8 years ago
Jamie Seward 0a1d456de1 Fix compile warnings in SDL examples 8 years ago
ocornut d8dacd729b Examples: SDL+OpenGL: explicitly setting GL_UNPACK_ROW_LENGTH to reduce issues because SDL changes it (#752) 8 years ago
Jeongseok Lee 47911d92b2 Fix minor typo in examples/README.txt 9 years ago
ocornut 1349d0aacf Examples: DirectX9: Removing spaces (#663) 9 years ago
Trezanik 790275eae2 Example: DirectX9: Backup and restore all state 9 years ago
ocornut 8a0d3b9628 Examples; DirectX10/11: Added comments about removing dependency on d3dcompiler DLL (#638) 9 years ago
ocornut 2ef766a1ce Examples: DirectX10: Apply depth-stencil state like DirectX11 example (#640, #636) 9 years ago
ocornut 656b1e848c Examples: DirectX11: Fixed uninitialized fields. Disabling depth-write (#640, #636) 9 years ago
ocornut f4633d09ac Examples: DirectX10, DirectX11: Removed seemingly unnecessary bunch of rasterizer state creation code. 9 years ago
ocornut 834bfe4af5 Examples: DirectX11: Fixed handle leak + minor coding style fix for #640 9 years ago
josiahmanson 5fe2cacd4d DX11 example depth test 9 years ago
ocornut c1da3e354e Examples: SDL: Fixed unused variable warning on non-Windows platforms (#626) 9 years ago
ocornut 79ad22e1f2 Fixed various Clang -Weverything warnings (#626) 9 years ago
ocornut f46c91f5ad Examples: DirectX9: Removed dependency on dxguid.lib + remainder of d3dx9.lib (#611) 9 years ago
ocornut 731ff3d3f5 Examples: DirectX9: Removed dependency on dx3x9 (remainder) (#611) 9 years ago
ocornut 50df86985d Examples: DirectX9: Removed dependency on dx3x9.h so it can be used in a DirectXMath.h only environment (#611) 9 years ago
ocornut bfb2dc2290 Examples: OpenGL3: Saving/restoring glActiveTexture() state (#602) 9 years ago
ocornut c2c0b57e5e Examples: OpenGL2: Extra comments (#606) 9 years ago
ocornut 559963e832 Examples: Apple/iOS: lowered xcode project deployment target from 10.7 to 10.11 (#598, #575) 9 years ago
ocornut 1612ca071b Examples: SDL: Initialize video+timer subsystem only. 9 years ago
ocornut 4466a7b3b0 Examples: DirectX9: save/restore some more device state. 9 years ago
omar 319e288eef Update README.md 9 years ago
ocornut 71b981d05f Examples: Apple: Readme tweaks (#575 #247) 9 years ago
James Chen 67b604412b Remove local glfw3 lib for osx. (+1 squashed commit)
Squashed commits:
[34cc3b7] Adds osx example. (+6 squashed commits)
Squashed commits:
[20330f2] Uses glfw by brew install.
[0427861] Renames imguiex folder name to imguiex-ios
[f9e27e5] Renames ios_example to apple_example.
[44f8fe3] Updates the glfw header/library path.
[919f279] Renames target from imguiex to imguiex-ios since there is already a imguiex-osx target now.
[24395f5] Adds osx example.
9 years ago
ocornut c1427de5b6 Examples: Libs: Update glfw binaries to glfw master. 9 years ago
ocornut 0e7b9b8284 Examples: Vulkan: Coding style tweaks. 9 years ago
ocornut 9c513d4443 Merge branch 'master' of https://github.com/Loftilus/imgui into Loftilus-master 9 years ago
ocornut 552246feed Examples: DirectX10,DirectX11 : Minor renaming 9 years ago
ocornut 518f32ccfe Examples: DirectX10: Save/restore state + minor cleanups (#570) 9 years ago
ocornut 90493f8add Examples: DirectX11: Shallow massaging to make the code more consistent/readable (following #570) 9 years ago
ocornut 2942240072 Examples: DX11: Cleanup state backup/restore code (#570) 9 years ago
Nicolas Guillemot d4d51a7802 capture and restore all state 9 years ago
ocornut 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.
9 years ago
ocornut ae0c33c983 Examples: Links 9 years ago
ocornut 7661b1e778 Trim trailing spaces 9 years ago
ocornut fdc4299c6c Examples: SDL: Made ImGui_ImplSdlGL3_NewFrame() signature match GL2 one 9 years ago
ocornut e6c2c1fcfd Examples: SDL: Minor fixes to follow syntax of other examples (#495) 9 years ago
Nick Gravelyn 8a61c0afea Applying same fix to OpenGL 3 example. Fixing spaces/tabs. 9 years ago
Nick Gravelyn a9b0abe493 Automatically updating DisplayFrameBufferScale by reading the OpenGL drawable size and comparing with the window size. This fixed dear imgui which was rendering only to 1/4 of my window. 9 years ago
ocornut 04396ed7a9 FAQ and comments about the use of ImTextureID (#562, #561, #521, #510, #497, #475 ...) 9 years ago
Håvard Mathisen 1394616d9c Vulkan Example: Some code layout changes. 9 years ago
Håvard Mathisen 4ea4fa3e73 Vulkan Example: Fix synchronization. 9 years ago
Håvard Mathisen 0ceddc29ff Vulkan Example: Fix windows build. 9 years ago
Håvard Mathisen 4cbd316f01 Vulkan example. 9 years ago
ocornut 1dcb9c877d Examples: OpenGL: Fix early return on zero-sized framebuffer breaking GL state (#486, #547) 9 years ago
Jefferson Montgomery f6181b3428 Examples: DirectX12: Add directx12_example 9 years ago
ocornut 2813a44dcc Examples: OpenGL: skip rendering and calling glViewport() if we have a zero-fixed buffer (#486) 9 years ago
ocornut 9e86d0e225 Examples: SDL/OpenGL: Tabs to spaces 9 years ago
ocornut 87a6110994 Examples: OpenGL3: Fix BindVertexArray/BindBuffer order (#527) 9 years ago
ocornut 07e379a950 Examples: DirectX9: Wastefully use a RGBA8 texture for the font texture to make compability more evident with user's textures (#521) 9 years ago
ocornut b8f86ec4bd Examples: OpenGL2/3 Makefile; Added -lGL to Linux build 9 years ago
ocornut a81a5e5235 Commented Clang warning that's not compatible with all versions. Comments. 9 years ago
ocornut 9e8795f4e2 Examples: Added extra comments 9 years ago
ocornut 31fe006c85 Examples: DirectX10 fixed ImGui_ImplDX10_NewFrame() from recreating device objects if render isn't called (g_pVB not set) 9 years ago
ocornut 6277ffe00f Examples: DirectX11: fixed ImGui_ImplDX11_NewFrame() from recreating device objects if render isn't called (g_pVB not set) 9 years ago
ocornut 49fb7364b5 Examples: SDL2+OpenGL3: Fix context creation options (#468, #463) 9 years ago
ocornut 3aa4a108ed Examples: SDL/OpenGL3: Fixed linking documentation for MacOSX (#463) 9 years ago
ocornut 217a6c875a Examples: OpenGL: Tentative fix for miscaled call to glViewport on high-DPI screens (#441)
Fix for 980ca286fe
9 years ago
ocornut bf83ac8b55 Examples: Fixed msvc batch files from warning. 9 years ago
ocornut 9596e6f794 Examples: DirectX10: Minor tweaks, updated to latest example changes (#424) 9 years ago
ocornut dadd03fc11 Examples: DirectX10: Fix warning, disable debug device, add ignore list (#424) 9 years ago
Julian Bosch 32c1a3e46c Removed d3d11 references 9 years ago
Julian Bosch 1f3a0e78cc Ported d3d11 renderer to d3d10 9 years ago
omar fe2972e8b2 Merge pull request #420 from RaptorFactor/master
Examples: DX11: Compile shaders with lower features levels.
9 years ago
Joshua Boyce 6adf644448 Allow DX11 renderer to be used with devices with lower feature levels. 9 years ago
ocornut 1b7aee7b9d Examples: DX11: Remove debug flag (#415) 9 years ago
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.
9 years ago
ocornut 94ec3d534e Examples: Header comments. 9 years ago
ocornut 6800939e73 Examples: Header comments. 9 years ago
ocornut 5c52e9ec0d Examples: Clarified comments. Removed font merging example from comments. 9 years ago
ocornut d673db3092 Examples: Added README into the Visual Studio solution to people are less likely to miss it. 9 years ago
ocornut 9735563b65 Additional comments for new users 9 years ago
zryan3 aa6cb32bd4 fixed text referencing GLFW library in SDL examples 9 years ago
ocornut 83e6cfbec0 Examples: DirectX9/11: Removed assumption about Unicode build in example main.cpp (#399) 9 years ago
ocornut dc86a8a0bf Examples: OpenGL3: Fixed gl3w.c for Linux when compiled with C++ compiler (#411) 9 years ago
ocornut 38cfdafbaf Examples: SDL/OpenGL3: Added -ldl to Linux command-line (#411) 9 years ago
ocornut e2ecc02e02 Examples: Updated README 9 years ago
ocornut 899cb3b4e9 Examples: SDL+OpenGL3: Fixed readme (#356) 9 years ago
ocornut ab7e91b65e Examples: SDL+OpenGL3: Various fixes to example to make it matches current GL3 example (#356) 9 years ago
ocornut 9d0caa2e66 Examples: SDL+OpenGL3: Using glew like existing example + renaming (#356) 9 years ago
ocornut 624adb1b23 Tweak build batch files and readmes 9 years ago
ocornut 9a8cbf128d Merge branch 'SDL_OpenGL3_Implementation' of https://github.com/zach2good/imgui into zach2good-SDL_OpenGL3_Implementation 9 years ago
ocornut f87deff0f3 Moving stdlib.h include outside of imgui.h (#405) 9 years ago
ocornut 3b2fdf27a8 Examples: Added /Zi (output debug information) in build_win32.bat files 9 years ago
ocornut 1d76890526 Examples: OpenGL3: Implement ImGui_ImplGlfwGL3_InvalidateDeviceObjects() like other examples. 9 years ago
ocornut e46c7b70eb Examples: Most examples apps detect if ImDrawIdx was changed to 32-bits instead of 16 9 years ago
ocornut 0a23e2c832 Tabs to spaces 9 years ago
ocornut 980ca286fe Examples: OpenGL2/3: Save/setup/restore viewport as part of render function. Update SDL example to match GL2 one. (fix #392) 9 years ago
ocornut e858d229a0 Examples: update all examples with same comment (#389) 9 years ago
Doug Binks e1bc0dd7d5 Font merge demo and documentation minor additions.
Clarifies the lifetime requirements for the ranges parameter for AddFont* functions.
9 years ago
Gargaj e4d916a4b3 NULL out font texture on invalidate
If this isn't done, NewFrame won't re-create the font.
9 years ago
ocornut 2b3fb5c0f7 Example: Marmalade: shallow tweaks and cleanups to match ImGui coding style (#375) 9 years ago
gzito ba9c469ff0 no message 9 years ago
gzito ebf4f1fa02 no message 9 years ago
gzito 79ca203850 Merge branch 'master' of https://github.com/ocornut/imgui 9 years ago
ocornut 5d53f37a5d Examples: Possibly clarified the intent of imgui_impl_* files. 9 years ago
Nicolas Guillemot 509ac33abe fix POSITION format (ImDrawVert::pos is 2D, not 4D)
the inputlayout incorrectly described the POSITION attribute as being
4D, while ImDrawVert::pos is 2D. This went unnoticed because the buffer
binding has a stride of sizeof(ImDrawVert) and the POSITION is treated
as a float2 in the vertex shader. If you switch POSITION to float4 in
the vertex shader (and actually use the z/w in the matrix
multiplication) then everything become wacky-looking since it's
interpreting the texture coordinates as z/w. On a similar note: It's
weird that the projection matrix takes z and w into consideration when
those don't exist in the shader due to positions being float2s.
9 years ago
gzito 50b25b6c75 Added example for the Marmalade platform 9 years ago
ocornut a77e534ded Examples: OpenGL2: Add msys2/mingw64 target (#361) 9 years ago
radius a465b2b3d8 add msys2/mingw64 target 9 years ago
Zach Toogood e130b09d91 Previous SDL implementation didn't work with my OpenGL 3.3 project, spliced the GLFW OpenGL examples on top of the SDL example to create an option that works for me. Could be useful for others. 9 years ago
ocornut 963f6b782d Examples: OpenGL3: saving more of blend state (#347) 9 years ago
ocornut d5502cdd6d Examples: OpenGL3: Saving/restoring the Enable state, better than nothing (#347) 9 years ago
ocornut 25b4b88a7a Examples: Update readme. 9 years ago
ocornut ad4c962224 Examples: DirectX11: Fixed batch file for VS 2012+, still works for 2008/2010.. Include path order matters... 9 years ago
ocornut 853f265025 Examples: Added batch files to build Windows examples with VS 9 years ago
ocornut 167c02d502 Better Git ignore list for quick compilations in same folder 9 years ago
ocornut 1793c1a991 Comments 9 years ago
ocornut 7d6ddbe5c8 Examples: comment on setting the RenderDrawListsFn function. 9 years ago
ocornut 77bcb7152b Examples: DirectX11: fixed vertex shader which breaks with VS2015 somehow (DX11 version?) (#313) 9 years ago
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.
9 years ago
ocornut da807e55ea Examples: Ignore list a little more friendly to Unix systems. 9 years ago
ocornut 5ebd61f89c Ignore list a little more friendly to Unix systems 9 years ago
ocornut e58f99179a Examples: OpenGL: fix for retina screens + io.DisplayFramebufferScale storage (#287) 9 years ago
ocornut 62671ef96e Examples: update readme 9 years ago
ocornut 822eaf1751 Examples: DX9, DX11: mapping missing middle mouse button. 9 years ago
ocornut 9a0650dbd0 Examples: imgui_impl* functions declared with IMGUI_API to ease copy & pasting into projects using DLL 9 years ago
yinjimmy 01a17aa78e fix ios compile error 9 years ago
ocornut 23ce837dc7 Revert "Examples: GLFW: using glfwSetCharModsCallback() to ensure characters aren't passed when using mods (fix #279)"
This reverts commit d80869189a.
9 years ago
ocornut d80869189a Examples: GLFW: using glfwSetCharModsCallback() to ensure characters aren't passed when using mods (fix #279) 9 years ago
Andres Vahter ccbc72e98b add mac os x build instructions for sdl_opengl_example 9 years ago
ocornut 215747635d Examples: DirectX11: resizing buffers dynamically (#299) 9 years ago
ocornut c016f6c171 Examples: DirectX9: tweaks. 9 years ago
ocornut 698c7cae85 Examples: DirectX9: resizing vertex and index buffers dynamically (#299) 9 years ago
Thomas Pöchtrager 3604aecf8f Minor Windows adjustments 9 years ago
Thomas Pöchtrager 947cf3434f Added printf attribute to printf like text formatting functions 9 years ago
ocornut 470200ee5c Update documentation 9 years ago
ocornut 85dab1a680 Fixed documentation 9 years ago
ocornut 8be4d41540 Merge remote-tracking branch 'origin' into 2015-07-cleanup 9 years ago
Chris Maughan d667de9490 Clear font texture view to ensure Release() doesn't get called twice 9 years ago
ocornut e099798c97 Merge remote-tracking branch 'origin' into 2015-07-cleanup 9 years ago
ocornut 11d91a27a4 Carriage return (#289) 9 years ago
Jonathan Adamczewski f158617551 Show SDL error message on init failure 9 years ago
ocornut 52a74701f5 Updated projects to reference new files (#219)
Didn't update iOS example (#247)
9 years ago
ocornut 0eb196d544 Examples: OpenGL3: simplified code using glBufferData for vertices as well (#277, #278) 9 years ago
ocornut dc1cb9e625 Tweak 9 years ago
Nik Voss bc9bae6d01 To support drivers with strict core profiles, a buffer is used for the indices as well (fixes ocornut/imgui#277). 9 years ago
omar 98047b1b65 Update README.txt 9 years ago
omar f53d5da0f8 Update README.txt 9 years ago
Daniel Gibson b7d1b91e4b Use ImGuiIO::AddInputCharactersUTF8() in SDL2 example
Now Unicode text input works in this example.
9 years ago
Daniel Gibson 02a0967243 Fix SDL2-example for Linux
The header is called "SDL_opengl.h" - case matters on Linux.

The main() function must indeed be called main(), on Windows it'll be
renamed to SDL_main (for SDL2main.lib) by #define in SDL_main.h
(which is included by SDL.h)

I added an entry to the example's README that describes how to build
it on Linux.
9 years ago
ocornut 4842ac3bc6 Fonts: added Cousine-Regular.ttf 9 years ago
ocornut 0224d29a35 Examples: comments. 9 years ago
ocornut fcec337061 Examples: Simplified font examples comments. 9 years ago
ocornut fd44b9440b Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	imgui.cpp
9 years ago
ocornut f2bed00d80 Examples: README 9 years ago
ocornut 5ab23ab1c0 Allegro 5 example: removed public domain mark, MIT as the rest, with @bggd approval 9 years ago
ocornut 2f574ef952 Allegro 5 example: converted for indexed rendering. 9 years ago
ocornut 60dd221737 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 9 years ago
ocornut bbaaab7537 Allegro 5 example: fixed uv coordinate of non-default texture. 9 years ago
ocornut 4d2d0ce5cd Allegro 5 example: handling of hardware and software mouse cursor rendering. 9 years ago
ocornut 8db229b96f Allegro 5 example: fixed key modifiers, keyboard input, clipping, added pagedown/pageup. 9 years ago
ocornut c58d61dfd1 Allegro 5 example: formatting, match other example structure, fixed mouse buttons. 9 years ago
ocornut 489e28ec11 Allegro 5 example: main.cpp matches other examples. added window title. 9 years ago
ocornut 1845ff4690 SDL example: tweaks (#233 #226) 9 years ago
ocornut 19e3c1506f Allegro5 example: added example from https://github.com/bggd/a5imgui_example 9 years ago
ocornut e49977a913 SDL example: hasty readme. 9 years ago
ocornut d041ebc6d4 Merge branch '2015-03-antialiased-primitives' of https://github.com/ocornut/imgui into 2015-03-antialiased-primitives 9 years ago
ocornut b7e63c163c SDL example: update for indexed rendering. 9 years ago
ocornut b36ff2fec3 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 9 years ago
omar 12aba576fb Merge pull request #264 from joeld42/antialias-ios-fix
AA branch: iOS Example: update for API changes and index rendering
9 years ago
ocornut a14f6696a3 SDL example: more cleanup to match other examples (#233 #226) 9 years ago
ocornut 22e099366f SDL example: further cleanup to match other examples (#233 #226) 9 years ago
ocornut 4167528001 SDL example: moved event loop to main.cpp , adding page up/page down. (#226) 9 years ago
Joel Davis 81cebb9c85 Simplified to not combine vert buffers like the opengl3 example 9 years ago
ocornut b7a2a6b23f SDL example: renamed folder, added in README 9 years ago
ocornut b3ae2976c5 SDL example: tweaks and fixes. 9 years ago
ocornut 046dbf502c Merge branch 'SampleSDL2' of https://github.com/CedricGuillemet/imgui into CedricGuillemet-SampleSDL2 9 years ago
ocornut e3b9a61883 Examples: OpenGL3: simplified code. Upload each vertex array separately. (cf #264) 9 years ago
Joel Davis ca042134ae Update ios example for API changes and index rendering 9 years ago
ocornut 1cd391146d Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 9 years ago
ocornut 7d144eb899 iOS Example: Optimise PNG files size 9 years ago
ocornut fb27360ea8 iOS example: shallow tweaks and fixes (untested) 9 years ago
Joel Davis eee6dab226 iOS example working based on modified OpenGL3 example + Synergy 9 years ago
ocornut d03b046ef4 AA branch: Agressively renamed all fields of ImDrawList, ImDrawCmd, ImDrawData to match the rest of our coding convention (#133) 9 years ago
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
9 years ago
ocornut 502e360ee5 Removed the majority of size_t from the code. ImVector<> now uses int. (#262)
May trigger new compilation warnings?
9 years ago
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.
9 years ago
ocornut b2b616be00 AA branch: ImDrawCmd idx_count -> elem_count 9 years ago
ocornut f3303fa84f AA branch: io.RenderDrawListsFn signature changed to take ImDrawData, neater and future proof breaking of the render API (#133 #254) 9 years ago
ocornut 8b4a470e1d Examples: DirectX9: fixed size passed to vertex and index buffer Lock() + readjust default buffer sizes. 9 years ago
ocornut 61e551e0ee AA branch: fixed warning 9 years ago
ocornut f435e42561 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	examples/opengl_example/imgui_impl_glfw.cpp
9 years ago
ocornut 7437b43b2d Fixed warnings for more pedantic settings (#258) 9 years ago
ocornut b69d7d9df3 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 9 years ago
ocornut 2f03511062 Added ImGuiKey_PageUp, ImGuiKey_PageDown for user. 9 years ago
ocornut 71e9f2a3dd Fixed warnings for 64-bits builds 9 years ago
Cedric Guillemet 2acdafe4f2 imgui_impl_sdl and main sample 10 years ago
ocornut e3f2ad728a Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
	examples/directx11_example/imgui_impl_dx11.cpp
10 years ago
Gordon McShane 6ee65fc5af Add conditional compilation of forward compat. glfw window hint to fix crash on later versions of OSX 10 years ago
ocornut b6f3c97e3b Examples: DirectX11: explicitly set rasterizer state. 10 years ago
ocornut e9b6e437eb Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
	imgui.cpp
	imgui.h
10 years ago
ocornut 5df542c3c0 ImFontAtlas: doesn't clear input data, left to the application. (#224) 10 years ago
ocornut f00662a5ad Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering 10 years ago
ocornut ad7f600e0d Examples: DirectX9/11: hide os curosr if ImGui is drawing it (#155) 10 years ago
ocornut 18a00c7060 Examples: DirectX9/11: Fixed key mapping for down arrow. 10 years ago
ocornut 4f1acf0d4a Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
	imgui.cpp
10 years ago
ocornut f400ea4ec8 Examples: OpenGL3: backup/restore current program and texture #195 10 years ago
Dale Kim ac518a1d3e Set modifier key state by inspecting imgui's io.KeysDown array. 10 years ago
ocornut 43cb4038c6 Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
	examples/directx11_example/imgui_impl_dx11.cpp
	imgui.cpp
10 years ago
ocornut 71429d306e Examples: Simplified GLFW keyboard callbacks 10 years ago
ocornut c735d3066b Merge branch 'master' of https://github.com/Roflraging/imgui into Roflraging-master 10 years ago
Dale Kim fe15756129 Simplified glfw keyboard callbacks. 10 years ago
ocornut d809abbe1c Examples: DirectX11: tidying up. 10 years ago
ocornut 7ab49f80ca Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
	examples/directx11_example/imgui_impl_dx11.cpp
	examples/opengl3_example/imgui_impl_glfw_gl3.cpp
10 years ago
ocornut 4f51b77937 Examples: OpenGL3: Tweaks (argh, github ui) 10 years ago
ocornut 90766141b3 Examples: OpenGL3: Tweaks. 10 years ago
ocornut 37f1715bfa Examples: DirectX11: Removed unnecessary vertices conversion and CUSTOMVERTEX types. 10 years ago
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 10 years ago
ocornut d9ff617ff8 Examples: Formatting #187 10 years ago
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.
10 years ago
omar 46769406dc Update README.txt 10 years ago
ocornut 73e2d56acc Examples: OpenGL fixed-pipeline: added glBindTexture(0), via Anton M 10 years ago
Dale Kim 4b7be31197 Fixed modifier key state setting in GLFW callbacks. 10 years ago
ocornut d25578efd8 Examples: initializing float + missing comment. 10 years ago
ocornut 3abfb85613 Comments on font loading, fixed commented out paths and added DroidSans in the list 10 years ago
ocornut ed94edfd8e Examples: Terser code + added commented out glUseProgram(0( suggestion in OpenGL2 sample. 10 years ago
Adam D. Moss c1766c95ed OpenGL/GLFW: hide system cursor if imgui is soft-rendering cursor 10 years ago
biller23 2f4271a2b3 typo ImGui_ImplGlfwGL3_KeyCallback() 10 years ago
ocornut cb285c4d35 Examples: uses SetNextWindowPos/SetNextWindowSize when applicable 10 years ago
ocornut 04358c301e Removed extraneous spaces 10 years ago
Adam D. Moss f2ff88b03a opengl3+opengl example: if content window doesn't have focus, tell ImGui we don't have a mouse position. e.g. avoids tooltips popping up in imgui app when you're interacting with a different app window that overlaps it. 10 years ago
ocornut d3e444dfd9 Examples: DirectX9: fixed duplicate creation of vertex buffer. Size of static vertex buffer at top of the code. 10 years ago
ocornut 06fbeed41a Examples: Fixed Makefile 10 years ago
ocornut 55edd522c2 Examples: Fixed Makefile 10 years ago
ocornut e97d02a294 Examples: Fixed Clang warnings in DirectX examples 10 years ago
ocornut 7c9bd71512 Examples: MSVC: increase warning level from /W3 to /W4 for OpenGL examples 10 years ago
ocornut 2b0acc128c Examples: MSVC: increase warning level from /W3 to /W4 for DirectX examples 10 years ago
ocornut 8e0f04638d Examples: Fix includes order to avoid conflicts between DXSDK_DIR and Windows SDK 10 years ago
ocornut e2c4ba21bc Examples: Added 64-bit projects for MSVC 10 years ago