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

155 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mikko Mononen
857d2efe45 Small addition to debug hints 2014-04-01 16:35:29 +03:00
Mikko Mononen
885844a845 Added quick hints on how to debug rendering issues 2014-04-01 16:33:49 +03:00
Mikko Mononen
b47f256607 Updated fontstash 2014-03-23 20:40:32 +02:00
Mikko Mononen
8695be3216 Update README.md 2014-03-16 18:27:14 +02:00
Mikko Mononen
6a4cb80891 Merge pull request #50 from devnought/dev 
Variable initialization, unused var removal, and casts.
 2014-03-09 21:00:46 +02:00
Mikko Mononen
0262883c55 Fixes for AA on retina, a bit finer tessellation 
- changed tessellation threshold from 0.3 to 0.25
- fixed scissor AA on retina
- fixed stroke AA on retina
 2014-03-09 20:55:23 +02:00
Kyle Gretchev
db5c78fb00 Variable initialization, unused var removal, and casts. 
Removed some unused variables to silence compiler warnings, initialized
variables to 0, added varialbe casts to silence additional compiler
warnings.
 2014-03-09 14:22:39 -04:00
Mikko Mononen
8b55ae414e Improved miter and bevel line joins 2014-03-09 19:46:59 +02:00
Mikko Mononen
22e58d6d83 Merged latest changes from fontstash 
- merged font stash optional FreeType support
 2014-02-26 12:28:29 +02:00
Mikko Mononen
ba3c0cbce1 Fix for issue #40: Added support to render using premultiplied alpha 
- added support to take screen shots
- added support to render to frame buffer using premultiplied alpha
- fixed spelling NVGaling -> NVGalign
 2014-02-25 22:53:46 +02:00
Mikko Mononen
51c7d9fc6b Merge pull request #39 from SirSlaxalot/master 
fixed error return value
 2014-02-23 13:04:12 +02:00
Sebastian Wagner
7013386026 fixed error return value 2014-02-22 21:07:06 +01:00
Mikko Mononen
5de5c1d2a0 Improve stroke rendering 
- added better logic for inner bevels
- tweaks to reduce overdraw at edges
- fixed convex shape logic
 2014-02-20 23:00:31 +02:00
Mikko Mononen
53ae1d0804 Merge pull request #38 from andrewcorrigan/master 
reduces warnings
 2014-02-20 20:17:11 +02:00
Andrew Corrigan
38bb65617e reduces warnings 2014-02-20 11:44:01 -05:00
Mikko Mononen
2d11c2ee8a Merge pull request #36 from dougbinks/master 
Reset pixel storage settings after load texture.
 2014-02-19 23:04:32 +02:00
Doug Binks
5d8e63c81c Another reset pixel storage settings after load texture. 2014-02-19 22:01:46 +01:00
Doug Binks
a5965635a6 Reset pixel storage settings after load texture. 2014-02-19 21:53:22 +01:00
Mikko Mononen
9d51cb6818 Update windows build settings as discussed in issue #24 2014-02-19 21:26:34 +02:00
Mikko Mononen
677c85668e Merge pull request #35 from Nairou/master 
Improve VC support
 2014-02-19 08:30:33 +02:00
Caleb Gingles
fbdc947802 Improve VC support 2014-02-18 16:53:48 -05:00
Mikko Mononen
7f07b7953c Merge pull request #34 from Nairou/patch-1 
Remaining change for VC support
 2014-02-18 22:53:02 +02:00
Caleb Gingles
731cb55221 Update nanovg.c 2014-02-18 15:41:10 -05:00
Mikko Mononen
99bd7b358e Moving variables at top of blocks for better VC support 2014-02-18 22:17:30 +02:00
Mikko Mononen
aaafbd32c6 Renamed FPScounter to PerfGraph 
- Renamed FPScounter to PerfGraph
- dump avg times at exit
 2014-02-18 21:51:28 +02:00
Mikko Mononen
1517841023 Performance timer tweaks 
- moved performance counter and drawing to separate file
- tweaks to performance drawing
 2014-02-18 21:40:52 +02:00
Mikko Mononen
0c6d5d3702 Added NVG_ANTIALIAS into read me, commented line cap/join 2014-02-18 19:39:43 +02:00
Mikko Mononen
31f8f6075c Merge pull request #33 from dougbinks/timing 
Support for cases where the gl header does not include GL_ARB_TIMER_QUERY
 2014-02-18 19:38:54 +02:00
Mikko Mononen
9ad2fa14ae Merge pull request #32 from jtilander/master 
Quick guard against NULL ptr dereference of texture type on CPU side
 2014-02-18 19:37:39 +02:00
Doug Binks
fe22b8c07d Support for cases where the gl header does not include GL_ARB_TIMER_QUERY 2014-02-18 18:17:09 +01:00
Jim Tilander
683785dbfa Quick guard against NULL ptr dereference of texture type on CPU side 2014-02-18 08:17:56 -08:00
Mikko Mononen
cdca70aea5 Merge pull request #31 from dougbinks/timing 
Timing for CPU inner frame and GPU inner frame added
 2014-02-18 17:10:46 +02:00
Doug Binks
7d6058c572 Changed name of new functionality to keep other examples compiling. 2014-02-18 15:45:41 +01:00
Doug Binks
e21683f14e Added name to timer render. 2014-02-18 15:32:04 +01:00
Doug Binks
a1e99ea940 Bug fix for index into queries. 2014-02-18 13:32:55 +01:00
Doug Binks
bb6b19c410 Added GPU timer and fixed up formatting. 2014-02-18 12:26:41 +01:00
Doug Binks
a63854859e Added an inner frame CPU timer. 
Needs names for the UI components to distinguish them, and probably stacking vertically for easier comparison.
 2014-02-18 11:38:55 +01:00
Mikko Mononen
b043187a51 gl3buf refactoring 
- implemented missing scissor from draw triangles
- buffer a whole frame of uniforms
- moved paint to uniform conversion earlier
- simplified render loops and data structures
- renamed bunch of things
- combined shaders, use define to disable AA
 2014-02-17 22:11:28 +02:00
Mikko Mononen
85fb384a3d UBO fixes 
- correct fix for ubo memroy allocation (use returned alignment instead
of struct size)
- separated convex fill to own command type
- moved uboPos to call struct
 2014-02-17 18:20:00 +02:00
Mikko Mononen
3b8c63b6d5 Fixed bug on ubo allocation, formatting fixes 2014-02-17 17:01:28 +02:00
Mikko Mononen
3bc6c53ebd Merge pull request #29 from devnought/dev 
Added glMapBuffer cast
 2014-02-17 10:39:24 +02:00
Kyle Gretchev
fa8d2a9d03 Added glMapBuffer cast 
Cast void* to char* to remove compiler warning in C++ project in VS2013
 2014-02-17 03:15:08 -05:00
Mikko Mononen
79c0746285 Merge pull request #28 from jtilander/master 
Fixed some warnings with MS compiler
 2014-02-17 09:30:01 +02:00
Mikko Mononen
24b51f1d63 Merge pull request #27 from dougbinks/develop2 
Moved nanovg_gl3buf.h to uniform buffers
 2014-02-17 08:31:31 +02:00
Mikko Mononen
4a1e66a515 Do bevels only at control points 2014-02-17 08:30:51 +02:00
Mikko Mononen
0ec2be7a6c Added support for line caps and joins 2014-02-17 00:25:26 +02:00
Jim Tilander
8e434b0467 Fixed some warnings with MS compiler 2014-02-16 14:17:13 -08:00
Doug Binks
16ff847c0f Move to using uniform buffer objects for fragment shader, which is set once per frame. 2014-02-16 22:19:06 +01:00
Doug Binks
4a51b78069 Merge branch 'master' of https://github.com/memononen/nanovg into develop2 2014-02-16 17:59:02 +01:00
Doug Binks
ddf95cef5f Corrected some spaces to tabs. 2014-02-16 17:56:34 +01:00