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

229 Commits

Author SHA1 Message Date
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
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.
 2015-04-07 19:36:58 +08:00
omar
46769406dc Update README.txt 2015-04-07 10:59:49 +01:00
ocornut
73e2d56acc Examples: OpenGL fixed-pipeline: added glBindTexture(0), via Anton M 2015-04-06 10:45:10 +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
d3e444dfd9 Examples: DirectX9: fixed duplicate creation of vertex buffer. Size of static vertex buffer at top of the code. 2015-03-16 10:02:10 +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
e97d02a294 Examples: Fixed Clang warnings in DirectX examples 2015-03-14 10:49:26 +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
2b0acc128c Examples: MSVC: increase warning level from /W3 to /W4 for DirectX examples 2015-03-14 10:32:29 +00:00
ocornut
8e0f04638d Examples: Fix includes order to avoid conflicts between DXSDK_DIR and Windows SDK 2015-03-14 10:24:35 +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
db5fc8a265 Examples: README direct the user to the opengl_example 2015-03-09 15:09:24 +00:00
ocornut
5879f3f5ac Examples: OpenGL 2/3 examples cleanup to match DirectX9/11 structure. 2015-03-09 15:02:22 +00:00
ocornut
f9c833b4a5 Examples: DirectX9 example cleanup to match DirectX11 structure. 2015-03-09 14:55:46 +00:00
ocornut
66a5837ba8 Examples: DirectX11 example application handles window resizing. 2015-03-09 14:51:10 +00:00
ocornut
866fa95aaa Examples: DirectX9 example application handle window resizing. 2015-03-09 14:13:29 +00:00
ocornut
25765e4bfc Examples: Fixed readme file. 2015-03-09 13:49:52 +00:00
ocornut
b4165c43ff Examples: Refactored directx11_example to be easier to copy & paste into user application. 2015-03-09 13:45:23 +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
7397425097 Examples: Refactored directx9_example to be eaasier to copy & paste into user application. 2015-03-09 13:03:46 +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
37d8d5c5be Examples: OpenGL2 example doesn't need Glew 2015-02-27 10:05:06 +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
fc322fde0f Examples: added README file 2015-02-24 09:59:56 +00:00
ocornut
546460cd26 Examples: Removed unused file 2015-02-24 09:49:26 +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
b623f97d9f Examples: DirectX11: fixed build setting of Release mode. 2015-02-01 09:33:51 +00:00
ocornut
35c0842bcf Examples: DirectX11: fixed handling of unicode character inputs. 2015-01-31 23:26:53 +00:00
ocornut
5834297928 Examples: DirectX11: increasing vertex buffer size (would really need a dynamic buffer size) 
+ Delete unused code
 2015-01-31 21:12:59 +00:00
ocornut
381c7428c1 Examples: changed default background color. 2015-01-31 20:08:43 +00:00
ocornut
b24d4d0538 Ignore lists 2015-01-20 01:04:34 +01:00
ocornut
b0eac255ca Warning fixes for 64-bit architectures 2015-01-20 01:01:25 +01: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
43c8b5e0d2 Examples: DirectX11: use linear sampler to be in sync with other examples. 2015-01-17 16:52:21 +00:00