Mikko Mononen
							
						 
						
							
							
							
								
							
								388ea6b8c6 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #164  from floooh/pr_uniform_array_2  
							
							 
							
							 
							
							
								
							
							
							Merge uniforms into a single uniform array 
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Mikko Mononen
							
						 
						
							
							
							
								
							
								4ce074f9b6 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #163  from olliwang/gles_fbo  
							
							 
							
							 
							
							
								
							
							
							Add FBO support for GLES 
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Mikko Mononen
							
						 
						
							
							
							
								
							
								24ae5f0fb9 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #166  from olliwang/pow2check  
							
							 
							
							 
							
							
								
							
							
							Fix for issue #162  
							
						 
						11 years ago  
					 
				
					
						
							
							
								   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. 
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Olli Wang
							
						 
						
							
							
							
								
							
								8e401a5f42 
								
							
								 
							
						 
						
							
							
								
								Fix for issue  #162  
							
							 
							
							
								
							
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Andre Weissflog
							
						 
						
							
							
							
								
							
								aa6751ee4a 
								
							
								 
							
						 
						
							
							
								
								Merge uniforms into a single uniform array, reducing number of glUniform calls.  
							
							 
							
							 
							
							
								
							
							
							Conflicts:
	src/nanovg_gl.h 
							
						 
						11 years ago  
					 
				
					
						
							
							
								   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 
							
						 
						11 years ago  
					 
				
					
						
							
							
								   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 
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Mikko Mononen
							
						 
						
							
							
							
								
							
								64960cf82d 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #148  from pupil-labs/master  
							
							 
							
							 
							
							
								
							
							
							added new graph style 
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Mikko Mononen
							
						 
						
							
							
							
								
							
								dc70bbc3f3 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #156  from floooh/pr_clamp_to_edge  
							
							 
							
							 
							
							
								
							
							
							Fix texture completeness for non-POT textures on GLES2/WebGL 
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Andre Weissflog
							
						 
						
							
							
							
								
							
								e9add93849 
								
							
								 
							
						 
						
							
							
								
								Fix texture completeness for non-POT textures on GLES2/WebGL  
							
							 
							
							
								
							
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Mikko Mononen
							
						 
						
							
							
							
								
							
								9bb72f02bd 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #149  from rockolo/master  
							
							 
							
							 
							
							
								
							
							
							Restore openGL state / unbind buffer 
							
						 
						11 years ago  
					 
				
					
						
							
							
								   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. 
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Moritz Kassner
							
						 
						
							
							
							
								
							
								b112ce00b7 
								
							
								 
							
						 
						
							
							
								
								added new graph style  
							
							 
							
							
								
							
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Mikko Mononen
							
						 
						
							
							
							
								
							
								6b69e7bce0 
								
							
								 
							
						 
						
							
							
								
								Fix for issue  #143  
							
							 
							
							 
							
							
								
							
							
							- removed duplicate call to nvgTextMetrics() 
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Mikko Mononen
							
						 
						
							
							
							
								
							
								bd762f81a6 
								
							
								 
							
						 
						
							
							
								
								Fix for issue  #142  
							
							 
							
							 
							
							
								
							
							
							- set default lineHeight to 1.0 
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Mikko Mononen
							
						 
						
							
							
							
								
							
								646b0a56cc 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #138  from notlion/fix-double-transform  
							
							 
							
							 
							
							
								
							
							
							Set commandx/y before the transform 
							
						 
						11 years ago  
					 
				
					
						
							
							
								   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`. 
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Mikko Mononen
							
						 
						
							
							
							
								
							
								14df146ea1 
								
							
								 
							
						 
						
							
							
								
								Added nvgIntersectScissor()  
							
							 
							
							 
							
							
								
							
							
							- added function to allow to combine scissor rects using intersection 
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Mikko Mononen
							
						 
						
							
							
							
								
							
								f56b9e6c42 
								
							
								 
							
						 
						
							
							
								
								Started projects section  
							
							 
							
							 
							
							
								
							
							
							- added projects section to read me
- added processing API link (issue #135 ) 
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Mikko Mononen
							
						 
						
							
							
							
								
							
								8519f09569 
								
							
								 
							
						 
						
							
							
								
								Changed demos to use types not structs  
							
							 
							
							
								
							
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Mikko Mononen
							
						 
						
							
							
							
								
							
								19f19847fe 
								
							
								 
							
						 
						
							
							
								
								Typedef'd structs.  
							
							 
							
							 
							
							
								
							
							
							- added typedefs for all structs
- fixed some compiler warnings 
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Mikko Mononen
							
						 
						
							
							
							
								
							
								14fe41af89 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #129  from andrewcorrigan/master  
							
							 
							
							 
							
							
								
							
							
							only specify precision for fragment shader 
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Mikko Mononen
							
						 
						
							
							
							
								
							
								d26ddd6c1f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'cmaughan-nanovg_master'  
							
							 
							
							
								
							
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Mikko Mononen
							
						 
						
							
							
							
								
							
								a52c9a1241 
								
							
								 
							
						 
						
							
							
								
								Merged font texture creationg conflict.  
							
							 
							
							
								
							
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Andrew Corrigan
							
						 
						
							
							
							
								
							
								cb5f9cdd50 
								
							
								 
							
						 
						
							
							
								
								spaces --> tabs  
							
							 
							
							
								
							
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Andrew Corrigan
							
						 
						
							
							
							
								
							
								ad1f260b91 
								
							
								 
							
						 
						
							
							
								
								spaces --> tabs  
							
							 
							
							
								
							
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Andrew Corrigan
							
						 
						
							
							
							
								
							
								ad59d66bf0 
								
							
								 
							
						 
						
							
							
								
								only specifies precision for fragment shader, vertex shader defaults to highp as per gles2/gles3 spec  
							
							 
							
							
								
							
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Mikko Mononen
							
						 
						
							
							
							
								
							
								84595438f3 
								
							
								 
							
						 
						
							
							
								
								Fix for issue  #127  
							
							 
							
							 
							
							
								
							
							
							- set stb_image flags so that it loads correct data in iPhone 
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Mikko Mononen
							
						 
						
							
							
							
								
							
								68f9e4b4c4 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #125  from starwing/master  
							
							 
							
							 
							
							
								
							
							
							update upstream stb things. 
							
						 
						11 years ago  
					 
				
					
						
							
							
								   StarWing
							
						 
						
							
							
							
								
							
								5dd2c49fe6 
								
							
								 
							
						 
						
							
							
								
								update upstream stb things.  
							
							 
							
							
								
							
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Mikko Mononen
							
						 
						
							
							
							
								
							
								7d1ec4ddd8 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #123  from starwing/master  
							
							 
							
							 
							
							
								
							
							
							Auto detect and resize text altas texture. 
							
						 
						11 years ago  
					 
				
					
						
							
							
								   StarWing
							
						 
						
							
							
							
								
							
								4712e5b615 
								
							
								 
							
						 
						
							
							
								
								Auto detect and resize text atlas texture.  
							
							 
							
							
								
							
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Mikko Mononen
							
						 
						
							
							
							
								
							
								05f8449978 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #124  from andrewcorrigan/master  
							
							 
							
							 
							
							
								
							
							
							allows for nanovg_gl prototypes to be declared simultaneously 
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Andrew Corrigan
							
						 
						
							
							
							
								
							
								0ffc9d5d4e 
								
							
								 
							
						 
						
							
							
								
								allows for nanovg_gl prototypes to be declared simultaneously for multiple backends  
							
							 
							
							
								
							
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Christopher Maughan
							
						 
						
							
							
							
								
							
								62fccfbaad 
								
							
								 
							
						 
						
							
							
								
								Removed accidental d3d11 project.  
							
							 
							
							
								
							
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Christopher Maughan
							
						 
						
							
							
							
								
							
								101b1a9c3a 
								
							
								 
							
						 
						
							
							
								
								Fixed curlies  
							
							 
							
							
								
							
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Christopher Maughan
							
						 
						
							
							
							
								
							
								a23e6c4818 
								
							
								 
							
						 
						
							
							
								
								Also set the mipmap flag for GL ;)  
							
							 
							
							
								
							
							
						 
						11 years ago  
					 
				
					
						
							
							
								   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. 
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Mikko Mononen
							
						 
						
							
							
							
								
							
								f0b503d9cc 
								
							
								 
							
						 
						
							
							
								
								Font stash: store pref glyph as index instead of pointer  
							
							 
							
							
								
							
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Mikko Mononen
							
						 
						
							
							
							
								
							
								05c8fa29d1 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #120  from sgraham/warnings-attempt-2  
							
							 
							
							 
							
							
								
							
							
							second attempt at avoiding warnings at /W4 on vs2013 
							
						 
						11 years ago  
					 
				
					
						
							
							
								   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 
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Scott Graham
							
						 
						
							
							
							
								
							
								bc136b26c8 
								
							
								 
							
						 
						
							
							
								
								clamp on scissor, fix nvgReset  
							
							 
							
							
								
							
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Scott Graham
							
						 
						
							
							
							
								
							
								aefc9a6104 
								
							
								 
							
						 
						
							
							
								
								use -1 as the 'no scissor' value, rather than 0, so that 0 width still scissors  
							
							 
							
							
								
							
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Scott Graham
							
						 
						
							
							
							
								
							
								c20125c941 
								
							
								 
							
						 
						
							
							
								
								second attempt at avoiding warnings at /W4 on vs2013  
							
							 
							
							
								
							
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Mikko Mononen
							
						 
						
							
							
							
								
							
								ed86765026 
								
							
								 
							
						 
						
							
							
								
								Removed unused mx,my,len  
							
							 
							
							
								
							
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Mikko Mononen
							
						 
						
							
							
							
								
							
								197af889db 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #115  from cforfang/small_fixes  
							
							 
							
							 
							
							
								
							
							
							Memory leak + small fixes 
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Christian Forfang
							
						 
						
							
							
							
								
							
								565fa16265 
								
							
								 
							
						 
						
							
							
								
								Fixed missing void in function with no parameters  
							
							 
							
							
								
							
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Christian Forfang
							
						 
						
							
							
							
								
							
								893f31c318 
								
							
								 
							
						 
						
							
							
								
								Fixed potentially uninitialized local variable warning  
							
							 
							
							
								
							
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Christian Forfang
							
						 
						
							
							
							
								
							
								119f315a75 
								
							
								 
							
						 
						
							
							
								
								Fixed memory leak  
							
							 
							
							
								
							
							
						 
						11 years ago