Commit Graph

411 Commits (master)

Author SHA1 Message Date
Andrew Corrigan cb5f9cdd50 spaces --> tabs 2014-06-27 09:21:42 -04:00
Andrew Corrigan ad1f260b91 spaces --> tabs 2014-06-27 09:20:45 -04:00
Andrew Corrigan ad59d66bf0 only specifies precision for fragment shader, vertex shader defaults to highp as per gles2/gles3 spec 2014-06-27 08:10:45 -04:00
Mikko Mononen 84595438f3 Fix for issue #127
- set stb_image flags so that it loads correct data in iPhone
2014-06-27 10:45:06 +03:00
Mikko Mononen 68f9e4b4c4 Merge pull request #125 from starwing/master
update upstream stb things.
2014-06-22 12:02:52 +03:00
StarWing 5dd2c49fe6 update upstream stb things. 2014-06-22 16:52:05 +08:00
Mikko Mononen 7d1ec4ddd8 Merge pull request #123 from starwing/master
Auto detect and resize text altas texture.
2014-06-22 11:49:13 +03:00
StarWing 4712e5b615 Auto detect and resize text atlas texture. 2014-06-22 16:41:19 +08:00
Mikko Mononen 05f8449978 Merge pull request #124 from andrewcorrigan/master
allows for nanovg_gl prototypes to be declared simultaneously
2014-06-22 11:10:56 +03:00
Andrew Corrigan 0ffc9d5d4e allows for nanovg_gl prototypes to be declared simultaneously for multiple backends 2014-06-21 19:53:47 -04:00
Christopher Maughan 62fccfbaad Removed accidental d3d11 project. 2014-06-21 11:20:20 +01:00
Christopher Maughan 101b1a9c3a Fixed curlies 2014-06-21 11:13:28 +01:00
Christopher Maughan a23e6c4818 Also set the mipmap flag for GL ;) 2014-06-21 11:07:05 +01:00
Christopher Maughan b79ab71a71 Added mipmap generation option - useful for clients that need images with mipmaps for better quality scaling.
Tweaked premake to remove some windows warnings.
2014-06-21 10:38:25 +01: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