Mikko Mononen
c75fc0bfcf
Merge pull request #359 from olliwang/glext
Fixes how glext header is included.
8 years ago
Olli Wang
4ac2b44ea7
Fixes how glext header is included.
This commit fixes the issue caused by #357 that nanovg failed to compile on iOS due to the wrong way of including glext header.
8 years ago
Mikko Mononen
51284049e2
Merge pull request #357 from ckaran/master
Bug fixes to compile under OS X 12.3
8 years ago
Cem Karan
2098a54242
Added a missing include file to nanovg_gl.h.
To make the examples link correctly under OS X 12.3, you need to include
<OpenGL/glext.h> in the file. This commit limits what happens by protecting
the include as follows:
#ifdef __APPLE__
# include <OpenGL/glext.h>
#endif
Thus, this should have no effect on non-Apple systems.
8 years ago
Cem Karan
112567c975
Added "-framework Carbon" as a link option to premake4.lua.
To get nanovg to link correctly under OS X 12.3, it needs to be linked against
the Carbon libraries. This was missing in the premake4.lua files. Now fixed.
8 years ago
Mikko Mononen
47ffd9d0b9
Merge pull request #312 from satoren/master
Improve nvgGlobalCompositeOperation with state
8 years ago
Mikko Mononen
8feae63a46
Merge pull request #343 from damiles/master
Add image flag to support GL_NEAREST rendering
8 years ago
David Millan (Damiles)
ee031a432c
Use NVG_IMAGE_NEAREST to no interpolate in image
8 years ago
David Millan (Damiles)
61fb55ac19
Merge branch 'master' of https://github.com/damiles/nanovg
8 years ago
David Millan (Damiles)
dd1eff4f9e
Solve bug inverted but not good solution
8 years ago
David Millan (Damiles)
e955b3829d
Nearest Support for images, but there are strange bug to solve. It's Inverted
8 years ago
Mikko Mononen
cacb00b852
Merge pull request #340 from andrewcorrigan/master
suppresses all warnings reported by latest Xcode/AppleClang
8 years ago
Andrew Corrigan
1ae01af452
suppresses all warnings reported by Apple LLVM version 8.0.0 (clang-800.0.42.1)
8 years ago
Mikko Mononen
e12379653e
Merge pull request #338 from olliwang/CJK
Better support for CJK characters.
8 years ago
Olli Wang
7cd8decef4
Better support for CJK characters.
Previously, the Unicode range of the CJK chractaters only includes Chinese charactaters, Japanese Kanji, and CJK Symbols and Punctuation. The range are used by traditioanl Korean as well. This commit further includes Hiragana and Katakana in Japanese, and Hangul Syllables and Hangul Jamo in Korean to make CJK support more complete.
8 years ago
Mikko Mononen
d9e8daf46f
Merge pull request #333 from olliwang/font
Fixes the bug that text may not render correctly.
8 years ago
Olli Wang
c6cddc85c1
Fixes the bug that text may not render correctly.
This commit fixes the bug that text may not render correctly when glyph is not found in fallback fonts.
8 years ago
Mikko Mononen
a367dcf163
Merge pull request #331 from olliwang/CJK
Improves to display CJK characters with English words.
8 years ago
Olli Wang
ade7193423
Improves to display CJK characters with English words.
This commit improves to display CJK characters mixed with English words so there is less spaces at line breaks.
8 years ago
Mikko Mononen
84e848d1e9
Merge pull request #330 from olliwang/CJK
Fixes line breaks for CJK characters.
8 years ago
Mikko Mononen
2ed5c0e010
Merge pull request #329 from lieff/master
handle file IO error
8 years ago
Olli Wang
c64c95c727
Fixes line breaks for CJK characters.
This commit fixes weird line breaks when rendering CJK (Chinese, Japanese, Korean) characters. Each CJK character is more like a word instead of a letter. This commit fixes the logic of line breaks by introducing a new `NVG_CJK_CHAR` code point type and takes special care for formatting text including CJK characters.
8 years ago
lieff
ecb5899bcf
handle file IO error
8 years ago
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
satoren
a457efa3c4
Remove demo code for nvgGlobalCompositeOperation
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
satoren
9dbd79dbc7
Code format
8 years ago
satoren
339c5e507b
Improve nvgGlobalCompositeOperation with state
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