Commit graph

241 commits

Author SHA1 Message Date
Branimir Karadžić
9e34736c49 Moved ocornut-imgui from ProDBG source to examples-common. 2015-01-16 22:41:37 -08:00
Branimir Karadžić
649d7f74d2 Updated copyright year. 2015-01-02 14:43:11 -08:00
Branimir Karadžić
c25dd466be Updated copyright year. 2015-01-01 15:04:46 -08:00
Dario Manesku
5c77bc941f Changed imguiTabs() active color to be consistent with imguiButton(). 2014-12-29 08:48:43 +01:00
Dario Manesku
7b03d93336 Added 1px offset to imguiBorderButton() to fix DX9 drawing problem. 2014-12-29 08:48:43 +01:00
Dario Manesku
528756610b Added imguiGetWidgetW(). 2014-12-24 02:34:06 +01:00
Dario Manesku
67c69d3ba2 Fixing scissor for nvg elements. 2014-12-24 02:34:05 +01:00
Dario Manesku
6ad5c8eb2c Preventing mouse scroll multiple areas at once and scroll bar scissor problem fixed. 2014-12-14 03:02:32 +01:00
Dario Manesku
a9a2895132 Added 1px to scissor area. 2014-12-14 03:02:31 +01:00
Dario Manesku
815312466c Draging scroll bars with mouse now behaves more properly. 2014-12-14 03:02:31 +01:00
Dario Manesku
f448f18ae4 Removed code duplication by merging drawRect() and drawRoundedRect(). 2014-12-14 03:02:31 +01:00
Branimir Karadžić
878cbd41bd shaderc: Added shader strip. 2014-12-05 20:28:15 -08:00
Branimir Karadzic
38f340b540 Fixed issue #197. 2014-12-01 08:21:13 -08:00
Dario Manesku
8777b44e59 NVG now flushes on imguiEndArea(). 2014-11-23 01:17:51 +01:00
Dario Manesku
eb2fd71664 Added imguiSetCurrentScissor(). 2014-11-23 01:07:58 +01:00
Dario Manesku
116f2179a4 Adding _size parameter for imguiColorWheel. 2014-11-23 00:44:38 +01:00
Dario Manesku
5c5464c381 Making imguiTabs look better when disabled. 2014-11-23 00:13:38 +01:00
Dario Manesku
07b9760583 Turning on nvg scissor in imguiScroll. 2014-11-23 00:12:31 +01:00
Dario Manesku
0d19fe5750 Making imguiCollapse more aesthetically pleasing. 2014-11-22 21:11:31 +01:00
Dario Manesku
1e2bdaf13a Making imguiImageChannel properly handle newly introduced _enabled parameter. 2014-11-22 20:26:34 +01:00
Dario Manesku
dd06ab01e1 Added _enabled parameter for imguiImage. 2014-11-22 19:51:20 +01:00
Dario Manesku
e126781412 Making imgui scroll behave properly. 2014-11-22 19:51:19 +01:00
Dario Manesku
b9bd605edc Added overload for imguiTabs() and fixed va_arg warning. 2014-11-20 18:43:27 +01:00
Dario Manesku
950ceee749 Fixing drawing problem. 2014-11-20 18:25:22 +01:00
Branimir Karadzic
00d5f1adcb Fixed clang warning. 2014-11-19 21:07:32 -08:00
Dario Manesku
7d2ef49435 Changed imguiTabs() api. Now you can set additional 'enabled' flag per tab. 2014-11-19 16:21:02 +01:00
Branimir Karadžić
ff44d73480 Updated NanoVG and Blendish. 2014-11-16 18:59:17 -08:00
Dario Manesku
8e578b3d37 Fixing imgui mouse scroll. 2014-11-14 11:27:17 +01:00
Dario Manesku
c7bd2c5e67 Making imguiCube() align better. 2014-11-10 22:36:38 +01:00
Dario Manesku
be0ec20d79 Cleanup. 2014-11-10 22:36:37 +01:00
Dario Manesku
ea4d52ff46 Added click event for imguiImage(). 2014-11-10 22:36:36 +01:00
Dario Manesku
9605583491 Collapse switch for imguiColorWheel() is now always enabeld. 2014-11-10 22:36:36 +01:00
Branimir Karadžić
31efb2991f Updated to OVR 0.4.3. Added support for event char to read keyboard text input. 2014-11-08 20:57:47 -08:00
Branimir Karadžić
3576434c2b Fixed cubemap shader. 2014-11-03 22:52:36 -08:00
Branimir Karadžić
c400562d61 HMD fixes. 2014-11-03 19:11:08 -08:00
Branimir Karadžić
62abe9db5e Cleanup. 2014-10-25 19:16:24 -07:00
Branimir Karadzic
7a829583ce Removed _USE_MATH_DEFINES. 2014-10-23 21:10:44 -07:00
Branimir Karadžić
4a1a31b538 Updated glsl-optimizer. 2014-10-11 12:32:43 -07:00
Branimir Karadžić
7dd004b82b NaCl: Fixed compile error due to quad define in sys/types.h. 2014-10-10 23:36:03 -07:00
Dario Manesku
d25990487e Added return value for imguiCube(). 2014-10-06 07:25:31 +02:00
Branimir Karadžić
cc16fa3aa3 Fixed imguiCube scissor. 2014-10-04 18:11:10 -07:00
Branimir Karadžić
c9614914fd Rebuilt imgui cubemap shader. 2014-10-03 20:07:38 -07:00
Branimir Karadzic
51268e11a0 Added lod to imgui cubemap shader. 2014-10-03 14:19:39 -07:00
Branimir Karadžić
096f9d2bf9 Cleanup. 2014-10-02 21:35:32 -07:00
Branimir Karadžić
e037b7cc7b Added missing shader. 2014-10-02 21:29:14 -07:00
Dario Manesku
45a54db6f5 Added imguiCube(). 2014-10-03 05:32:22 +02:00
Dario Manesku
9a42955f6e Added _originBottomLeft parameter for imguiImage(). 2014-09-27 20:43:28 +02:00
Dario Manesku
651b5b6fb5 Reordering imgui functions. 2014-09-27 20:43:27 +02:00
Dario Manesku
60f3b73d01 Fixing scroll bug that was introduced with the previous imgui commit. 2014-09-21 12:28:11 +02:00
Dario Manesku
3a1b16f8a5 Major imgui update. Imgui area and scroll are now separated. Also there are other minor aditions and improvements. 2014-09-20 21:39:12 +02:00
Branimir Karadžić
eec4ae9847 Fixing paths. 2014-09-10 21:48:08 -07:00
Branimir Karadžić
66890595b9 Added serialization for vertex decl attribute enums. Binary format changes. Rebuilt all meshes and shaders. 2014-08-17 17:20:15 -07:00
bkaradzic
c56b7ad261 Fixed GCC warnings. 2014-08-15 19:14:17 -07:00
bkaradzic
3e6605a2c5 Cleanup. 2014-08-15 15:03:17 -07:00
Branimir Karadžić
20906bda03 Replaced embedded missing texture with procedural texture. 2014-08-13 19:48:58 -07:00
Dario Manesku
ef4c57b7a9 Added macro definitions for imguiTabs() parameters. 2014-08-12 22:04:56 +01:00
Dario Manesku
63d7db800c Added imgui getters for widgetX and widgetY. 2014-08-12 21:41:24 +01:00
Dario Manesku
2701efa60a Reverting back imguiLabel() spacing parameters. 2014-08-12 21:22:23 +01:00
Dario Manesku
b5abdcb24b Tuning up imguiInput(). 2014-08-12 21:22:23 +01:00
Dario Manesku
83587d51d0 Draw parameters fixup for imguiTabs(). 2014-08-12 21:22:23 +01:00
Dario Manesku
e4a067efe6 Fixing border pixel scissor. 2014-08-12 21:22:22 +01:00
Dario Manesku
f3fb007471 Fixed imgui scroll value handling on window resize. 2014-08-12 21:22:22 +01:00
Dario Manesku
7225bba1a1 Tuning imgui spacing parameters. 2014-08-12 21:22:21 +01:00
Dario Manesku
677ef2d6c5 Exposing optional imguiButton() color parameter. 2014-08-12 21:22:21 +01:00
Dario Manesku
d64a62866a Imgui scroll fix for variable scrollable area height. 2014-08-12 21:22:20 +01:00
Dario Manesku
9715d6fab4 Added macro constants for default imgui parameters. 2014-08-12 21:22:20 +01:00
Dario Manesku
3f25e22df2 Removed imguiImageSwizzle() and added imguiImageChannel(). 2014-08-12 21:22:20 +01:00
Dario Manesku
6e69a02906 Added optional parameter for imguiInput(). 2014-08-12 21:18:53 +01:00
Dario Manesku
4501e17f4b Added optional parameter for imguiEndScrollArea(). 2014-08-12 21:18:52 +01:00
Dario Manesku
762c423b42 Added optional parameter for imguiButton(). 2014-08-12 21:18:52 +01:00
Dario Manesku
c2b0ee89cb Reordering imguiBeginScrollArea() parameters. 2014-08-12 21:18:52 +01:00
Dario Manesku
06d6176392 Added overload for imguiTabs() with look customization parameters. 2014-08-12 21:18:51 +01:00
Dario Manesku
fcc642483f Added imguiLabel() overload. 2014-08-12 21:18:51 +01:00
Dario Manesku
0c7dea6cb3 Minor imgui fixes. 2014-08-12 21:18:50 +01:00
Dario Manesku
6388d1a657 Added optional _r (corner radius) parameter for imguiBeginScrollArea(). 2014-08-12 21:18:50 +01:00
Dario Manesku
a7cc06499b Fine tuning imguiScrollArea sizes. 2014-08-12 21:18:50 +01:00
Dario Manesku
20f09a01a9 Fixing imguiTabs() indentation problem. 2014-08-12 21:18:49 +01:00
Dario Manesku
b18e29a930 Added optional parameters for imguiIndent(). 2014-08-12 21:18:49 +01:00
Branimir Karadžić
c89c5d2ca9 Cleanup. 2014-08-11 22:02:46 -07:00
Branimir Karadžić
376668a4b6 Rebuilt shaders. 2014-08-11 20:36:42 -07:00
Branimir Karadžić
91715c7b06 Cleanup. 2014-08-10 12:17:34 -07:00
Dario Manesku
1c16d97c27 Fixing imgui scroll area scissoring. 2014-08-10 16:53:14 +01:00
Dario Manesku
9f31587b09 Added optional _height param for imguiSeparator() and imguiSeparatorLine(). 2014-08-10 16:53:13 +01:00
Dario Manesku
b9af3544ad Added imguiTabs(). 2014-08-10 16:53:13 +01:00
Dario Manesku
6e3f21f062 Added imguiBorderButton(). 2014-08-10 16:53:12 +01:00
Dario Manesku
1f884a588e Added imguiImageSwizzle(). 2014-08-10 16:53:12 +01:00
Dario Manesku
1391939151 Fixed drawText() to handle NULL or empty string. 2014-08-10 16:53:11 +01:00
Dario Manesku
52afe0f433 Using imguiCollapse instead of imguiButton for imguiColorWheel. 2014-08-10 16:53:11 +01:00
Branimir Karadzic
c94e5122d6 Fixed GCC warning. 2014-08-06 09:47:12 -07:00
Dario Manesku
5b49aea07a Unused local variable problem fixed. 2014-08-06 04:20:40 +01:00
Branimir Karadžić
d536bb8c72 Fixed compile error. 2014-08-05 19:46:40 -07:00
Dario Manesku
0baa2d46e6 Cleanup. 2014-08-06 01:50:22 +01:00
Dario Manesku
c143dba942 Added imguiInput(). 2014-08-06 01:50:22 +01:00
Branimir Karadžić
e782f2f873 Fixed preprocessor bug that trucnates macro arguments to first character when concatenating them. 2014-07-28 20:15:01 -07:00
bkaradzic
2b2c7857e8 Updated README. 2014-07-26 12:46:32 -07:00
Branimir Karadžić
2db00e3351 DX9: Fixed texture lod. 2014-07-12 16:41:51 -07:00
Dario Manesku
81c3875b9a Added create/set font for imgui. 2014-07-12 11:25:41 +01:00
Dario Manesku
ba8bdc572b Added lod parameter for imguiImage(). 2014-07-12 10:18:49 +01:00
Dario Manesku
76ea9ca61c Cleanup. 2014-07-07 22:23:17 +01:00
Dario Manesku
dde03c6bee Added _enabled param for imguiBeginScrollArea(). 2014-07-07 20:53:36 +01:00
Dario Manesku
ef7289c0a6 Changed imguiImage() default _align param. 2014-07-07 20:53:35 +01:00
Dario Manesku
4957d23322 Added other alignment options for imguiImage(). 2014-07-05 04:33:00 +01:00
Branimir Karadžić
bbdd156e3e Cleanup. 2014-07-04 21:03:43 -07:00
Dario Manesku
44b84ab800 Added ImguiImageAlign::CenterIndented. 2014-07-05 01:50:11 +01:00
Dario Manesku
7c4d69b0a1 Added imguiImage(). 2014-07-05 01:10:49 +01:00
Branimir Karadžić
b610a10217 Cleanup. 2014-06-29 22:20:31 -07:00
Branimir Karadžić
2b147081c4 Changed imguiSlider argument. 2014-06-29 21:53:23 -07:00
Branimir Karadžić
f412b8bc90 IMGUI: Fixed scroll area scissor. 2014-06-28 18:17:30 -07:00
Branimir Karadžić
ddda9e29b0 Cleanup. 2014-06-28 17:22:11 -07:00
Branimir Karadžić
167ec3e1bc Cleanup. 2014-06-28 11:54:30 -07:00
Branimir Karadžić
167a6717c5 Cleanup. 2014-06-27 21:47:33 -07:00
Branimir Karadžić
24d54b972e Cleanup. 2014-06-23 20:08:08 -07:00
Dario Manesku
a64762de1d Cleanup. 2014-06-23 07:06:13 +01:00
Dario Manesku
fbe9ecce12 Added option for imguiColorWheel to respect or ignore indentation. 2014-06-23 06:52:49 +01:00
Dario Manesku
5084649832 Added imguiColorWheel(). 2014-06-23 06:34:42 +01:00
Dario Manesku
48cbaf20ce Fixed scrollbar in imgui. 2014-06-23 06:34:42 +01:00
Dario Manesku
8c815f2f95 Added imguiReserve(). 2014-06-23 06:34:41 +01:00
Branimir Karadžić
02e549bfec Moved fpumath to bx. 2014-05-26 19:31:37 -07:00
Branimir Karadžić
bba2ef8031 Added predefined uniforms for inverted view/proj/viewproj matrices.
shaderc: Added raw shader support.
shaderc: Fixed uniform types.
2014-05-10 20:51:54 -07:00
Branimir Karadžić
ac925b00c8 Cleanup. 2014-05-03 15:18:28 -07:00
Branimir Karadžić
bc36c29f2a Added ability to retrieve uniforms used by shader. 2014-04-15 19:10:56 -07:00
Branimir Karadžić
f436f79c10 Simplified API, removed difference between vertex and fragment shaders. 2014-03-29 19:42:57 -07:00
Branimir Karadžić
6afa55381a Updated glsl-optimizer. 2014-03-29 16:26:01 -07:00
Branimir Karadžić
72aa38a5fa Added 19-oit example. 2014-03-26 22:01:22 -07:00
Branimir Karadžić
5b87eece6f Added missing files. 2014-03-26 09:21:37 -07:00
Branimir Karadžić
771909c988 Fixed issue #74. 2014-02-13 22:13:19 -08:00
Branimir Karadžić
557dcef3dd Updated glsl-optimizer. 2014-02-10 23:06:13 -08:00
Branimir Karadžić
e7b42f13c6 Updated copyright year. 2014-02-10 22:18:39 -08:00
Branimir Karadžić
9ff1d0c513 Updated copyright year. 2014-02-10 22:07:04 -08:00
bkaradzic
2c05b90792 Embedded shaders and font into 17-drawstress. 2014-01-19 22:34:58 -08:00
bkaradzic
b5f1a4fcf9 Fixed Linux build. 2014-01-19 00:28:17 -08:00
bkaradzic
804bd01b01 Added imguiChoose function. 2014-01-18 20:07:00 -08:00
bkaradzic
0ed2edc7b3 Updated shaders and README. 2014-01-13 20:17:56 -08:00
bkaradzic
1f228a172b Increased BGFX_CONFIG_MAX_DRAW_CALLS to 64K. 2014-01-12 21:43:47 -08:00
bkaradzic
fab2ef534c Using language compliant header guards. 2013-11-14 19:10:10 -08:00
bkaradzic
f7fe163f2b Cleanup. 2013-08-06 21:04:28 -07:00
bkaradzic
bac2073b76 Added support for per primitive scissor. 2013-07-27 15:27:54 -07:00
bkaradzic
ea5201d07e Fixed imgui program leak. 2013-07-10 21:15:27 -07:00
bkaradzic
18f2e82362 Added include path to common. Renamed math to fpumath. 2013-05-23 22:07:54 -07:00
bkaradzic
047eca5829 Cleanup. 2013-04-24 23:42:20 -07:00
bkaradzic
6e374982be Added imgui. 2013-04-24 21:01:11 -07:00