memononen/nanovg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
341 Commits 1 Branch 0 Tags
Commit Graph

341 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mikko Mononen
cab10c7c0f Merge pull request #170 from olliwang/static 
Fixed syntax error of checking defined identifier
 2014-09-16 16:24:05 +03:00
Olli Wang
2300bf3594 Fixed syntax error of checking defined identifier 
The syntax is wrong when checking defined identifier.
 2014-09-16 21:10:58 +08:00
Mikko Mononen
bf29db7d60 Merge pull request #169 from olliwang/cancel 
Added nvgCancelFrame()
 2014-09-16 12:00:45 +03:00
Olli Wang
c120079425 Added nvgCancelFrame() 
This commit implements a new nvgCancelFrame() function for the purpose described in #168.

Currently, if calling nvgBeginFrame(), the nvgEndFrame() function must be called to finish the drawing. However, if knowing the drawing would take too much time and want to give up the drawing. There is no way to cancel it. nvgCancelFrame() gives another choice to end the frame without actually drawing.
 2014-09-16 13:02:13 +08:00
Mikko Mononen
388ea6b8c6 Merge pull request #164 from floooh/pr_uniform_array_2 
Merge uniforms into a single uniform array
 2014-09-05 10:09:58 +03:00
Mikko Mononen
4ce074f9b6 Merge pull request #163 from olliwang/gles_fbo 
Add FBO support for GLES
 2014-09-04 23:17:51 +03:00
Mikko Mononen
24ae5f0fb9 Merge pull request #166 from olliwang/pow2check 
Fix for issue #162
 2014-09-04 23:16:19 +03:00
Olli Wang
2cee1c0f93 Add FBO support for GLES 
To support FBO for iOS, the current framebuffer and renderbuffer must be restored after calling nvgluCreateFramebuffer(). The framebuffer should also be restored when calling nvgluBindFramebuffer(NULL) as well.
 2014-09-05 03:48:01 +08:00
Olli Wang
8e401a5f42 Fix for issue #162 2014-09-05 03:35:40 +08:00
Andre Weissflog
4aadf46465 Don't set redundant GL state (glBindTexture, glStencilFunc, glStencilMask) 2014-09-04 21:12:27 +02:00
Andre Weissflog
aa6751ee4a Merge uniforms into a single uniform array, reducing number of glUniform calls. 
Conflicts:
	src/nanovg_gl.h
 2014-09-04 20:18:58 +02:00
Mikko Mononen
994b60b83f Moved image repeat (tiling) from pattern to image creation 
- API changed!
- moved image repeat from nvgImagePattern() into image creation
nvgCreateImage*()
- made flip-y and premultiplied common image flags (not just GL)
- removed nvglImageFlags(), flags passed in via
nvglCreateImageFromHandle() flags
- nvgluCreateFramebuffer takes image flags as param
 2014-09-02 21:57:59 +03:00
Mikko Mononen
96f08f4ca4 Fix for issue #155 
- added NVG_DEBUG which can be used to omit calls to glGetError()
- removed return value for glnvg__checkError
- create flag defines to enum
 2014-09-02 20:58:17 +03:00
Mikko Mononen
64960cf82d Merge pull request #148 from pupil-labs/master 
added new graph style
 2014-09-02 19:54:49 +03:00
Mikko Mononen
dc70bbc3f3 Merge pull request #156 from floooh/pr_clamp_to_edge 
Fix texture completeness for non-POT textures on GLES2/WebGL
 2014-09-02 19:54:12 +03:00
Andre Weissflog
e9add93849 Fix texture completeness for non-POT textures on GLES2/WebGL 2014-08-30 14:06:44 +02:00
Mikko Mononen
9bb72f02bd Merge pull request #149 from rockolo/master 
Restore openGL state / unbind buffer
 2014-08-27 06:59:49 +03:00
Philipp Rockel
697bfd824d Restore openGL state / unbind buffer 
These changes make it possible to integrate nanoVG into other openGL libraries like Cinder and openFrameworks and be able to draw afterwards.
 2014-08-26 17:06:12 -04:00
Moritz Kassner
b112ce00b7 added new graph style 2014-08-26 09:00:25 +02:00
Mikko Mononen
6b69e7bce0 Fix for issue #143 
- removed duplicate call to nvgTextMetrics()
 2014-07-30 17:57:09 +03:00
Mikko Mononen
bd762f81a6 Fix for issue #142 
- set default lineHeight to 1.0
 2014-07-30 17:54:29 +03:00
Mikko Mononen
646b0a56cc Merge pull request #138 from notlion/fix-double-transform 
Set commandx/y before the transform
 2014-07-17 12:49:46 +03:00
Ryan Alexander
312052816e Set commandx/y before the transform 
This prevents commands like `nvgQuadTo` and `nvgArcTo` from double-transforming the previous point when they pass it back to `nvg__appendCommands`.
 2014-07-17 02:09:12 -07:00
Mikko Mononen
14df146ea1 Added nvgIntersectScissor() 
- added function to allow to combine scissor rects using intersection
 2014-07-13 13:30:54 +03:00
Mikko Mononen
f56b9e6c42 Started projects section 
- added projects section to read me
- added processing API link (issue #135)
 2014-07-11 19:23:30 +03:00
Mikko Mononen
8519f09569 Changed demos to use types not structs 2014-07-11 19:21:19 +03:00
Mikko Mononen
19f19847fe Typedef'd structs. 
- added typedefs for all structs
- fixed some compiler warnings
 2014-07-11 19:16:03 +03:00
Mikko Mononen
14fe41af89 Merge pull request #129 from andrewcorrigan/master 
only specify precision for fragment shader
 2014-07-11 18:45:26 +03:00
Mikko Mononen
d26ddd6c1f Merge branch 'cmaughan-nanovg_master' 2014-07-11 18:39:26 +03:00
Mikko Mononen
a52c9a1241 Merged font texture creationg conflict. 2014-07-11 18:39:10 +03:00
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