Cool_Tools/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2024-11-15 03:27:45 +01:00
Code Releases Wiki Activity
3,414 Commits 9 Branches 125 Tags 119 MiB
4c90529c62
Commit Graph

182 Commits

Author SHA1 Message Date
ocornut
ad7f600e0d Examples: DirectX9/11: hide os curosr if ImGui is drawing it (#155) 2015-05-01 11:25:15 +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
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
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
Dale Kim
4b7be31197 Fixed modifier key state setting in GLFW callbacks. 2015-04-03 09:01:48 -05:00
ocornut
d25578efd8 Examples: initializing float + missing comment. 2015-04-03 12:11:41 +01:00
ocornut
3abfb85613 Comments on font loading, fixed commented out paths and added DroidSans in the list 2015-03-28 11:48:42 +00:00
ocornut
ed94edfd8e Examples: Terser code + added commented out glUseProgram(0( suggestion in OpenGL2 sample. 2015-03-22 14:14:23 +00:00
Adam D. Moss
c1766c95ed OpenGL/GLFW: hide system cursor if imgui is soft-rendering cursor 2015-03-22 13:49:36 +00:00
biller23
2f4271a2b3 typo ImGui_ImplGlfwGL3_KeyCallback() 2015-03-18 21:02:29 +01:00
ocornut
cb285c4d35 Examples: uses SetNextWindowPos/SetNextWindowSize when applicable 2015-03-16 11:53:36 +00:00
ocornut
04358c301e Removed extraneous spaces 2015-03-16 11:49:18 +00:00
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. 2015-03-16 10:47:14 +00:00
ocornut
06fbeed41a Examples: Fixed Makefile 2015-03-14 11:29:09 +00:00
ocornut
55edd522c2 Examples: Fixed Makefile 2015-03-14 11:24:53 +00:00
ocornut
7c9bd71512 Examples: MSVC: increase warning level from /W3 to /W4 for OpenGL examples 2015-03-14 10:41:42 +00:00
ocornut
e2c4ba21bc Examples: Added 64-bit projects for MSVC 2015-03-14 10:09:53 +00:00
ocornut
ef957b7878 Examples: Moved GLFW/GL3W to a common libs/ folder 2015-03-14 10:04:30 +00:00
ocornut
834085c90c Examples: Updated to GLFW 3.1 2015-03-14 10:00:11 +00:00
ocornut
0911526424 Added io.KeyAlt + support in examples apps 
Currently unused but supported by sample so that more people will have
it set up when menus needs them
 2015-03-13 09:49:38 +00:00
ocornut
d5b7b8398f Examples: reference implementations honors drawlist user callbacks. 2015-03-09 15:26:58 +00:00
ocornut
5879f3f5ac Examples: OpenGL 2/3 examples cleanup to match DirectX9/11 structure. 2015-03-09 15:02:22 +00:00
ocornut
567184dc9f Examples: Clang warning fix. 2015-03-09 13:38:23 +00:00
ocornut
3f86554457 Examples: Makefile fixes. 2015-03-09 13:22:32 +00:00
ocornut
2dd92e3eed Examples: Clang/Linux warning fixes. 2015-03-09 13:08:27 +00:00
ocornut
a3f3793cb6 Examples: Tweaks. 2015-03-09 13:05:18 +00:00
ocornut
b87ec205a9 Examples: shallow tweaks to match upcoming other examples. 2015-03-09 13:02:32 +00:00
ocornut
b227b0f8cd Examples: Rename globals again 2015-03-09 12:16:29 +00:00
ocornut
4f27bd6ed3 Examples: Moved gl3w to opengl3_example directory + fixed msvc project paths 2015-03-09 12:11:24 +00:00
ocornut
4da432bd7b Examples: Makefile 2015-03-09 12:03:09 +00:00
ocornut
99ed567577 Examples: Rename global to be more consistent 2015-03-09 12:02:34 +00:00
ocornut
d829852391 Examples: Refactored opengl3_exapmle into a glfw specific file that can be copied and pasted 2015-03-09 11:59:23 +00:00
ocornut
545a57d253 Examples: Refactored opengl_example into a glfw specific file that can be copied and pasted. 
Other examples will follow.
 2015-03-09 11:25:15 +00:00
ocornut
be9fe9489c Examples: DirectX examples uses WM_KEYDOWN/WM_KEYUP 
Fixes pressing Enter in IME being caught by application right after
validating an IME input.
 2015-03-06 21:39:55 +00:00
ocornut
e269125c3a Windows: setup a default handler for ImeSetInputScreenPosFn so IME (Japanese/Chinese) inputs are positioned correctly. 
User need to set io.ImeWindowHandle
 2015-03-06 21:11:14 +00:00
ocornut
386cfada83 Examples: Windows examples don't link with imm32.lib by default. 2015-03-06 18:19:21 +00:00
ocornut
b911f96a56 Examples: Speculative Makefile fix. I should get a Linux box instead on relying on Jenkins, this is pretty embarrassing. 2015-02-27 11:19:50 +00:00
ocornut
dc7cdb3025 Examples: Fix Makefile 2015-02-27 11:07:23 +00:00
ocornut
5aaf0cd2dc Examples: Fix OpenGL3 example Makefile 2015-02-27 11:00:31 +00:00
ocornut
3ed38f3313 Replaced dependency on glew (inc. prebuilt one for Windows) by gl3w in source form 
Expecting something to break now.
 2015-02-27 10:53:17 +00:00
ocornut
00270b837f Examples: Desperate attempts removing link warnings under Windows. Screw standard librairies. 2015-02-27 10:14:20 +00:00
ocornut
40b04a3701 Renamed ImGuiSetCondition_*** to ImGuiSetCond_*** and ImGuiCondition_FirstUseThisSession to ImGuiCond_Once 2015-02-27 09:51:11 +00:00
ocornut
9c4972ee9d Examples: msvc: output .exe in project directory (not in solution directory). 2015-02-24 10:06:13 +00:00
ocornut
0d63e0ce60 Examples: DirectX examples applications all have a Console for debugging. 2015-02-22 13:45:07 +00:00
ocornut
cb0a4db048 Calculate frame-rate for the user, as a purely luxurious feature 
..and to reduce sample code size a little.
 2015-02-11 18:28:17 +00:00
ocornut
d65e051a07 Minor formatting tweaks, comments 2015-02-11 18:14:39 +00:00
ocornut
381c7428c1 Examples: changed default background color. 2015-01-31 20:08:43 +00:00
ocornut
edcf2d3bf6 Examples: more comments on loading fonts. 2015-01-18 11:38:14 +00:00
ocornut
1916a0c78c Renamed FontAtlas to Fonts. Further cleanup/comments. 2015-01-18 10:46:49 +00:00
ocornut
2c31599bcc ImFontAtlas allows loading multiple fonts into same texture. Revamped new init API for 1.30 2015-01-17 22:15:29 +00:00
ocornut
cb9a3235be Removed PixelCenterOffset, uncesssary 2015-01-17 17:17:18 +00:00
ocornut
ab8d2782c6 Merge remote-tracking branch 'upstream/master' into 2015-01-truetype 
Conflicts:
	imgui.cpp
	imgui.h
 2015-01-15 18:07:44 +00:00
ocornut
62ecdd21a5 Examples: Added a color slider for the background color + tweak first example use of button.s 2015-01-15 09:59:18 +00:00
ocornut
0f4d74d614 ImFont::GetTextureData API allow to retrieve 8/32 bits data + lazily load defaults font 
Examples: OpenGL3 and DirectX11 back to using 32-bits texture solely for
ease of integration.
 2015-01-11 21:06:57 +00:00
ocornut
241e8086fa Mde it optional to new() io.Font - however it stills needs to be loaded. 2015-01-11 18:27:05 +00:00
ocornut
51df5874a6 Examples' Says "OpenGL2" vs "OpenGL3" in title bar. 2015-01-11 18:03:40 +00:00
ocornut
a09f426b89 TAB to spaces 2015-01-11 17:56:43 +00:00
ocornut
5ca563b5a5 Speculative fix for warnings for GCC/Clang 2015-01-11 17:22:04 +00:00
ocornut
20bb6270bc Examples: all supports TextureID in renderer, added LoadFontTexture() function. 2015-01-11 17:17:43 +00:00
ocornut
b3a208901a Loading TTF file with stb_truetype. Broke setup API slightly. Font baked, packed with space for custom data. Embeds compressed ProggyClean. 2015-01-08 23:35:01 +00:00
ocornut
c1251d2994 Examples: Fixed warnings for Clang 2015-01-06 17:43:23 +00:00
ocornut
1c657564ac Examples: Added STB_IMAGE_STATIC in examples to avoid conflicting implementation. Relate to #109 2015-01-06 17:35:36 +00:00
ocornut
b3febabc30 OpenGL3 example: fix growing of VBO 2014-12-22 01:47:34 +00:00
omar
e9e0e36f98 New and better Set[Next]Window(Pos|Size|Collapsed) API. 
Removed rarely useful SetNewWindowDefaultPos() in favor of new API.
 2014-12-10 19:22:30 +00:00
omar
09bacfbe18 OpenGL example: allow resizing window. 2014-12-10 15:27:40 +00:00
omar
6523fb263d OpenGL3 example: fixed mouse handling. 2014-12-08 17:15:08 +00:00
ocornut
987188d437 Fix Clang warning with offsetof() macro? Added -Wall in OpenGL 3 example. 2014-12-07 09:58:45 +00:00
ocornut
036ed3ea93 OpenGL3 example: unregistered mouse callback for mouse click-release faster than frame interval. 2014-12-06 20:43:08 +00:00
omar
2e5b81627f Examples: DirectX11: moved shader to be close to its usage location, 2014-12-03 18:46:13 +00:00
omar
52b5376d9b Examples: OpenGL3: cleaned up to match features of OpenGL2 example 2014-12-03 18:40:28 +00:00
omar
b02eed3e49 Examples: adding title to the top of each examples. Cleaning up file headers. 2014-12-03 18:29:46 +00:00
omar
6c9edb6db0 Examples: removed LICENSE file from MSVC project. 2014-12-03 18:19:05 +00:00
Olivier Chatry
2f176033c6 fixed indentation mix, removed some unused code, updated different callback using the example_opengl code. 2014-12-03 19:11:23 +01:00
Olivier Chatry
a8d2bc69ed added opengl3 sample, mix from @ocornut and @thelinked 2014-12-03 18:37:07 +01:00