Mikko Mononen
3110d5fba1
Merge pull request #316 from xeekworx/master
nvgRoundedRectEx for varying corner radii
8 years ago
Xeek
2331f1ff11
Merge branch 'master' of https://github.com/memononen/nanovg
8 years ago
Xeek
d68da77299
Merge branch 'master' of https://github.com/xeekworx/nanovg
Conflicts:
src/nanovg.h
8 years ago
Xeek
bb385e6b8f
Renamed nvgRoundedRectEx to nvgRoundedRectVarying, using variables for duplicated calls to nvg__absf, renamed the radius parameters & variables to be more descriptive, changed the order of radius parameters to follow CSS order, and finally corrected the if/else style suggested by @memononen .
8 years ago
Xeek
34621d4ad2
Renamed nvgRoundedRectEx to nvgRoundedRectVarying, using variables for duplicated calls to nvg__absf, renamed the radius parameters & variables to be more descriptive, changed the order of radius parameters to follow CSS order, and finally corrected the if/else style suggested by @memononen .
8 years ago
Mikko Mononen
7859321aa8
Merge pull request #317 from olliwang/coordinate
Fixes a bug when applying `NVG_IMAGE_FLIPY`.
8 years ago
Olli Wang
85ac378792
Fixes a bug when applying `NVG_IMAGE_FLIPY`.
This commit fixes issue #167 that `nvgImagePattern()` does not handle coordinate well if the specified image applies the `NVG_IMAGE_FLIPY` parameter.
8 years ago
Xeek
b2d9eb251b
Added nvgRoundedRectEx so that the rectangle's corners can have varying radii. nvgRoundRect changed to utilize nvgRoundedRectEx.
8 years ago
Mikko Mononen
af0c475cf9
Merge pull request #311 from dimsuz/gl2_image_handle_fix
Rename nvglImageFromHandleGL2 -> nvglImageHandleGL2
8 years ago
Dmitry Suzdalev
23128bdb58
Rename nvglImageFromHandleGL2 -> nvglImageHandleGL2
There was no nvglImageFromHandleGL2 implementation, it must have been
an error during some refactoring
8 years ago
Mikko Mononen
4f255e0daf
Merge pull request #307 from olliwang/blend
Fallbacks to default composite operation when invalid one is specified.
8 years ago
Olli Wang
c03226cd2e
Fallbacks to default composite operation when invalid one is specified.
This commit fixes #300 and #306 that “control may reach end of non-void function” error occurs in `glnvg_convertBlendFuncFactor()`. The function now returns `GL_INVALID_ENUM` for invalid blend factor and if that happens, `glnvg__blendCompositeOperation()` uses default source-over composite operation.
8 years ago
Mikko Mononen
189e051527
Merge pull request #303 from olliwang/freetype
Fixes the kerning value for freetype.
8 years ago
Olli Wang
39f7a369c7
Fixes the kerning value for freetype.
This commit fixes issue #302 that the kerning value returned by freetype is not converted to integer properly.
8 years ago
Mikko Mononen
c02bc9d5ed
Merge pull request #301 from olliwang/font
Support fallback fonts (code refactoring for #299 )
8 years ago
Olli Wang
c97444c96f
Code refactoring for #299 .
This commit fixes the formats as suggested in #299 and fixes stack overflow when using `freetype` backend.
8 years ago
satoren
40e999af3c
Support fallback fonts
8 years ago
Mikko Mononen
71774e0afe
Merge pull request #298 from olliwang/blend
Implements composite operation for blending renderings.
8 years ago
Olli Wang
09dc767e3f
Updates comment for composite operation.
8 years ago
Olli Wang
9490a8c188
Updates comment again.
8 years ago
Olli Wang
ba8272c5b5
Updates comments.
8 years ago
Olli Wang
1d856c1b00
Changes the order of declaration.
8 years ago
Olli Wang
1bf25e6f67
Improves the implementation of global composite operation.
This commit updates the implmentation of global composite operation to follow the advices described at c4b865796d (r74248556)
8 years ago
Olli Wang
c4b865796d
Implements composite operation for blending rendering between frames.
This commit implements the `nvgGlobalCompositeOperation()` function to support blending between frames. All operations defined in HTML5 canvas API are supported. Also, it is possible to create custom composite operation by calling `nvgBlendFunc()` or `nvgBlendFuncSeparate()` functions.
8 years ago
Mikko Mononen
25f39a60a8
Merge pull request #297 from olliwang/bgfx
Add support for bgfx
8 years ago
Olli Wang
1664a524a7
Passes the device pixel ratio parameter to `renderViewport` function.
This commit updates the `nvgBeginFrame()` function to forward the received `devicePixelRatio` parameter to the `renderViewport()` function so it is possible to configure the environemnt correctly when using `bgfx` backend.
8 years ago
Mikko Mononen
cc3897359a
Merge pull request #295 from nhojb/master
Fixing clang compiler warnings.
8 years ago
John
1efdf2a1de
Fixing clang compiler warnings.
8 years ago
Mikko Mononen
c80af94c07
Merge pull request #283 from JinShil/patch-1
Fix typo in nvgCreateFontMem() description
9 years ago
Mike
df658f97a2
Fix typo in nvgCreateFontMem description
9 years ago
Mikko Mononen
b83cf92652
Fixed use of nvglImageHandlexx in GL utils from earlier PR
- nvglImageHandle was changes to contain GL postfix, changed GL utils
to use that too
- fixed silly failure check bug in FBO demo
9 years ago
Mikko Mononen
2504509fb2
Merge pull request #261 from reFX-Mike/master
Fixed fontstash.h crashing
9 years ago
Mikko Mononen
3321379e49
Merge pull request #201 from andrewcorrigan/master
Fix for issue #172
9 years ago
Michael Hartmann
f43a7a7790
Replace malloc.h with stdlib.h
9 years ago
Michael Hartmann
6245376103
Increased SCRATCH_FONS_SCRATCH_BUF_SIZE to 64000
9 years ago
Mikko Mononen
cb6fd9100d
Added glUniformBlockBinding to touched state
9 years ago
Mikko Mononen
504060e52a
Merge pull request #238 from plasmacel/master
fixed type usage
9 years ago
Thom de Villa
b7a4792291
fixed type usage
in some situations int and GLsizei is not the same type which leads to conversion warnings
9 years ago
Mikko Mononen
6ae087333d
Merge pull request #226 from olliwang/framebuffer
Improve the use of NVGLUframebuffer.
10 years ago
Olli Wang
32db574853
Improve the use of NVGLUframebuffer.
The `NVGLUframebuffer` structure contains a `ctx` member but was actually never used. This commit takes advantage of the `ctx` property so there is no need to keep the reference of the context elsewhere after calling `nvgluCreateFramebuffer()`, or it would add difficulty for maintenance. As a result, the `nvgluDeleteFramebuffer()` function only needs to take one `NVGLUframebuffer` instance as the parameter.
10 years ago
Mikko Mononen
1de6fa5cdd
Merge pull request #207 from alexbrazier/patch-1
Fix spelling mistake in readme
10 years ago
Alex Brazier
01141b2e88
Fix spelling mistake in readme
10 years ago
Andrew Corrigan
3eeafc1a14
Fix for issue #172
10 years ago
Mikko Mononen
3a5e25cc67
Merge pull request #196 from waywardmonkeys/fix-typos
Fix typos.
10 years ago
Bruce Mitchener
98b116165d
Fix typos.
10 years ago
Mikko Mononen
31f9feb401
Fix for #191
- fixed stroke to use lino join style to calculate required vertex
count
10 years ago
Mikko Mononen
90862ce25c
Fix for issue #175
Line break would duplicate a word if the first character of a word
would cause a line break
10 years ago
Mikko Mononen
1a0550ebc7
Merge pull request #185 from SmilyOrg/patch-2
Added check in addPoint to avoid duplicated moveTos breaking
10 years ago
Mikko Mononen
8b849004d4
Merge pull request #165 from floooh/pr_redundant_state_filter
Redundant GL state filter
10 years ago
Miha Lunar
f8086a2006
Added check in addPoint to avoid duplicated moveTos breaking
It guards addPoint from "stealing" the point from the previous path if they're the same, which makes it break when you do something like this:
```
moveTo(50, 50)
moveTo(50, 50)
lineTo(100, 100)
```
Before the fix there's no line shown. With the second moveTo, there's a second path added, but without the 50,50 point, because it was already added with the first moveTo. This makes the second path only contain the point 100,100 so it doesn't draw at all.
After the fix, the point equality check is ignored for the first point in the path, so the second path gets the 50,50 point too and that makes it behave as expected.
This is only one solution to the duplicated moveTo problem and it's likely not the best one, but it's one that's easy to add and it seems to work just fine.
10 years ago