Commit graph

642 commits

Author SHA1 Message Date
Branimir Karadžić
1f241e3cc1 Cleanup. 2015-05-14 19:05:59 -07:00
Branimir Karadžić
65ac7c33f5 Added png/jpg/tga/etc. to load texture utility function. 2015-05-13 22:54:52 -07:00
Dario Manesku
d21c75c40c Fixup for previous commit. 2015-05-03 16:20:41 +02:00
Dario Manesku
6efb223b49 Fixing SDL char input. 2015-05-03 15:52:40 +02:00
Branimir Karadžić
68a2462d89 X11: Fixed window resize. 2015-04-26 12:42:51 -07:00
Mike Popoloski
3fc8ef8c7b Small cleanup of entry_winrt 2015-04-25 10:39:11 -04:00
Branimir Karadžić
e706260793 Added texture handle passing to ocornut-imgui. 2015-04-23 17:14:29 -07:00
Branimir Karadžić
cc6649db0d Cleanup. 2015-04-22 09:30:28 -07:00
Branimir Karadžić
4098dbb8fb Fixed GCC warnings. 2015-04-15 20:05:18 -07:00
Branimir Karadžić
5e5a0a8a9e Added custom allocator to imgui. 2015-04-15 20:00:15 -07:00
Branimir Karadžić
4210fb0d64 Renamed reset flag. 2015-04-15 11:49:20 -07:00
Branimir Karadžić
7bfe51d0d8 Added flip after submit reset flag. 2015-04-14 20:03:05 -07:00
Branimir Karadžić
cea3815dff Fixed HLSL shader stripping. 2015-04-13 12:54:45 -07:00
Branimir Karadžić
dedf75a89b Rebuilt shaders. 2015-04-12 22:26:40 -07:00
Branimir Karadžić
57cfeffb8d Rebuilt shaders. 2015-04-11 18:18:43 -07:00
Branimir Karadžić
a042d6f7b9 Fixed decoding of unsupported RGBA8/BGRA8 formats on D3D9/GL. 2015-04-11 00:17:49 -07:00
Branimir Karadžić
c7eb016ae0 Rebuilt shaders. 2015-04-10 21:09:46 -07:00
Mike Popoloski
5f4bd7700e Recompiling shaders. Shouldn't have any effect on runtime behavior. 2015-04-10 22:49:39 -04:00
Branimir Karadžić
1824a3f5bd Cleanup. 2015-04-08 14:16:02 -07:00
Branimir Karadžić
c85c12b5cd Fixed variable narrowing warnings. 2015-04-07 17:58:14 -07:00
Branimir Karadžić
1e8051fd00 Fixed variable shadowing. 2015-04-04 19:10:35 -07:00
Branimir Karadžić
2e6ac0ca49 Silence -Wshadow warning in stb_image. 2015-04-04 16:23:50 -07:00
Dario Manesku
8f31098c40 Fixup for previous commit. This is a better way to do it. 2015-04-05 09:04:16 +02:00
Branimir Karadžić
584baba7d7 Rebuilt embedded shaders. 2015-04-02 23:36:53 -07:00
Branimir Karadžić
85bf5493c3 Updated shaders. 2015-04-02 10:49:41 -07:00
Branimir Karadžić
81d6876067 Cleanup. 2015-03-31 09:44:51 -07:00
Branimir Karadžić
d62025d530 Fixing VS2015 warnings. 2015-03-29 22:40:35 -07:00
Branimir Karadžić
a34e6e7965 Fixed VS2015 warnings. 2015-03-29 11:47:32 -07:00
Branimir Karadžić
092f8f19e7 Fixed leak on exit. 2015-03-28 10:33:27 -07:00
Branimir Karadžić
a797b00a7f Updated GLFW entry to test for exit. 2015-03-25 19:43:12 -07:00
Branimir Karadžić
0da6c77806 Added glfw entry. 2015-03-24 22:19:21 -07:00
Branimir Karadžić
f5afbffe64 Fixed compiler warning. 2015-03-21 18:14:35 -07:00
Branimir Karadžić
5f29eb480d Fixed issue #296. 2015-03-19 09:31:46 -07:00
Miodrag Milanovic
5b0fea0052 Reorder warning fix 2015-03-17 11:28:30 +01:00
Branimir Karadžić
a1400dc590 SDL: WIP text input event. 2015-03-16 22:23:06 -07:00
Dario Manesku
acd4dedfe1 Added mouse scroll support to entry_sdl. 2015-03-16 15:19:35 +01:00
Dario Manesku
f3c300980d Imgui separator line can be now aligned. 2015-03-16 14:20:45 +01:00
Dario Manesku
7c188f4e0e Fixing EXC_BAD_ACCESS error. 2015-03-16 14:12:37 +01:00
Dario Manesku
4360841989 Imgui can be now downscaled to fit small resolution screens. 2015-03-16 13:59:28 +01:00
Dario Manesku
831682d542 Fixing imgui area stencil problem. ImguiDrawText now also draws outside of imgui area. 2015-03-14 13:33:40 +01:00
Dario Manesku
a7dc166ed1 Don't show imgui test window all the time. 2015-03-12 20:34:19 +01:00
Dario Manesku
5cca4686e2 NVG now uses same viewId as imgui. 2015-03-12 20:28:07 +01:00
Branimir Karadžić
6eafd8b137 Cleanup. 2015-03-11 23:30:41 -07:00
Branimir Karadžić
b8f2b24a82 Fixed VS2013 warnings. 2015-03-11 22:45:34 -07:00
Branimir Karadžić
dd9188e475 Updated ocornut-imgui 1.35. 2015-03-09 11:30:08 -07:00
Dario Manesku
4c2a653de6 Removing minimal window size limit from entry-sdl. 2015-03-09 04:03:15 +01:00
Dario Manesku
9ea92d4a47 Added char events for entry-sdl. 2015-03-09 03:53:08 +01:00
Dario Manesku
205fa041e9 Cleanup. 2015-03-09 03:53:08 +01:00
Dario Manesku
633ea3f211 Added missing toggleFullscreen() in entry_windows.cpp. 2015-03-08 06:36:44 +01:00
Branimir Karadžić
6683df3a8c SDL: Fixed compile error. 2015-03-07 22:25:06 -08:00
Dario Manesku
ccb95fc3d9 Fixup for previous commit. 2015-03-08 03:10:25 +01:00
Dario Manesku
f9750906c0 Fixing mouse input in fullscreen mode. 2015-03-08 03:03:55 +01:00
Dario Manesku
b46aadcaf7 Init window in the center of the screen. 2015-03-08 02:59:16 +01:00
Dario Manesku
2443718b9f Fixup for previous commit. 2015-03-08 01:17:49 +01:00
Dario Manesku
81b9086de5 If some key modifiers are pressed other than shift, send postKeyEvent(). 2015-03-08 01:03:51 +01:00
Dario Manesku
7bc7b9f329 Changed mouse modifier from shift to command. 2015-03-08 00:29:52 +01:00
Dario Manesku
6935ead3e6 Implemented existing OSX window commands + added toggleFullscreen(). 2015-03-07 23:39:04 +01:00
Dario Manesku
52008569ef Get mouse position only once and store it. 2015-03-06 02:35:04 +01:00
Dario Manesku
c5943ded12 Make sure mouse button state is 'up' after window resize. 2015-03-06 02:35:04 +01:00
Dario Manesku
f47bd56d52 Fixing content display on window resize. 2015-03-06 02:35:04 +01:00
Dario Manesku
382c0b685b Calling postExitEvent() for Meta+Q as in other entries. 2015-03-06 02:35:03 +01:00
Dario Manesku
701cd3b3c9 Adding postCharEvent() to OSX entry. 2015-03-06 02:35:03 +01:00
Dario Manesku
a96ba40b03 Imgui input now accepts, and interprets in the same way, 'delete' and 'backspace'. 2015-03-06 02:35:03 +01:00
Dario Manesku
97e9d2db6c Temporary solution for middle click. 2015-03-06 02:35:03 +01:00
Dario Manesku
9a23cf7b42 OSX prefers scroll be implemented this way. 2015-03-06 02:35:03 +01:00
Dario Manesku
ef9c989c14 Added mouse scroll support for OSX. 2015-03-05 03:37:20 +01:00
Dario Manesku
5453b2cf40 Fixed mouse scroll value on Windows. 2015-03-02 16:08:01 +01:00
Dario Manesku
2d7b134b3b Added support for mouse scroll. 2015-03-02 16:08:01 +01:00
Dario Manesku
2e9199e365 ImguiBorderButton was one pixel short in height. 2015-02-23 22:11:27 +01:00
Dario Manesku
4e9d06b207 Rotated latlong preview by 90 deg. 2015-02-23 20:52:54 +01:00
Dario Manesku
8351d6dce2 Cleanup 2015-02-23 20:52:54 +01:00
Branimir Karadžić
8790649495 Moved imgui to last view. 2015-02-21 15:51:03 -08:00
Branimir Karadžić
8c1518f259 Added toLinear/GammaAccurate shader functions. 2015-02-17 16:26:10 -08:00
Branimir Karadžić
13ac805085 Cleanup. 2015-02-16 21:58:13 -08:00
Miodrag Milanovic
88998f7cd8 Compile fixes for Apple GCC 4.2 2015-02-15 18:59:47 +01:00
Miodrag Milanovic
93ea52c23a Compile fixes for Apple GCC 4.2 2015-02-15 13:55:45 +01:00
Branimir Karadžić
0ff1d7df0c Better way to configure entry allocator. 2015-02-13 09:43:46 -08:00
Branimir Karadžić
804a460d75 Added ability to configure entry allocator. 2015-02-12 21:52:34 -08:00
Branimir Karadžić
7019edd20f Cleanup. 2015-02-11 19:42:20 -08:00
Dario Manesku
269a676421 Cleanup. 2015-02-12 02:50:18 +01:00
Dario Manesku
f57c3a3516 Added latlong display type for imguiCube(). 2015-02-12 02:50:18 +01:00
Branimir Karadžić
3b2c0dc001 Fixed static initializer order. 2015-02-09 20:12:46 -08:00
Branimir Karadžić
6d2d04cad5 Cleanup. 2015-02-08 10:25:53 -08:00
Dario Manesku
18307976c8 Added possibility to override imgui malloc/free. 2015-02-08 12:34:06 +01:00
Dario Manesku
122129b351 Moving TinyStlCustomAllocator inside entry. 2015-02-08 12:34:06 +01:00
Dario Manesku
112b53b116 Added possibility to override default tinystl allocator for 'example-common' project. 2015-02-08 12:34:05 +01:00
Branimir Karadžić
1d4eb335a7 Removed X11 include in bgfxplatform.h. 2015-02-06 16:49:04 -08:00
Branimir Karadžić
f6594b1bab Merge branch 'master' of github.com:bkaradzic/bgfx 2015-02-03 22:24:48 -08:00
Branimir Karadžić
877fa25d5b cleanup. 2015-02-03 22:24:40 -08:00
Branimir Karadžić
de81071969 Cleanup. 2015-01-31 22:28:51 -08:00
Branimir Karadžić
a8accf4f98 Removed test window. 2015-01-31 19:28:10 -08:00
Branimir Karadžić
0c77794e24 Updated to ocornut-imgui v1.30. 2015-01-31 19:08:13 -08:00
Branimir Karadžić
6506add5a9 Added embedded font to imgui. 2015-01-23 23:02:56 -08:00
Branimir Karadžić
bbeb0a3ffe Updated to latest ocornut imgui. 2015-01-22 21:01:09 -08:00
Branimir Karadžić
0516b5603b Added max anisotropy reset flag. 2015-01-21 20:39:42 -08:00
Branimir Karadžić
f6fe2de941 Cleanup. 2015-01-20 21:41:51 -08:00
Branimir Karadžić
76b317256e Fixed compile warning. 2015-01-19 23:35:49 -08:00
Branimir Karadžić
d5bea0e7fd Cleanup. 2015-01-19 22:15:50 -08:00
Branimir Karadžić
501d260c3f Added scissor for ocornut-imgui. 2015-01-19 20:34:54 -08:00
Branimir Karadžić
9e52b1d6d9 imgui: Added ocornut imgui initialization into existing imgui. 2015-01-19 17:16:59 -08:00
Branimir Karadžić
8cd9ecfd18 Cleanup. 2015-01-18 12:58:56 -08:00
Branimir Karadžić
9e34736c49 Moved ocornut-imgui from ProDBG source to examples-common. 2015-01-16 22:41:37 -08:00
Attila Kocsis
d3d304e008 Fix issue #229: Mouse movement does not work on OSX/Macbook Pro properly 2015-01-15 19:58:33 +01:00
Attila Kocsis
1fac08f3ef added separate ios/osx Xcode project generation
added ios/osx bundle resource loading
added info.plist for iOS Xcode examples
Xcode now uses only Universal target ( should use 'Standard' as it is default in Xcode projects - this will require modification of genie)
2015-01-14 19:50:45 +01:00
Branimir Karadžić
7db31fc7fa Cleanup. 2015-01-07 22:36:36 -08:00
Branimir Karadžić
4b1b62e6bd Fixed MinGW build from Linux. 2015-01-04 16:23:00 -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
Branimir Karadžić
c6efb167ba Added index buffer compression support. 2014-12-31 16:11:07 -08:00
Branimir Karadžić
527adf3c28 Android: Added gamepad support. 2014-12-29 13:53:44 -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
Branimir Karadžić
0a594cdb91 Android: Added input handling. 2014-12-25 18:27:27 -08:00
Branimir Karadzic
c8a112d71e X11: Relax polling input. 2014-12-25 09:27:51 -08:00
Branimir Karadžić
857a2b18f1 Android: Fixed GLES3+ build. 2014-12-23 23:32:36 -08: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
Branimir Karadzic
9b2ca73de4 x11: Added gamepad support. 2014-12-21 13:35:11 -08:00
Branimir Karadžić
e1a7daf38a Win: Capture mouse when mouse button is down. 2014-12-20 19:07:01 -08:00
Branimir Karadzic
0d20d7e6c8 Added gamepad guide button. 2014-12-20 10:38:40 -08:00
Branimir Karadžić
3de8b63457 Fixed crash when xinput is not present. 2014-12-19 22:37:31 -08:00
Branimir Karadžić
f46b91db84 Cleanup. 2014-12-18 21:39:38 -08:00
Branimir Karadžić
6315743251 SDL: Added connect/disconnect gamepad events. 2014-12-17 21:25:00 -08:00
Branimir Karadžić
cdc0c01503 Added XInput support. 2014-12-17 21:07:40 -08:00
Branimir Karadzic
510bc9e344 Cleanup. 2014-12-15 21:08:55 -08:00
Branimir Karadžić
b7cd5ae62d Cleanup. 2014-12-15 20:59:22 -08:00
Branimir Karadžić
73a227cefd SDL2: Added gamepad support. 2014-12-15 20:58:54 -08: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
Attila Kocsis
4a7a9bc4a3 fixed crash on iOS 2014-12-10 22:38:50 +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
Branimir Karadzic
36e02361d1 Fixed bad include path. 2014-11-20 16:51:14 -08:00
Branimir Karadžić
cf7b1542d2 Merge pull request #187 from SmilyOrg/patch-2
Fix for crash with too many lines / vertices
2014-11-20 16:48:32 -08:00
Branimir Karadžić
2e24c7cc3e Merge pull request #186 from SmilyOrg/patch-1
Fix for convexFill crash when path fillCount is 0
2014-11-20 16:47:53 -08:00
Miha Lunar
e5da24f490 Fix for crash when too many lines / vertices
When a lot of lines are being drawn, this can overflow the vertex buffer, causing a crash in `nvgRenderFlush`. While the underlying code handles this case in an okay manner (truncating the vertex buffer instead of crashing), the `nvgRenderFlush` code is missing a check for this case, causing it to think it has more space than was allocated.

I tried to fix it with multiple buffers as mentioned in #160, however it seems more complex than it appears. This fix just makes it truncate the output according to the actual allocated amount of bytes in the vertex buffer, so it doesn't crash at least.
2014-11-21 00:57:33 +01:00
Miha Lunar
6c6a550fd6 Fix for convexFill crash when path fillCount is 0
In our situation, the crash happened due to the view dimensions being reset to 0x0 after minimizing the window. This translated to fillCount of a path ending up at 0, which makes `fan` crash as it computes number of tris to -2 of fillCount. Since `numTris` is unsigned, this could lead to terrible things, but luckily it crashes soon.

There might be a cleaner fix for this further up the call stack, but this is a good solution in the meanwhile.
2014-11-21 00:39:04 +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