d9e8daf46f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #333  from olliwang/font  
							
							Fixes the bug that text may not render correctly. 
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								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. 
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								a367dcf163 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #331  from olliwang/CJK  
							
							Improves to display CJK characters with English words. 
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								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. 
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								84e848d1e9 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #330  from olliwang/CJK  
							
							Fixes line breaks for CJK characters. 
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								2ed5c0e010 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #329  from lieff/master  
							
							handle file IO error 
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								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. 
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								ecb5899bcf 
								
							
								 
							
						 
						
							
							
								
								handle file IO error  
							
							
								
							
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								3110d5fba1 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #316  from xeekworx/master  
							
							nvgRoundedRectEx for varying corner radii 
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								2331f1ff11 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/memononen/nanovg  
							
							
								
							
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								d68da77299 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/xeekworx/nanovg  
							
							Conflicts:
	src/nanovg.h 
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								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 .  
							
							
								
							
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								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 .  
							
							
								
							
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								7859321aa8 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #317  from olliwang/coordinate  
							
							Fixes a bug when applying `NVG_IMAGE_FLIPY`. 
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								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. 
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								b2d9eb251b 
								
							
								 
							
						 
						
							
							
								
								Added nvgRoundedRectEx so that the rectangle's corners can have varying radii. nvgRoundRect changed to utilize nvgRoundedRectEx.  
							
							
								
							
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								af0c475cf9 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #311  from dimsuz/gl2_image_handle_fix  
							
							Rename nvglImageFromHandleGL2 -> nvglImageHandleGL2 
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								23128bdb58 
								
							
								 
							
						 
						
							
							
								
								Rename nvglImageFromHandleGL2 -> nvglImageHandleGL2  
							
							There was no nvglImageFromHandleGL2 implementation, it must have been
an error during some refactoring 
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								4f255e0daf 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #307  from olliwang/blend  
							
							Fallbacks to default composite operation when invalid one is specified. 
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								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. 
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								189e051527 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #303  from olliwang/freetype  
							
							Fixes the kerning value for freetype. 
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								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. 
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								c02bc9d5ed 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #301  from olliwang/font  
							
							Support fallback fonts (code refactoring for #299 ) 
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								c97444c96f 
								
							
								 
							
						 
						
							
							
								
								Code refactoring for  #299 .  
							
							This commit fixes the formats as suggested in #299  and fixes stack overflow when using `freetype` backend. 
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								40e999af3c 
								
							
								 
							
						 
						
							
							
								
								Support fallback fonts  
							
							
								
							
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								71774e0afe 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #298  from olliwang/blend  
							
							Implements composite operation for blending renderings. 
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								09dc767e3f 
								
							
								 
							
						 
						
							
							
								
								Updates comment for composite operation.  
							
							
								
							
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								9490a8c188 
								
							
								 
							
						 
						
							
							
								
								Updates comment again.  
							
							
								
							
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								ba8272c5b5 
								
							
								 
							
						 
						
							
							
								
								Updates comments.  
							
							
								
							
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								1d856c1b00 
								
							
								 
							
						 
						
							
							
								
								Changes the order of declaration.  
							
							
								
							
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								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) 
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								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. 
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								25f39a60a8 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #297  from olliwang/bgfx  
							
							Add support for bgfx 
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								1664a524a7 
								
							
								 
							
						 
						
							
							
								
								Passes the device pixel ratio parameter to `renderViewport` function.  
							
							This commit updates the `nvgBeginFrame()` function to forward the received `devicePixelRatio` parameter to the `renderViewport()` function so it is possible to configure the environemnt correctly when using `bgfx` backend. 
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								cc3897359a 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #295  from nhojb/master  
							
							Fixing clang compiler warnings. 
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								1efdf2a1de 
								
							
								 
							
						 
						
							
							
								
								Fixing clang compiler warnings.  
							
							
								
							
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								c80af94c07 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #283  from JinShil/patch-1  
							
							Fix typo in nvgCreateFontMem() description 
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								df658f97a2 
								
							
								 
							
						 
						
							
							
								
								Fix typo in nvgCreateFontMem description  
							
							
								
							
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								b83cf92652 
								
							
								 
							
						 
						
							
							
								
								Fixed use of nvglImageHandlexx in GL utils from earlier PR  
							
							- nvglImageHandle was changes to contain GL postfix, changed GL utils
to use that too
- fixed silly failure check bug in FBO demo 
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								2504509fb2 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #261  from reFX-Mike/master  
							
							Fixed fontstash.h crashing 
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								3321379e49 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #201  from andrewcorrigan/master  
							
							Fix for issue #172  
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								f43a7a7790 
								
							
								 
							
						 
						
							
							
								
								Replace malloc.h with stdlib.h  
							
							
								
							
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								6245376103 
								
							
								 
							
						 
						
							
							
								
								Increased SCRATCH_FONS_SCRATCH_BUF_SIZE to 64000  
							
							
								
							
							
						 
						9 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								cb6fd9100d 
								
							
								 
							
						 
						
							
							
								
								Added glUniformBlockBinding to touched state  
							
							
								
							
							
						 
						10 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								504060e52a 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #238  from plasmacel/master  
							
							fixed type usage 
							
						 
						10 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								b7a4792291 
								
							
								 
							
						 
						
							
							
								
								fixed type usage  
							
							in some situations int and GLsizei is not the same type which leads to conversion warnings 
							
						 
						10 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								6ae087333d 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #226  from olliwang/framebuffer  
							
							Improve the use of NVGLUframebuffer. 
							
						 
						10 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								32db574853 
								
							
								 
							
						 
						
							
							
								
								Improve the use of NVGLUframebuffer.  
							
							The `NVGLUframebuffer` structure contains a `ctx` member but was actually never used. This commit takes advantage of the `ctx` property so there is no need to keep the reference of the context elsewhere after calling `nvgluCreateFramebuffer()`, or it would add difficulty for maintenance. As a result, the `nvgluDeleteFramebuffer()` function only needs to take one `NVGLUframebuffer` instance as the parameter. 
							
						 
						10 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								1de6fa5cdd 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #207  from alexbrazier/patch-1  
							
							Fix spelling mistake in readme 
							
						 
						10 years ago  
				
					
						
							
							
								 
						
							
							
							
								
							
								01141b2e88 
								
							
								 
							
						 
						
							
							
								
								Fix spelling mistake in readme  
							
							
								
							
							
						 
						10 years ago