Commit Graph

515 Commits (38d45ee73f47a70ca1f9a81522a36d493ab1bf30)

Author SHA1 Message Date
Håvard Mathisen 99b4f951b9 Fix Vulkan example for use when a depth buffer is active.
Gustav 5def10c3a0 Fixed OpenGL error when calling Shutdown without calling NewFrame
ocornut 5ae71aa04a Examples: Renaming opengl_example/ to opengl2_example/ for clarity (1/2 because git)
ocornut 3c384c2f10 Examples: Renaming opengl_example/ to opengl2_example/ for clarity (1/2 because git)
ocornut 82768e05f3 Ignore list for Visual Studio
Marcell Kiss 4bc6a951fe tabs to space, remove braces
Marcell Kiss 3234f81cb1 maxImageCount may be 0; add missing sType; change to 1 push constant range
Jamie Seward 0a1d456de1 Fix compile warnings in SDL examples
ocornut d8dacd729b Examples: SDL+OpenGL: explicitly setting GL_UNPACK_ROW_LENGTH to reduce issues because SDL changes it ()
Jeongseok Lee 47911d92b2 Fix minor typo in examples/README.txt
ocornut 1349d0aacf Examples: DirectX9: Removing spaces ()
Trezanik 790275eae2 Example: DirectX9: Backup and restore all state
ocornut 8a0d3b9628 Examples; DirectX10/11: Added comments about removing dependency on d3dcompiler DLL ()
ocornut 2ef766a1ce Examples: DirectX10: Apply depth-stencil state like DirectX11 example (, )
ocornut 656b1e848c Examples: DirectX11: Fixed uninitialized fields. Disabling depth-write (, )
ocornut f4633d09ac Examples: DirectX10, DirectX11: Removed seemingly unnecessary bunch of rasterizer state creation code.
ocornut 834bfe4af5 Examples: DirectX11: Fixed handle leak + minor coding style fix for
josiahmanson 5fe2cacd4d DX11 example depth test
ocornut c1da3e354e Examples: SDL: Fixed unused variable warning on non-Windows platforms ()
ocornut 79ad22e1f2 Fixed various Clang -Weverything warnings ()
ocornut f46c91f5ad Examples: DirectX9: Removed dependency on dxguid.lib + remainder of d3dx9.lib ()
ocornut 731ff3d3f5 Examples: DirectX9: Removed dependency on dx3x9 (remainder) ()
ocornut 50df86985d Examples: DirectX9: Removed dependency on dx3x9.h so it can be used in a DirectXMath.h only environment ()
ocornut bfb2dc2290 Examples: OpenGL3: Saving/restoring glActiveTexture() state ()
ocornut c2c0b57e5e Examples: OpenGL2: Extra comments ()
ocornut 559963e832 Examples: Apple/iOS: lowered xcode project deployment target from 10.7 to 10.11 (, )
ocornut 1612ca071b Examples: SDL: Initialize video+timer subsystem only.
ocornut 4466a7b3b0 Examples: DirectX9: save/restore some more device state.
omar 319e288eef Update README.md
ocornut 71b981d05f Examples: Apple: Readme tweaks ( )
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.
ocornut c1427de5b6 Examples: Libs: Update glfw binaries to glfw master.
ocornut 0e7b9b8284 Examples: Vulkan: Coding style tweaks.
ocornut 9c513d4443 Merge branch 'master' of https://github.com/Loftilus/imgui into Loftilus-master
ocornut 552246feed Examples: DirectX10,DirectX11 : Minor renaming
ocornut 518f32ccfe Examples: DirectX10: Save/restore state + minor cleanups ()
ocornut 90493f8add Examples: DirectX11: Shallow massaging to make the code more consistent/readable (following )
ocornut 2942240072 Examples: DX11: Cleanup state backup/restore code ()
Nicolas Guillemot d4d51a7802 capture and restore all 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 ae0c33c983 Examples: Links
ocornut 7661b1e778 Trim trailing spaces
ocornut fdc4299c6c Examples: SDL: Made ImGui_ImplSdlGL3_NewFrame() signature match GL2 one
ocornut e6c2c1fcfd Examples: SDL: Minor fixes to follow syntax of other examples ()
Nick Gravelyn 8a61c0afea Applying same fix to OpenGL 3 example. Fixing spaces/tabs.
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.
ocornut 04396ed7a9 FAQ and comments about the use of ImTextureID (, , , , , ...)
Håvard Mathisen 1394616d9c Vulkan Example: Some code layout changes.
Håvard Mathisen 4ea4fa3e73 Vulkan Example: Fix synchronization.
Håvard Mathisen 0ceddc29ff Vulkan Example: Fix windows build.
Håvard Mathisen 4cbd316f01 Vulkan example.
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 9e86d0e225 Examples: SDL/OpenGL: Tabs to spaces
ocornut 87a6110994 Examples: OpenGL3: Fix BindVertexArray/BindBuffer order ()
ocornut 07e379a950 Examples: DirectX9: Wastefully use a RGBA8 texture for the font texture to make compability more evident with user's textures ()
ocornut b8f86ec4bd Examples: OpenGL2/3 Makefile; Added -lGL to Linux build
ocornut a81a5e5235 Commented Clang warning that's not compatible with all versions. Comments.
ocornut 9e8795f4e2 Examples: Added extra comments
ocornut 31fe006c85 Examples: DirectX10 fixed ImGui_ImplDX10_NewFrame() from recreating device objects if render isn't called (g_pVB not set)
ocornut 6277ffe00f Examples: DirectX11: fixed ImGui_ImplDX11_NewFrame() from recreating device objects if render isn't called (g_pVB not set)
ocornut 49fb7364b5 Examples: SDL2+OpenGL3: Fix context creation options (, )
ocornut 3aa4a108ed Examples: SDL/OpenGL3: Fixed linking documentation for MacOSX ()
ocornut 217a6c875a Examples: OpenGL: Tentative fix for miscaled call to glViewport on high-DPI screens ()
Fix for 980ca286fe
ocornut bf83ac8b55 Examples: Fixed msvc batch files from warning.
ocornut 9596e6f794 Examples: DirectX10: Minor tweaks, updated to latest example changes ()
ocornut dadd03fc11 Examples: DirectX10: Fix warning, disable debug device, add ignore list ()
Julian Bosch 32c1a3e46c Removed d3d11 references
Julian Bosch 1f3a0e78cc Ported d3d11 renderer to d3d10
omar fe2972e8b2 Merge pull request from RaptorFactor/master
Examples: DX11: Compile shaders with lower features levels.
Joshua Boyce 6adf644448 Allow DX11 renderer to be used with devices with lower feature levels.
ocornut 1b7aee7b9d Examples: DX11: Remove debug flag ()
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 94ec3d534e Examples: Header comments.
ocornut 6800939e73 Examples: Header comments.
ocornut 5c52e9ec0d Examples: Clarified comments. Removed font merging example from comments.
ocornut d673db3092 Examples: Added README into the Visual Studio solution to people are less likely to miss it.
ocornut 9735563b65 Additional comments for new users
zryan3 aa6cb32bd4 fixed text referencing GLFW library in SDL examples
ocornut 83e6cfbec0 Examples: DirectX9/11: Removed assumption about Unicode build in example main.cpp ()
ocornut dc86a8a0bf Examples: OpenGL3: Fixed gl3w.c for Linux when compiled with C++ compiler ()
ocornut 38cfdafbaf Examples: SDL/OpenGL3: Added -ldl to Linux command-line ()
ocornut e2ecc02e02 Examples: Updated README
ocornut 899cb3b4e9 Examples: SDL+OpenGL3: Fixed readme ()
ocornut ab7e91b65e Examples: SDL+OpenGL3: Various fixes to example to make it matches current GL3 example ()
ocornut 9d0caa2e66 Examples: SDL+OpenGL3: Using glew like existing example + renaming ()
ocornut 624adb1b23 Tweak build batch files and readmes
ocornut 9a8cbf128d Merge branch 'SDL_OpenGL3_Implementation' of https://github.com/zach2good/imgui into zach2good-SDL_OpenGL3_Implementation
ocornut f87deff0f3 Moving stdlib.h include outside of imgui.h ()
ocornut 3b2fdf27a8 Examples: Added /Zi (output debug information) in build_win32.bat files
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 e858d229a0 Examples: update all examples with same comment ()
Doug Binks e1bc0dd7d5 Font merge demo and documentation minor additions.
Clarifies the lifetime requirements for the ranges parameter for AddFont* functions.
Gargaj e4d916a4b3 NULL out font texture on invalidate
If this isn't done, NewFrame won't re-create the font.
ocornut 2b3fb5c0f7 Example: Marmalade: shallow tweaks and cleanups to match ImGui coding style ()
gzito ba9c469ff0 no message
gzito ebf4f1fa02 no message
gzito 79ca203850 Merge branch 'master' of https://github.com/ocornut/imgui
ocornut 5d53f37a5d Examples: Possibly clarified the intent of imgui_impl_* files.
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.
gzito 50b25b6c75 Added example for the Marmalade platform
ocornut a77e534ded Examples: OpenGL2: Add msys2/mingw64 target ()
radius a465b2b3d8 add msys2/mingw64 target
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.
ocornut 963f6b782d Examples: OpenGL3: saving more of blend state ()
ocornut d5502cdd6d Examples: OpenGL3: Saving/restoring the Enable state, better than nothing ()
ocornut 25b4b88a7a Examples: Update readme.
ocornut ad4c962224 Examples: DirectX11: Fixed batch file for VS 2012+, still works for 2008/2010.. Include path order matters...
ocornut 853f265025 Examples: Added batch files to build Windows examples with VS
ocornut 167c02d502 Better Git ignore list for quick compilations in same folder
ocornut 1793c1a991 Comments
ocornut 7d6ddbe5c8 Examples: comment on setting the RenderDrawListsFn function.
ocornut 77bcb7152b Examples: DirectX11: fixed vertex shader which breaks with VS2015 somehow (DX11 version?) ()
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 da807e55ea Examples: Ignore list a little more friendly to Unix systems.
ocornut 5ebd61f89c Ignore list a little more friendly to Unix systems
ocornut e58f99179a Examples: OpenGL: fix for retina screens + io.DisplayFramebufferScale storage ()
ocornut 62671ef96e Examples: update readme
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
yinjimmy 01a17aa78e fix ios compile error
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 )
Andres Vahter ccbc72e98b add mac os x build instructions for sdl_opengl_example
ocornut 215747635d Examples: DirectX11: resizing buffers dynamically ()
ocornut c016f6c171 Examples: DirectX9: tweaks.
ocornut 698c7cae85 Examples: DirectX9: resizing vertex and index buffers dynamically ()
Thomas Pöchtrager 3604aecf8f Minor Windows adjustments
Thomas Pöchtrager 947cf3434f Added printf attribute to printf like text formatting functions
ocornut 470200ee5c Update documentation
ocornut 85dab1a680 Fixed documentation
ocornut 8be4d41540 Merge remote-tracking branch 'origin' into 2015-07-cleanup
Chris Maughan d667de9490 Clear font texture view to ensure Release() doesn't get called twice
ocornut e099798c97 Merge remote-tracking branch 'origin' into 2015-07-cleanup
ocornut 11d91a27a4 Carriage return ()
Jonathan Adamczewski f158617551 Show SDL error message on init failure
ocornut 52a74701f5 Updated projects to reference new files ()
Didn't update iOS example ()
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 ).
omar 98047b1b65 Update README.txt
omar f53d5da0f8 Update README.txt
Daniel Gibson b7d1b91e4b Use ImGuiIO::AddInputCharactersUTF8() in SDL2 example
Now Unicode text input works in this example.
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.
ocornut 4842ac3bc6 Fonts: added Cousine-Regular.ttf
ocornut 0224d29a35 Examples: comments.
ocornut fcec337061 Examples: Simplified font examples comments.
ocornut fd44b9440b Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	imgui.cpp
ocornut f2bed00d80 Examples: README
ocornut 5ab23ab1c0 Allegro 5 example: removed public domain mark, MIT as the rest, with @bggd approval
ocornut 2f574ef952 Allegro 5 example: converted for indexed rendering.
ocornut 60dd221737 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
ocornut bbaaab7537 Allegro 5 example: fixed uv coordinate of non-default texture.
ocornut 4d2d0ce5cd Allegro 5 example: handling of hardware and software mouse cursor rendering.
ocornut 8db229b96f Allegro 5 example: fixed key modifiers, keyboard input, clipping, added pagedown/pageup.
ocornut c58d61dfd1 Allegro 5 example: formatting, match other example structure, fixed mouse buttons.
ocornut 489e28ec11 Allegro 5 example: main.cpp matches other examples. added window title.
ocornut 1845ff4690 SDL example: tweaks ( )
ocornut 19e3c1506f Allegro5 example: added example from https://github.com/bggd/a5imgui_example
ocornut e49977a913 SDL example: hasty readme.
ocornut d041ebc6d4 Merge branch '2015-03-antialiased-primitives' of https://github.com/ocornut/imgui into 2015-03-antialiased-primitives
ocornut b7e63c163c SDL example: update for indexed rendering.
ocornut b36ff2fec3 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
omar 12aba576fb Merge pull request from joeld42/antialias-ios-fix
AA branch: iOS Example: update for API changes and index rendering
ocornut a14f6696a3 SDL example: more cleanup to match other examples ( )
ocornut 22e099366f SDL example: further cleanup to match other examples ( )
ocornut 4167528001 SDL example: moved event loop to main.cpp , adding page up/page down. ()
Joel Davis 81cebb9c85 Simplified to not combine vert buffers like the opengl3 example
ocornut b7a2a6b23f SDL example: renamed folder, added in README
ocornut b3ae2976c5 SDL example: tweaks and fixes.
ocornut 046dbf502c Merge branch 'SampleSDL2' of https://github.com/CedricGuillemet/imgui into CedricGuillemet-SampleSDL2
ocornut e3b9a61883 Examples: OpenGL3: simplified code. Upload each vertex array separately. (cf )
Joel Davis ca042134ae Update ios example for API changes and index rendering
ocornut 1cd391146d Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
ocornut 7d144eb899 iOS Example: Optimise PNG files size
ocornut fb27360ea8 iOS example: shallow tweaks and fixes (untested)
Joel Davis eee6dab226 iOS example working based on modified OpenGL3 example + Synergy
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 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
Cedric Guillemet 2acdafe4f2 imgui_impl_sdl and main sample
ocornut e3f2ad728a Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
	examples/directx11_example/imgui_impl_dx11.cpp
Gordon McShane 6ee65fc5af Add conditional compilation of forward compat. glfw window hint to fix crash on later versions of OSX
ocornut b6f3c97e3b Examples: DirectX11: explicitly set rasterizer state.
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