ilusha/nanovg
1
0
Fork 0
mirror of https://github.com/memononen/nanovg synced 2026-09-26 16:19:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
392 commits 1 branch 0 tags 7.1 MiB
Commit graph

392 commits

This branch
This branch
All branches
Author SHA1 Message Date
My Name
4c7eb2f63d Added a preprocessor definition to disable the use of stb_image + Added CMakeLists 2020-09-15 11:41:34 +09:00
Mikko Mononen
2bead03bea
Merge pull request #573 from geoffthemedio/patch-1 
Fixed Signed/Unsigned Comparison Warning
 2020-03-20 22:14:02 +02:00
Geoff
52265fe278
Fixed Signed/Unsigned Comparison Warning 
In Visual Studio 17, I get warnings related to these variables:
````
fontstash.h(241): warning C4018: '<': signed/unsigned mismatch
fontstash.h(242): warning C4018: '<': signed/unsigned mismatch
````

Making them unsigned fixes it.
 2020-03-20 09:51:00 +01:00
Mikko Mononen
426aa3f149 Fix for #570: round glyph positions to pixels using floor 2020-03-18 23:11:00 +02:00
Mikko Mononen
bff4734a9a
Merge pull request #567 from olilarkin/fix-webgl-warning 
Bind a dummy texture in setUniforms when compiling with emscripten
 2020-03-11 23:12:37 +02:00
Oli Larkin
35dbc98160 modify to use dummy texture even without emscripten 2020-03-10 21:27:36 +00:00
Mikko Mononen
e281ffcabd Fixed nvgTextBreakLines returning bad minx 
- nvgTextBreakLines: wordMinX was relative to rowStartX, which caused
problems when rowStartX change on line break, but wordMinX was still
relative to the previous rowStartX
- fixed font size on perf graphs
- made demo to use row minx/maxx instead of row->width
- fixed demo hover distance
 2020-03-07 23:01:56 +02:00
Oli Larkin
3e986cdf4b call glnvg__renderCreateTexture() in glnvg__renderCreate 2020-03-05 22:10:53 +00:00
Oli Larkin
d98041b4ee Bind a dummy texture in setUniforms when compiling with emscripten 
fixes the WebGL error "RENDER WARNING: there is no texture bound to the unit 0"" in Chrome
 2020-03-02 23:18:05 +00:00
Mikko Mononen
6570b56926
Merge pull request #564 from olliwang/demo 
Fixes demo’s font sizes.
 2020-02-28 12:50:58 +02:00
Mikko Mononen
db50e12d03
Merge pull request #563 from olliwang/linegap 
Fixes the issue that line gap may ruin the text layout.
 2020-02-28 12:49:06 +02:00
Olli Wang
79561dc47f Fixes demo’s font sizes. 
This commit fixes the demo’s font sizes for the changes in #558, which makes the rendered font size matches what you saw on other native apps. The demo used bigger font sizes than they actually were. This commit deduces the font sizes to match the original demo’s look.
 2020-02-28 18:27:48 +08:00
Mikko Mononen
492df633f1
Merge pull request #560 from olliwang/font 
Support for resetting fallback fonts.
 2020-02-28 12:06:32 +02:00
Olli Wang
c519ae578b Support for resetting fallback fonts. 
This commit adds `nvgResetFallbackFontsId()` and `nvgResetFallbackFonts()` functions for resetting fallback fonts.
 2020-02-28 17:59:48 +08:00
Mikko Mononen
f3825a08ce
Merge pull request #561 from olilarkin/rendertriangles_fringe 
Pass fringe parameter to renderTriangles
 2020-02-28 11:59:23 +02:00
Olli Wang
528dc4efb5 Fixes the issue that line gap may ruin the text layout. 2020-02-28 17:34:04 +08:00
Oli Larkin
5a006cdca4 Pass fringe parameter to renderTriangles, fixes bad clipping of text on high DPI screens 2020-02-26 12:12:31 +00:00
Mikko Mononen
4ae538b10e
Merge pull request #559 from olliwang/font 
Support for loading a certain font face from a font file.
 2020-02-25 12:59:19 +02:00
Olli Wang
8851f025e4 Support for loading a certain font face from a font file. 
This commit allows loading a certain font face from a font collection file such as TTC.
 2020-02-20 13:23:33 +08:00
Mikko Mononen
b2337d9ead
Merge pull request #558 from olliwang/font 
Fixes the issue that font size is inconsistent.
 2020-02-10 13:35:45 +02:00
Olli Wang
69e1a47511 Fixes the issue that font size is inconsistent. 
This commit fixes the issue that font size is inconsistent between different font files. `stb_truetype.h` is also updated to the latest version to support additional font types such as OpenType fonts.
 2020-02-10 17:06:58 +08:00
Mikko Mononen
1f9c8864fc
Update README.md 
Fix fox #542, indicate font licenses
 2019-04-22 22:03:20 +03:00
Mikko Mononen
b6ac7c440f
Updated readme 2019-04-22 21:56:50 +03:00
Mikko Mononen
f4069e6a1a
Merge pull request #508 from kennysharma/master 
Fix compile issue for missing { in fontstash.h
 2018-09-27 22:19:51 +03:00
Kenny Sharma
97fc85668f Fix compile issue for missing { in fontstash.h 2018-09-27 11:55:31 -07:00
Mikko Mononen
53599bb4a6
Merge pull request #507 from olliwang/freetype 
Fixes memory leaks of freetype.
 2018-09-27 20:34:23 +03:00
Olli Wang
9b27dc3894 Fixes memory leaks of freetype. 
This commit fixes the issue that freetype library isn’t released in `fonsDeleteInternal()` and causes memory leaks.
 2018-09-27 17:51:38 +08:00
Mikko Mononen
fe4ba5f3ba
Merge pull request #506 from olliwang/gl 
Fixes the bug that gl may fail to draw fringes.
 2018-09-09 19:46:41 +03:00
Olli Wang
e7154e104e Fixes the bug that gl may fail to draw fringes. 
This commit fixes the bug that `glnvg__convexFill()` tried to draw fringes depending on whether `NVG_ANTIALIAS` is set. However, #386 adds `nvgShapeAntiAlias()` for chaning anti-alias state explicitly, and `glnvg__convexFill()` would cause error If the anti-alias state is disabled.
 2018-09-09 22:27:03 +08:00
Mikko Mononen
cfa175a0b9
Merge pull request #392 from satoren/crash_on_32bit_platform 
Fix example crash on 32bit platform
 2018-09-02 11:36:06 +03:00
Mikko Mononen
be1a08273f
Merge pull request #503 from sbarisic/patch-1 
Update README.md with another project link
 2018-08-11 06:50:20 +03:00
Saša Barišić
51181a6a08
Update README.md with another project link 2018-08-11 03:25:38 +02:00
Mikko Mononen
05ca0dbf81
Merge pull request #498 from olliwang/font 
Forces autohint when loading glyph using FreeType.
 2018-08-08 10:52:39 +03:00
Olli Wang
83da90e1c8 Forces autohint when loading glyph using FreeType. 
This commit adds the `FT_LOAD_FORCE_AUTOHINT` parameter to `FT_Load_Glyph()` to fix wonky characters.
 2018-07-27 18:07:45 +08:00
Mikko Mononen
4b91cf0006
Merge pull request #495 from olliwang/atlas 
Fixes text corruption on atlas rebuild.
 2018-07-16 22:21:26 +03:00
Olli Wang
8d1b1e7d15 Fixes text corruption on atlas rebuild. 
This commit fixes #494.
 2018-07-16 13:44:48 +08:00
Mikko Mononen
6fa3b3d519
Merge pull request #477 from olliwang/size 
Fixes the type of view size.
 2018-04-30 10:45:42 +03:00
Olli Wang
6b6e3a5246 Fixes the type of view size. 
This commit changes the type of the view size accepted by `nvgRenderFrame()` from `int` to `float` so it matches the type defined in `GLNVGcontext`. This would prevent a framebuffer missing a pixel in final rendering result.
 2018-04-27 07:27:31 +08:00
Mikko Mononen
30a943cb9c Merge remote-tracking branch 'origin/master' 2018-04-18 00:02:34 +03:00
Mikko Mononen
dfa31dfba2 Fix for #471 
- disable stroke AA gradient when not using AA
 2018-04-18 00:02:16 +03:00
Mikko Mononen
8626a8da5d
Merge pull request #469 from strfry/master 
Use GLES2 glTex[Sub]Image2D code paths also for GL2
 2018-03-30 14:57:30 +03:00
JonathanS
6ce863cc57 Use GLES2 glTex[Sub]Image2D code paths also for GL2 2018-03-29 22:07:56 +02:00
Mikko Mononen
e70a78e42e
Merge pull request #442 from gavinhoward/master 
Mark devicePixelRatio unused in glnvg_renderViewport
 2017-12-19 07:42:19 +02:00
Gavin Howard
5022b370e4
Mark devicePixelRatio unused in glnvg_renderViewport 2017-12-18 16:13:16 -07:00
Mikko Mononen
364911b596
Merge pull request #431 from olliwang/font 
Resets font atlas when it is full.
 2017-11-06 22:49:32 +02:00
Olli Wang
645861c804 Renders glyph’s bitmap data on demand. 
This commit updates font stash to render glyph's bitmap data on demand. This change is intended to fix the issue that `nvgTextBounds()` may return an unreliable result when font atlas is full. This situation usually happens when auto scaling a large font text to fit a small rectangle.

The `fons__getGlyph()` function now accepts a new parameter indicating whether bitmap data is optional, and only `nvgText()` requires it. All of `nvgTextGlyphPositions()`, `nvgTextBreakLines()`, `nvgTextBounds()` and `nvgTextBoxBounds()` functions are changed to work without glyph’s bitmap data.
 2017-11-06 21:03:33 +08:00
Mikko Mononen
98e551351d Merge pull request #412 from AndrewBelt/master 
Only apply fallback if GL_DEPTH24_STENCIL8 is defined
 2017-09-24 12:48:07 +03:00
Andrew Belt
f494937f27 Merge branch 'master' of https://github.com/memononen/nanovg 2017-09-23 10:32:52 -04:00
Andrew Belt
448af072d6 Only apply fallback if GL_DEPTH24_STENCIL8 is defined 2017-09-23 10:32:17 -04:00
Mikko Mononen
52f2d6bf76 Merge pull request #411 from AndrewBelt/master 
Support ~2010 Mac graphics cards (and possibly others) with nvgluCreateFramebuffer patch
 2017-09-22 21:30:32 +03:00