Commit graph

198 commits

Author SHA1 Message Date
Andrew Corrigan
0ffc9d5d4e allows for nanovg_gl prototypes to be declared simultaneously for multiple backends 2014-06-21 19:53:47 -04:00
Mikko Mononen
f0b503d9cc Font stash: store pref glyph as index instead of pointer 2014-06-21 12:06:40 +03:00
Mikko Mononen
05c8fa29d1 Merge pull request #120 from sgraham/warnings-attempt-2
second attempt at avoiding warnings at /W4 on vs2013
2014-06-20 20:13:20 +03:00
Mikko Mononen
b8e981bc3f Merge pull request #121 from sgraham/zero-w-scissor
use -1 as the 'no scissor' value, rather than 0, so that 0 width still scissors
2014-06-20 20:10:21 +03:00
Scott Graham
bc136b26c8 clamp on scissor, fix nvgReset 2014-06-20 08:54:13 -07:00
Scott Graham
aefc9a6104 use -1 as the 'no scissor' value, rather than 0, so that 0 width still scissors 2014-06-19 17:40:53 -07:00
Scott Graham
c20125c941 second attempt at avoiding warnings at /W4 on vs2013 2014-06-19 17:34:10 -07:00
Mikko Mononen
ed86765026 Removed unused mx,my,len 2014-06-17 11:27:11 +03:00
Mikko Mononen
197af889db Merge pull request #115 from cforfang/small_fixes
Memory leak + small fixes
2014-06-17 10:50:37 +03:00
Christian Forfang
565fa16265 Fixed missing void in function with no parameters 2014-06-15 19:41:57 +02:00
Christian Forfang
893f31c318 Fixed potentially uninitialized local variable warning 2014-06-15 19:33:38 +02:00
Christian Forfang
119f315a75 Fixed memory leak 2014-06-15 19:29:27 +02:00
Mikko Mononen
0c7feda665 Changed not used macro from do {} while(0), to for(;;) { ... break; } 2014-06-15 11:32:27 +03:00
Mikko Mononen
ec2dfba0f1 Removed unused mu variable 2014-06-15 11:29:34 +03:00
Mikko Mononen
ff96ef9565 Merge pull request #104 from starwing/master
fix nvgCreateImageFromHandle for GLES2/3.
2014-06-15 11:28:57 +03:00
Mikko Mononen
c648e0dcf1 Fix for issue #108
- fixed stroke cap tessellation amount calculation
2014-06-15 11:23:09 +03:00
Mikko Mononen
a98d17cf24 Fix for issue #111
- added nvgQuadTo, draws quadratic bezier curve segment
2014-06-15 11:19:22 +03:00
Mikko Mononen
709475c513 API changed! Fixed slowdown, Shader uses premultiplied colors
- all colors in the shader is handled as premultiplied
- removed alphaBlend param from nvgBeginFrame(), it became obsolete
- added NVGL_TEXTURE_PREMULTIPLIED flag
- separated FBO example
- FBOs are treated as premultipied for correct alpha
- changed FBO storage from depth/stencil 24/8 to stencil 8
- moved discard to end of shader which restores the render speed again
2014-06-15 11:08:12 +03:00
StarWing
9b8de47d79 fix nvgCreateImageFromHandle for GLES2/3. 2014-06-10 15:01:25 +08:00
Mikko Mononen
0dbf53ebad Updated screenshot 2014-06-09 20:10:37 +03:00
Mikko Mononen
0ae3a54bce Added links to nanovg ports 2014-06-09 19:47:39 +03:00
Mikko Mononen
003561e721 Fix for issue #92
- added (optional) 3-pass stencil trick to stroke rendering, reduces
overdraw artifacts, a little slower
- fixed some text bounds issues
2014-06-09 15:53:26 +03:00
Mikko Mononen
83c876b9a8 Made FBO helper to work on OSX when using GL2 2014-06-08 20:27:14 +03:00
Mikko Mononen
84bec2962e Fix for issue #95
- Added alpha for images
- Added global alpha
2014-06-08 15:10:40 +03:00
Mikko Mononen
f0994aee92 Fix for issue #100
- fixed glyph position bounds for whitespace
2014-06-08 14:19:17 +03:00
Mikko Mononen
7a06c56edb Fixes and tweaks for frame buffer handling
- fixed flags setup in nvglCreateImageFromHandle
- changed frame buffer to only compile on GL3
- changed nvgluCreateFramebuffer() to return FBO struct instead of
filling existing one (for consistency)
2014-06-08 13:56:58 +03:00
Mikko Mononen
43a8dcc981 Merge pull request #101 from starwing/master
add external APIs to GL backend to get native Texture Id.
2014-06-08 13:13:55 +03:00
Mikko Mononen
adb7528ed3 Merge pull request #93 from jacereda/master
Relax stroke width limit
2014-06-08 13:10:14 +03:00
Mikko Mononen
59030bf722 Separated fill and store expansion code 2014-06-08 13:07:08 +03:00
Mikko Mononen
7a576015e4 Merge pull request #102 from notlion/gles-highp
Use highp precision when available for GLES
2014-06-08 11:12:15 +03:00
Ryan Alexander
fa12dd899b Use highp precision when available for GLES 2014-06-07 20:30:55 -07:00
StarWing
bea097165b add external APIs to GL backend to get native Texture Id. 2014-06-08 01:48:01 +08:00
Jorge Acereda
0957a7763f Merge upstream/master 2014-06-05 23:48:52 +02:00
Mikko Mononen
bf2037a426 Fix for issue #94
- bezier tessellation was using second control point instead of last
point in error calculation
2014-06-05 18:57:59 +03:00
Jorge Acereda
6a96f91abf Relax stroke width limit 2014-06-03 23:44:04 +02:00
Mikko Mononen
ec53dd417d Merge pull request #89 from cforfang/alignment_fix_2
Explicit cast to make C++ compilers happy
2014-05-28 20:43:33 +03:00
Christian Forfang
7b567dacc5 Explicit cast to make C++ compilers happy 2014-05-28 19:18:22 +02:00
Mikko Mononen
1da366c239 Fix for issue #82
- fixed basic shape windings
- clamp radius of rounded rect so that it behaves nicely when squashed
2014-05-24 20:05:44 +03:00
Mikko Mononen
effe1a5fce Fix for issue #81
- use regular uniforms for once-per-frame values
- set tex sampler when using NANOVG_GL_USE_UNIFORMBUFFER
2014-05-23 09:55:38 +03:00
Mikko Mononen
44c168b84e Fix for issue #75
- fixed copy/paste bug in bevel calculations
2014-05-23 09:42:42 +03:00
Mikko Mononen
611b043fff Fix for issue #77
- line caps did not consider AA width
2014-05-23 09:37:36 +03:00
Mikko Mononen
4ee8aa9cde Merge pull request #87 from Nairou/master
Made FreeType support a bit clearer
2014-05-22 16:59:45 +03:00
Caleb Gingles
c80df84140 Made FreeType support a bit clearer 2014-05-22 09:53:02 -04:00
Mikko Mononen
42afd62df2 Merge pull request #86 from Ziflin/master
Removed GL_BLEND disable and enable inside glnvg__fill() to prevent performance warning.
2014-05-22 08:20:17 +03:00
Douglas Cox
eff24cc040 Removed GL_BLEND disable and enable inside glnvg__fill() to prevent performance warning:
"Fragment Shader is going to be recompiled because the shader key based on GL state mismatches."
2014-05-21 17:47:57 -04:00
Mikko Mononen
2b35f5f306 Merge pull request #85 from cforfang/alignment_fix_2
Make sure fons__tmpalloc returns a 16-byte aligned pointer
2014-05-21 23:13:47 +03:00
Christian Forfang
15c963f8b5 Make sure fons__tmpalloc returns a 16-byte aligned pointer 2014-05-21 22:09:19 +02:00
Mikko Mononen
02ca24ad75 Fix to update alloc count after successful alloc 2014-05-03 12:17:27 +03:00
Mikko Mononen
3f37dccb29 Fix for issue #78
- use one not used macro for all
2014-05-03 12:05:58 +03:00
Mikko Mononen
7f55decf8f More error checking on allocations
- changed remainder of allocations to follow same 1.5x patters
- do not leak memory when realloc() fails
- added error handling in case allocations fail
2014-05-03 11:56:26 +03:00