Commit Graph

1462 Commits

Author SHA1 Message Date
vurtun
054136075c Fixed warnings and UB in demo code 2017-11-27 20:44:13 +01:00
vurtun
1d8aae2bba Merge branch 'Predelnik-userdata-fix' 2017-11-27 20:28:40 +01:00
vurtun
3636cb1c5d Fixed #511 and changed formatting 2017-11-27 20:27:02 +01:00
Sergey Semushin
988b40888b Fix NK_INCLUDE_COMMAND_USERDATA usage with images.
If userdata is used with drawing images userdata was missing from
the first image command and also subsequent commands which draw the
same texture but with different user data were incorrectly merged together.
2017-11-25 09:36:37 +03:00
vurtun
56b2612a91 Fixed #558 NK_WINDOW_NO_INPUT hidding windows bug 2017-11-18 19:55:17 +01:00
vurtun
37a00a5f13 Fixed #555 closing minimized windows and drawing bug
Fixed missing skips of closed minimized windows in garbage collections
state and drawing procedure.
2017-11-16 13:14:00 +01:00
vurtun
6a13addb21 Fixed #413 font merging 2017-11-15 15:22:11 +01:00
Micha Mettke
f436c1a129
Merge pull request #550 from kstarzyk/add_osx_build_sfml_demo
Add osx build sfml demo
2017-11-14 19:10:43 +01:00
Micha Mettke
89b32fb948
Merge pull request #553 from NuklearBomb/patch-1
Use NK_DTOA in function nk_do_property
2017-11-14 19:10:05 +01:00
NuklearBomb
e76ba09ec6
Use NK_DTOA in function nk_do_property
This modification makes it so the nk_do_property() function uses the user-defined NK_DTOA function instead of the internal nk_dtoa() function, as per the description below "Optional Defines":
    NK_DTOA
        You can define this to `dtoa` or your own double to string conversion
        implementation replacement. If not defined nuklear will use its own
        imprecise and possibly unsafe version (does not handle nan or infinity!).
        <!> If used it is only required to be defined for the implementation part <!>
Keep up the great work on Nuklear, really enjoying it so far!
2017-11-14 10:29:58 -05:00
Krzysztof Starzyk
c7d9d09522 Ident 2017-11-12 12:49:15 +01:00
Krzysztof Starzyk
dde257903c Fix ident 2017-11-12 12:47:13 +01:00
Krzysztof Starzyk
bcd0234ff8 Add OSX build for SFML demo 2017-11-12 12:39:23 +01:00
Micha Mettke
36a396fb3a
Merge pull request #546 from nsawa/fix_gcc_warning_unused_variable
Fix: gcc warning unused variable.
2017-11-08 10:49:40 +01:00
Naoyuki Sawa
2f269f4df0 Fix: gcc warning unused variable. 2017-11-08 09:05:46 +09:00
vurtun
c24e3d60e6 Merge branch 'master' of https://github.com/vurtun/gui 2017-11-07 18:20:54 +01:00
vurtun
7eb08b8bcf Fixed #545 with window pos/size modifier 2017-11-07 18:18:50 +01:00
Micha Mettke
76a17910ff Merge pull request #538 from metiscus/master
Improvement to SFML GL2 demo code
2017-10-18 11:03:16 +02:00
Michael Bosse
0fca7e2045 Adds protection of the texture matrix stack which allows the user to use sf::Sprites with this code unmodified otherwise 2017-10-17 17:16:55 -04:00
Micha Mettke
9e0ed888fb Merge pull request #523 from nuklear-ui/docs
Docs
2017-10-17 12:25:36 +02:00
Micha Mettke
056af25e27 Merge pull request #534 from DeXP/gles2
OpenGL ES2.0: Emscripten support
2017-10-17 12:23:56 +02:00
Micha Mettke
a75bfcc3cb Merge pull request #535 from siro20/nuklear_softrast
demo/x11_rawfb: Change license to MIT
2017-10-09 18:22:10 +02:00
Patrick Rudolph
3705464605 demo/x11_rawfb: Change license to MIT
Relicense all x11_rawfb demo files under MIT license.

Signed-off-by: Patrick Rudolph <siro@das-labor.org>
2017-10-09 17:41:06 +02:00
DeXP
e57e0149f3 Emscripten support 2017-10-08 21:26:33 +02:00
vurtun
24a7536273 Merge branch 'siro20-nuklear_softrast' 2017-10-07 14:31:05 +02:00
vurtun
e5850a01b9 Fixed style issues in software renderer 2017-10-07 14:30:22 +02:00
vurtun
5d72fe5f86 Merge branch 'nuklear_softrast' of https://github.com/siro20/nuklear into siro20-nuklear_softrast 2017-10-07 14:01:22 +02:00
Patrick Rudolph
2eb72b26e4 Add software rasterizer library and demo.
The software rasterizer is to be used with raw framebuffer
devices, where no GPU or X11 is available.
The demo emulates a raw framebuffer on X11 using XShmImage / XImage.

Features implemented:
* Drawing primitives
* Drawing polygons (using Darel Rex Finley algorithm)
* Drawing arcs and circles (using Bresenham's elipses algorithm)
* Drawing images using nearest filtering
* Bounds check on every operation
* Fastpath for lines
* Font rendering using nearest filtering
* Window resize
* Thread safe implementation by using a context
* Fixed lower and upper scissors on fast-path
* Adapted coding style to nuklear's style
* Implemented text scissors

Color formats:
Define one of them at compile time.
* RAWFB_RGBX_8888 (32bpp)
* RAWFB_XRGB_8888 (32bpp)

Tested:
The library has been tested on Lenovo Thinkpad T500 and is able to render
more than 30fps on a single core with no further optimizations and VSNYC enabled.

TODO:
* Improve font rendering by using filters.
* Account font foreground color.

Usage:
The raw framebuffer library needs a "texture" that holds the prerendered
font data. The texture is used at runtime to blit the letters onto screen.
You have to provide the framebuffer address, dimension and pitch.

Signed-off-by: Patrick Rudolph <siro@das-labor.org>
2017-10-07 12:08:24 +02:00
Micha Mettke
ed57400644 Merge pull request #529 from DeXP/gdip-fonts
GDI+ multiple fonts support
2017-10-04 21:41:41 +02:00
Dmitry Hrabrov
49c3bcd0c6 nk_ prefix 2017-10-04 20:05:47 +03:00
Micha Mettke
e24b8ca2ba Merge pull request #526 from RomanAkberov/master
Use correct style for progressbar cursor.
2017-10-04 15:13:34 +02:00
vurtun
a5f171a4c8 Merge branch 'DeXP--gles2' 2017-10-04 15:11:24 +02:00
vurtun
af216a1be4 Merge branch 'gles2' of https://github.com/DeXP/nuklear into DeXP--gles2 2017-10-04 15:10:05 +02:00
Micha Mettke
c582959eea Merge pull request #527 from DeXP/gdip
GDI+ nk_gdip_fill_rect background fix
2017-10-04 15:08:07 +02:00
Dmitry Hrabrov
02e6a81625 GDI+ multiple fonts support
Each custom loaded font requires own `GpFontCollection`. So there is array of font collections now.
2017-10-01 18:38:08 +03:00
Dmitry Hrabrov
a01977264c Revert X11 changes 2017-10-01 18:36:40 +03:00
DeXP
cc8556533f Open GL ES 2 demo
Can be used on: Linux, Mac OS X, Android, Emscripten
2017-10-01 14:10:57 +02:00
Dmitry Hrabrov
49f6b1134e Revert X11 changes 2017-10-01 14:08:06 +02:00
Dmitry Hrabrov
ecee5816d5 Revert X11 changes 2017-10-01 13:42:41 +03:00
Dmitry Hrabrov
d0ed8bc3cf GDI+ nk_gdip_fill_rect background fix
1. Main background area was filled by 2 big overlapping rectangles. It works good on solid but not on semi-transparent themes. Just replaced 2 big rectangles with 1 big and 2 small.
2. There is no need in [nk_gdip_fill_rect filled pies fix](7ab7327fa4) anymore. It disturbs semi-transparent themes too.
2017-10-01 13:33:52 +03:00
Roman Akberov
31c88a8ccf Use correct style for progressbar cursor. 2017-09-24 18:22:23 +02:00
vurtun
0b95e3e5a0 Fixed #525 by updating canvas example 2017-09-23 14:53:55 +02:00
Bailey Cosier
3444d8aeef Bump docs submodule revision 2017-09-21 18:18:57 +07:00
Bailey Cosier
981d542177 Add doc scripts and sphinx configuration update 2017-09-21 18:18:57 +07:00
Bailey Cosier
075e3fd349 Add .readthedocs.yml config for installing breathe dependency 2017-09-21 18:18:57 +07:00
Bailey Cosier
9d2fe7cfed Add doxygen, sphinx docs setup 2017-09-21 18:18:57 +07:00
Micha Mettke
815b5e19e4 Merge pull request #521 from valera-rozuvan/patch-3
Add comment to closing #endif statement
2017-09-20 16:43:27 +02:00
Valera Rozuvan
55206c7bea Add comment to closing #endif statement
I think this adds more clarity to the library. I.e. that it is organized into 2 large #define statements. The first large statement (`NK_NUKLEAR_H_`) has a comment for it's closing `#endif` statement. The second one (`NK_IMPLEMENTATION`) does not.
2017-09-19 16:15:21 +03:00
Micha Mettke
48f659abd8 Merge pull request #497 from jwdeitch/master
fix compiling error on OSX (-lglfw3 not found)
2017-09-18 17:41:54 +02:00
Micha Mettke
46cd4e0bd5 Merge pull request #520 from valera-rozuvan/patch-2
Remove unused line of code
2017-09-18 14:42:46 +02:00