1
0
mirror of https://github.com/ocornut/imgui.git synced 2024-11-18 04:47:17 +01:00
Commit Graph

453 Commits

Author SHA1 Message Date
ocornut
8a0d3b9628 Examples; DirectX10/11: Added comments about removing dependency on d3dcompiler DLL (#638) 2016-05-08 11:49:21 +02:00
ocornut
2ef766a1ce Examples: DirectX10: Apply depth-stencil state like DirectX11 example (#640, #636) 2016-05-07 20:57:38 +02:00
ocornut
656b1e848c Examples: DirectX11: Fixed uninitialized fields. Disabling depth-write (#640, #636) 2016-05-07 20:53:55 +02:00
ocornut
f4633d09ac Examples: DirectX10, DirectX11: Removed seemingly unnecessary bunch of rasterizer state creation code. 2016-05-07 20:19:04 +02:00
ocornut
834bfe4af5 Examples: DirectX11: Fixed handle leak + minor coding style fix for #640 2016-05-07 20:11:14 +02:00
josiahmanson
5fe2cacd4d DX11 example depth test 2016-05-07 10:42:48 -07:00
ocornut
c1da3e354e Examples: SDL: Fixed unused variable warning on non-Windows platforms (#626) 2016-05-04 23:20:41 +02:00
ocornut
79ad22e1f2 Fixed various Clang -Weverything warnings (#626) 2016-05-04 23:17:53 +02:00
ocornut
f46c91f5ad Examples: DirectX9: Removed dependency on dxguid.lib + remainder of d3dx9.lib (#611) 2016-05-03 11:30:43 +02:00
ocornut
731ff3d3f5 Examples: DirectX9: Removed dependency on dx3x9 (remainder) (#611) 2016-05-03 11:12:59 +02:00
ocornut
50df86985d Examples: DirectX9: Removed dependency on dx3x9.h so it can be used in a DirectXMath.h only environment (#611) 2016-05-03 10:47:42 +02:00
ocornut
bfb2dc2290 Examples: OpenGL3: Saving/restoring glActiveTexture() state (#602) 2016-04-30 19:02:19 +02:00
ocornut
c2c0b57e5e Examples: OpenGL2: Extra comments (#606) 2016-04-24 18:11:54 +02:00
ocornut
559963e832 Examples: Apple/iOS: lowered xcode project deployment target from 10.7 to 10.11 (#598, #575) 2016-04-20 20:49:49 +02:00
ocornut
1612ca071b Examples: SDL: Initialize video+timer subsystem only. 2016-04-13 00:15:58 +02:00
ocornut
4466a7b3b0 Examples: DirectX9: save/restore some more device state. 2016-04-11 18:33:16 +02:00
omar
319e288eef Update README.md 2016-04-05 23:08:21 +02:00
ocornut
71b981d05f Examples: Apple: Readme tweaks (#575 #247) 2016-04-05 22:50:23 +02:00
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.
2016-04-05 18:13:48 +08:00
ocornut
c1427de5b6 Examples: Libs: Update glfw binaries to glfw master. 2016-04-03 17:41:59 +02:00
ocornut
0e7b9b8284 Examples: Vulkan: Coding style tweaks. 2016-04-03 17:32:53 +02:00
ocornut
9c513d4443 Merge branch 'master' of https://github.com/Loftilus/imgui into Loftilus-master 2016-04-03 16:42:56 +02:00
ocornut
552246feed Examples: DirectX10,DirectX11 : Minor renaming 2016-04-03 13:02:04 +02:00
ocornut
518f32ccfe Examples: DirectX10: Save/restore state + minor cleanups (#570) 2016-04-03 12:59:56 +02:00
ocornut
90493f8add Examples: DirectX11: Shallow massaging to make the code more consistent/readable (following #570) 2016-04-03 12:48:38 +02:00
ocornut
2942240072 Examples: DX11: Cleanup state backup/restore code (#570) 2016-04-03 12:43:17 +02:00
Nicolas Guillemot
d4d51a7802 capture and restore all state 2016-04-02 19:08:27 -07:00
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.
2016-04-02 18:22:40 +02:00
ocornut
ae0c33c983 Examples: Links 2016-03-29 11:33:23 +02:00
ocornut
7661b1e778 Trim trailing spaces 2016-03-26 15:43:45 +01:00
ocornut
fdc4299c6c Examples: SDL: Made ImGui_ImplSdlGL3_NewFrame() signature match GL2 one 2016-03-25 22:27:43 +01:00
ocornut
e6c2c1fcfd Examples: SDL: Minor fixes to follow syntax of other examples (#495) 2016-03-25 22:25:20 +01:00
Nick Gravelyn
8a61c0afea Applying same fix to OpenGL 3 example. Fixing spaces/tabs. 2016-03-25 22:20:57 +01:00
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. 2016-03-25 22:19:07 +01:00
ocornut
04396ed7a9 FAQ and comments about the use of ImTextureID (#562, #561, #521, #510, #497, #475 ...) 2016-03-24 11:00:47 +01:00
Håvard Mathisen
1394616d9c Vulkan Example: Some code layout changes. 2016-03-10 12:30:38 +01:00
Håvard Mathisen
4ea4fa3e73 Vulkan Example: Fix synchronization. 2016-03-10 11:59:42 +01:00
Håvard Mathisen
0ceddc29ff Vulkan Example: Fix windows build. 2016-03-09 17:01:38 +01:00
Håvard Mathisen
4cbd316f01 Vulkan example. 2016-03-09 16:39:54 +01:00
ocornut
1dcb9c877d Examples: OpenGL: Fix early return on zero-sized framebuffer breaking GL state (#486, #547) 2016-03-06 10:46:57 +01:00
ocornut
2813a44dcc Examples: OpenGL: skip rendering and calling glViewport() if we have a zero-fixed buffer (#486) 2016-02-16 09:14:38 +01:00
ocornut
9e86d0e225 Examples: SDL/OpenGL: Tabs to spaces 2016-02-15 10:56:37 +01:00
ocornut
87a6110994 Examples: OpenGL3: Fix BindVertexArray/BindBuffer order (#527) 2016-02-15 10:55:20 +01:00
ocornut
07e379a950 Examples: DirectX9: Wastefully use a RGBA8 texture for the font texture to make compability more evident with user's textures (#521) 2016-02-08 09:03:43 +01:00
ocornut
b8f86ec4bd Examples: OpenGL2/3 Makefile; Added -lGL to Linux build 2016-01-21 22:30:47 +00:00
ocornut
a81a5e5235 Commented Clang warning that's not compatible with all versions. Comments. 2016-01-21 21:40:22 +00:00
ocornut
9e8795f4e2 Examples: Added extra comments 2016-01-21 18:51:42 +00:00
ocornut
31fe006c85 Examples: DirectX10 fixed ImGui_ImplDX10_NewFrame() from recreating device objects if render isn't called (g_pVB not set) 2016-01-11 10:29:03 +00:00
ocornut
6277ffe00f Examples: DirectX11: fixed ImGui_ImplDX11_NewFrame() from recreating device objects if render isn't called (g_pVB not set) 2016-01-11 10:19:38 +00:00
ocornut
49fb7364b5 Examples: SDL2+OpenGL3: Fix context creation options (#468, #463) 2016-01-05 10:23:43 +01:00
ocornut
3aa4a108ed Examples: SDL/OpenGL3: Fixed linking documentation for MacOSX (#463) 2015-12-30 11:27:39 +01:00
ocornut
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
ocornut
bf83ac8b55 Examples: Fixed msvc batch files from warning. 2015-12-07 21:27:25 +00:00
ocornut
9596e6f794 Examples: DirectX10: Minor tweaks, updated to latest example changes (#424) 2015-12-03 18:32:01 +00:00
ocornut
dadd03fc11 Examples: DirectX10: Fix warning, disable debug device, add ignore list (#424) 2015-12-03 18:20:48 +00:00
Julian Bosch
32c1a3e46c Removed d3d11 references 2015-12-03 13:39:03 +01:00
Julian Bosch
1f3a0e78cc Ported d3d11 renderer to d3d10 2015-12-03 13:18:35 +01:00
omar
fe2972e8b2 Merge pull request #420 from RaptorFactor/master
Examples: DX11: Compile shaders with lower features levels.
2015-11-30 19:36:06 +00:00
Joshua Boyce
6adf644448 Allow DX11 renderer to be used with devices with lower feature levels. 2015-12-01 05:08:30 +11:00
ocornut
1b7aee7b9d Examples: DX11: Remove debug flag (#415) 2015-11-30 10:22:46 +00:00
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.
2015-11-29 14:54:05 +00:00
ocornut
94ec3d534e Examples: Header comments. 2015-11-29 11:25:15 +00:00
ocornut
6800939e73 Examples: Header comments. 2015-11-29 11:19:30 +00:00
ocornut
5c52e9ec0d Examples: Clarified comments. Removed font merging example from comments. 2015-11-29 11:11:03 +00:00
ocornut
d673db3092 Examples: Added README into the Visual Studio solution to people are less likely to miss it. 2015-11-29 11:01:50 +00:00
ocornut
9735563b65 Additional comments for new users 2015-11-29 10:53:03 +00:00
zryan3
aa6cb32bd4 fixed text referencing GLFW library in SDL examples 2015-11-27 23:04:35 -07:00
ocornut
83e6cfbec0 Examples: DirectX9/11: Removed assumption about Unicode build in example main.cpp (#399) 2015-11-22 21:23:56 +00:00
ocornut
dc86a8a0bf Examples: OpenGL3: Fixed gl3w.c for Linux when compiled with C++ compiler (#411) 2015-11-22 17:16:55 +00:00
ocornut
38cfdafbaf Examples: SDL/OpenGL3: Added -ldl to Linux command-line (#411) 2015-11-22 17:09:03 +01:00
ocornut
e2ecc02e02 Examples: Updated README 2015-11-16 22:17:10 +01:00
ocornut
899cb3b4e9 Examples: SDL+OpenGL3: Fixed readme (#356) 2015-11-16 22:13:06 +01:00
ocornut
ab7e91b65e Examples: SDL+OpenGL3: Various fixes to example to make it matches current GL3 example (#356) 2015-11-16 22:12:18 +01:00
ocornut
9d0caa2e66 Examples: SDL+OpenGL3: Using glew like existing example + renaming (#356) 2015-11-16 22:05:22 +01:00
ocornut
624adb1b23 Tweak build batch files and readmes 2015-11-16 22:03:13 +01:00
ocornut
9a8cbf128d Merge branch 'SDL_OpenGL3_Implementation' of https://github.com/zach2good/imgui into zach2good-SDL_OpenGL3_Implementation 2015-11-16 21:35:49 +01:00
ocornut
f87deff0f3 Moving stdlib.h include outside of imgui.h (#405) 2015-11-13 17:08:54 +01:00
ocornut
3b2fdf27a8 Examples: Added /Zi (output debug information) in build_win32.bat files 2015-11-11 09:45:18 +00:00
ocornut
1d76890526 Examples: OpenGL3: Implement ImGui_ImplGlfwGL3_InvalidateDeviceObjects() like other examples. 2015-11-08 22:52:25 +00:00
ocornut
e46c7b70eb Examples: Most examples apps detect if ImDrawIdx was changed to 32-bits instead of 16 2015-11-08 11:00:31 +00:00
ocornut
0a23e2c832 Tabs to spaces 2015-10-30 15:57:03 +01:00
ocornut
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
ocornut
e858d229a0 Examples: update all examples with same comment (#389) 2015-10-30 10:45:16 +01:00
Doug Binks
e1bc0dd7d5 Font merge demo and documentation minor additions.
Clarifies the lifetime requirements for the ranges parameter for AddFont* functions.
2015-10-25 16:06:42 +00:00
Gargaj
e4d916a4b3 NULL out font texture on invalidate
If this isn't done, NewFrame won't re-create the font.
2015-10-18 19:05:04 +02:00
ocornut
2b3fb5c0f7 Example: Marmalade: shallow tweaks and cleanups to match ImGui coding style (#375) 2015-10-15 12:44:30 +02:00
gzito
ba9c469ff0 no message 2015-10-14 23:13:02 +02:00
gzito
ebf4f1fa02 no message 2015-10-14 23:05:01 +02:00
gzito
79ca203850 Merge branch 'master' of https://github.com/ocornut/imgui 2015-10-14 23:01:52 +02:00
ocornut
5d53f37a5d Examples: Possibly clarified the intent of imgui_impl_* files. 2015-10-13 17:53:43 +02:00
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.
2015-10-11 16:42:22 -07:00
gzito
50b25b6c75 Added example for the Marmalade platform 2015-10-08 22:38:37 +02:00
ocornut
a77e534ded Examples: OpenGL2: Add msys2/mingw64 target (#361) 2015-10-08 20:48:50 +02:00
radius
a465b2b3d8 add msys2/mingw64 target 2015-10-04 15:14:35 -05:00
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. 2015-09-30 15:12:00 +01:00
ocornut
963f6b782d Examples: OpenGL3: saving more of blend state (#347) 2015-09-27 22:21:11 +02:00
ocornut
d5502cdd6d Examples: OpenGL3: Saving/restoring the Enable state, better than nothing (#347) 2015-09-23 09:14:27 +02:00
ocornut
25b4b88a7a Examples: Update readme. 2015-09-10 21:10:01 +01:00
ocornut
ad4c962224 Examples: DirectX11: Fixed batch file for VS 2012+, still works for 2008/2010.. Include path order matters... 2015-09-10 20:58:43 +01:00
ocornut
853f265025 Examples: Added batch files to build Windows examples with VS 2015-09-10 20:34:06 +01:00
ocornut
167c02d502 Better Git ignore list for quick compilations in same folder 2015-09-10 20:09:29 +01:00
ocornut
1793c1a991 Comments 2015-09-09 14:15:17 +01:00
ocornut
7d6ddbe5c8 Examples: comment on setting the RenderDrawListsFn function. 2015-09-07 14:58:26 +01:00
ocornut
77bcb7152b Examples: DirectX11: fixed vertex shader which breaks with VS2015 somehow (DX11 version?) (#313) 2015-09-01 10:47:36 +01:00
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.
2015-08-29 17:44:52 +01:00
ocornut
da807e55ea Examples: Ignore list a little more friendly to Unix systems. 2015-08-28 16:03:05 +01:00
ocornut
5ebd61f89c Ignore list a little more friendly to Unix systems 2015-08-28 15:55:22 +01:00
ocornut
e58f99179a Examples: OpenGL: fix for retina screens + io.DisplayFramebufferScale storage (#287) 2015-08-27 19:51:02 +01:00
ocornut
62671ef96e Examples: update readme 2015-08-25 22:14:31 +01:00
ocornut
822eaf1751 Examples: DX9, DX11: mapping missing middle mouse button. 2015-08-25 16:54:47 +01:00
ocornut
9a0650dbd0 Examples: imgui_impl* functions declared with IMGUI_API to ease copy & pasting into projects using DLL 2015-08-24 14:02:51 +02:00
yinjimmy
01a17aa78e fix ios compile error 2015-08-23 08:03:21 +08:00
ocornut
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
ocornut
d80869189a Examples: GLFW: using glfwSetCharModsCallback() to ensure characters aren't passed when using mods (fix #279) 2015-08-20 22:32:07 +01:00
Andres Vahter
ccbc72e98b add mac os x build instructions for sdl_opengl_example 2015-08-18 10:16:16 +03:00
ocornut
215747635d Examples: DirectX11: resizing buffers dynamically (#299) 2015-08-13 23:13:20 -06:00
ocornut
c016f6c171 Examples: DirectX9: tweaks. 2015-08-13 23:07:53 -06:00
ocornut
698c7cae85 Examples: DirectX9: resizing vertex and index buffers dynamically (#299) 2015-08-13 23:06:11 -06:00
Thomas Pöchtrager
3604aecf8f Minor Windows adjustments 2015-08-09 17:24:10 +02:00
Thomas Pöchtrager
947cf3434f Added printf attribute to printf like text formatting functions 2015-08-08 19:29:11 +02:00
ocornut
470200ee5c Update documentation 2015-08-05 21:59:07 -06:00
ocornut
85dab1a680 Fixed documentation 2015-08-05 19:19:12 -06:00
ocornut
8be4d41540 Merge remote-tracking branch 'origin' into 2015-07-cleanup 2015-08-05 09:32:29 -06:00
Chris Maughan
d667de9490 Clear font texture view to ensure Release() doesn't get called twice 2015-08-04 14:22:05 +01:00
ocornut
e099798c97 Merge remote-tracking branch 'origin' into 2015-07-cleanup 2015-08-01 22:12:51 -06:00
ocornut
11d91a27a4 Carriage return (#289) 2015-08-01 17:18:01 -06:00
Jonathan Adamczewski
f158617551 Show SDL error message on init failure 2015-08-02 01:35:43 -07:00
ocornut
52a74701f5 Updated projects to reference new files (#219)
Didn't update iOS example (#247)
2015-07-21 17:04:03 -06:00
ocornut
0eb196d544 Examples: OpenGL3: simplified code using glBufferData for vertices as well (#277, #278) 2015-07-19 10:52:51 -06:00
ocornut
dc1cb9e625 Tweak 2015-07-19 10:49:56 -06:00
Nik Voss
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
omar
98047b1b65 Update README.txt 2015-07-16 14:28:16 -06:00
omar
f53d5da0f8 Update README.txt 2015-07-16 14:27:35 -06:00
Daniel Gibson
b7d1b91e4b Use ImGuiIO::AddInputCharactersUTF8() in SDL2 example
Now Unicode text input works in this example.
2015-07-16 05:16:22 +02:00
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.
2015-07-16 03:54:44 +02:00
ocornut
4842ac3bc6 Fonts: added Cousine-Regular.ttf 2015-07-15 14:56:29 -06:00
ocornut
0224d29a35 Examples: comments. 2015-07-15 09:05:17 -06:00
ocornut
fcec337061 Examples: Simplified font examples comments. 2015-07-15 07:05:34 -06:00
ocornut
fd44b9440b Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	imgui.cpp
2015-07-10 21:45:25 -06:00
ocornut
f2bed00d80 Examples: README 2015-07-09 08:39:44 -06:00
ocornut
5ab23ab1c0 Allegro 5 example: removed public domain mark, MIT as the rest, with @bggd approval 2015-07-08 17:25:56 -06:00
ocornut
2f574ef952 Allegro 5 example: converted for indexed rendering. 2015-07-08 12:55:40 -06:00
ocornut
60dd221737 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-07-08 12:49:18 -06:00
ocornut
bbaaab7537 Allegro 5 example: fixed uv coordinate of non-default texture. 2015-07-08 12:41:09 -06:00
ocornut
4d2d0ce5cd Allegro 5 example: handling of hardware and software mouse cursor rendering. 2015-07-08 12:16:50 -06:00
ocornut
8db229b96f Allegro 5 example: fixed key modifiers, keyboard input, clipping, added pagedown/pageup. 2015-07-08 12:04:13 -06:00
ocornut
c58d61dfd1 Allegro 5 example: formatting, match other example structure, fixed mouse buttons. 2015-07-08 11:53:30 -06:00
ocornut
489e28ec11 Allegro 5 example: main.cpp matches other examples. added window title. 2015-07-08 11:46:18 -06:00
ocornut
1845ff4690 SDL example: tweaks (#233 #226) 2015-07-08 11:42:43 -06:00
ocornut
19e3c1506f Allegro5 example: added example from https://github.com/bggd/a5imgui_example 2015-07-08 11:34:36 -06:00