Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-12-18 14:16:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,952 Commits 13 Branches 79 Tags 86 MiB
dadd03fc11
Commit Graph

299 Commits

Author SHA1 Message Date
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
ocornut
e49977a913 SDL example: hasty readme. 2015-07-08 11:08:58 -06:00
ocornut
d041ebc6d4 Merge branch '2015-03-antialiased-primitives' of https://github.com/ocornut/imgui into 2015-03-antialiased-primitives 2015-07-08 10:33:25 -06:00
ocornut
b7e63c163c SDL example: update for indexed rendering. 2015-07-08 10:32:55 -06:00
ocornut
b36ff2fec3 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-07-08 10:30:30 -06:00
omar
12aba576fb Merge pull request #264 from joeld42/antialias-ios-fix 
AA branch: iOS Example: update for API changes and index rendering
 2015-07-08 10:29:39 -06:00
ocornut
a14f6696a3 SDL example: more cleanup to match other examples (#233 #226) 2015-07-08 10:27:25 -06:00
ocornut
22e099366f SDL example: further cleanup to match other examples (#233 #226) 2015-07-08 10:20:08 -06:00
ocornut
4167528001 SDL example: moved event loop to main.cpp , adding page up/page down. (#226) 2015-07-08 10:10:54 -06:00
Joel Davis
81cebb9c85 Simplified to not combine vert buffers like the opengl3 example 2015-07-08 09:01:10 -07:00
ocornut
b7a2a6b23f SDL example: renamed folder, added in README 2015-07-08 09:49:32 -06:00
ocornut
b3ae2976c5 SDL example: tweaks and fixes. 2015-07-08 09:46:55 -06:00
ocornut
046dbf502c Merge branch 'SampleSDL2' of https://github.com/CedricGuillemet/imgui into CedricGuillemet-SampleSDL2 2015-07-08 09:01:04 -06:00
ocornut
e3b9a61883 Examples: OpenGL3: simplified code. Upload each vertex array separately. (cf #264) 2015-07-08 08:27:36 -06:00
Joel Davis
ca042134ae Update ios example for API changes and index rendering 2015-07-07 23:43:27 -07:00
ocornut
1cd391146d Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-07-07 21:48:28 -06:00
ocornut
7d144eb899 iOS Example: Optimise PNG files size 2015-07-07 21:37:50 -06:00
ocornut
fb27360ea8 iOS example: shallow tweaks and fixes (untested) 2015-07-07 21:35:09 -06:00
Joel Davis
eee6dab226 iOS example working based on modified OpenGL3 example + Synergy 2015-07-07 21:17:48 -06:00
ocornut
d03b046ef4 AA branch: Agressively renamed all fields of ImDrawList, ImDrawCmd, ImDrawData to match the rest of our coding convention (#133) 2015-07-07 20:17:07 -06:00
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
 2015-07-07 12:15:35 -06:00
ocornut
502e360ee5 Removed the majority of size_t from the code. ImVector<> now uses int. (#262) 
May trigger new compilation warnings?
 2015-07-07 12:09:25 -06:00
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.
 2015-07-06 21:09:05 -06:00
ocornut
b2b616be00 AA branch: ImDrawCmd idx_count -> elem_count 2015-07-05 22:09:15 -06:00
ocornut
f3303fa84f AA branch: io.RenderDrawListsFn signature changed to take ImDrawData, neater and future proof breaking of the render API (#133 #254) 2015-07-05 22:03:46 -06:00
ocornut
8b4a470e1d Examples: DirectX9: fixed size passed to vertex and index buffer Lock() + readjust default buffer sizes. 2015-07-05 19:24:26 -06:00
ocornut
61e551e0ee AA branch: fixed warning 2015-07-04 13:41:51 -06:00
ocornut
f435e42561 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 
Conflicts:
	examples/opengl_example/imgui_impl_glfw.cpp
 2015-07-04 12:44:25 -06:00
ocornut
7437b43b2d Fixed warnings for more pedantic settings (#258) 2015-07-03 08:15:56 -06:00
ocornut
b69d7d9df3 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-07-02 21:47:48 -06:00
ocornut
2f03511062 Added ImGuiKey_PageUp, ImGuiKey_PageDown for user. 2015-07-02 21:43:07 -06:00
ocornut
71e9f2a3dd Fixed warnings for 64-bits builds 2015-06-29 15:46:18 -06:00
Cedric Guillemet
2acdafe4f2 imgui_impl_sdl and main sample 2015-05-25 09:40:58 +02:00
ocornut
e3f2ad728a Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering 
Conflicts:
	examples/directx11_example/imgui_impl_dx11.cpp
 2015-05-21 22:57:29 +01:00
Gordon McShane
6ee65fc5af Add conditional compilation of forward compat. glfw window hint to fix crash on later versions of OSX 2015-05-18 18:26:16 -04:00
ocornut
b6f3c97e3b Examples: DirectX11: explicitly set rasterizer state. 2015-05-18 21:38:17 +01:00
ocornut
e9b6e437eb Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering 
Conflicts:
	imgui.cpp
	imgui.h
 2015-05-15 17:33:04 +01:00
ocornut
5df542c3c0 ImFontAtlas: doesn't clear input data, left to the application. (#224) 2015-05-12 15:16:12 +01:00
ocornut
f00662a5ad Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering 2015-05-02 22:20:48 +01:00
ocornut
ad7f600e0d Examples: DirectX9/11: hide os curosr if ImGui is drawing it (#155) 2015-05-01 11:25:15 +02:00
ocornut
18a00c7060 Examples: DirectX9/11: Fixed key mapping for down arrow. 2015-04-24 09:18:56 +02:00
ocornut
4f1acf0d4a Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering 
Conflicts:
	imgui.cpp
 2015-04-17 08:42:36 +01:00
ocornut
f400ea4ec8 Examples: OpenGL3: backup/restore current program and texture #195 2015-04-15 10:14:51 +01:00
Dale Kim
ac518a1d3e Set modifier key state by inspecting imgui's io.KeysDown array. 2015-04-14 14:09:26 -05:00
ocornut
43cb4038c6 Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering 
Conflicts:
	examples/directx11_example/imgui_impl_dx11.cpp
	imgui.cpp
 2015-04-14 09:51:28 +01:00
ocornut
71429d306e Examples: Simplified GLFW keyboard callbacks 2015-04-14 09:45:27 +01:00
ocornut
c735d3066b Merge branch 'master' of https://github.com/Roflraging/imgui into Roflraging-master 2015-04-14 09:37:10 +01:00
Dale Kim
fe15756129 Simplified glfw keyboard callbacks. 2015-04-13 20:04:53 -05:00
ocornut
d809abbe1c Examples: DirectX11: tidying up. 2015-04-09 23:32:36 +01:00
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
 2015-04-09 21:22:06 +01:00
ocornut
4f51b77937 Examples: OpenGL3: Tweaks (argh, github ui) 2015-04-09 21:19:21 +01:00
ocornut
90766141b3 Examples: OpenGL3: Tweaks. 2015-04-09 21:18:43 +01:00
ocornut
37f1715bfa Examples: DirectX11: Removed unnecessary vertices conversion and CUSTOMVERTEX types. 2015-04-09 21:14:52 +01:00
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 2015-04-09 21:05:35 +01:00
ocornut
d9ff617ff8 Examples: Formatting #187 2015-04-07 12:56:52 +01:00