feff7d2d77
Draw thick-stroked Beziers by computing the outset quadratic, measuring the error, and subdividing until the error is within a predetermined limit. To try this CL out, change src/core/SkStroke.h:18 to #define QUAD_STROKE_APPROXIMATION 1 or from the command line: CPPFLAGS="-D QUAD_STROKE_APPROXIMATION=1" ./gyp_skia Here's what's in this CL: bench/BezierBench.cpp : a microbench for examining where the time is going gm/beziers.cpp : random Beziers with various thicknesses gm/smallarc.cpp : a distillation of bug skia:2769 samplecode/SampleRotateCircles.cpp : controls added for error, limit, width src/core/SkStroke.cpp : the new stroke implementation (disabled) tests/StrokerTest.cpp : a stroke torture test that checks normal and extreme values The new stroke algorithm has a tweakable parameter: stroker.setError(1); (SkStrokeRec.cpp:112) The stroke error is the allowable gap between the midpoint of the stroke quadratic and the center Bezier. As the projection from the quadratic approaches the endpoints, the error is decreased proportionally so that it is always inside the quadratic curve. An overview of how this works: - For a given T range of a Bezier, compute the perpendiculars and find the points outset and inset for some radius. - Construct tangents for the quadratic stroke. - If the tangent don't intersect between them (may happen with cubics), subdivide. - If the quadratic stroke end points are close (again, may happen with cubics), draw a line between them. - Compute the quadratic formed by the intersecting tangents. - If the midpoint of the quadratic is close to the midpoint of the Bezier perpendicular, return the quadratic. - If the end of the stroke at the Bezier midpoint doesn't intersect the quad's bounds, subdivide. - Find where the Bezier midpoint ray intersects the quadratic. - If the intersection is too close to the quad's endpoints, subdivide. - If the error is large proportional to the intersection's distance to the quad's endpoints, subdivide. BUG=skia:723,skia:2769 Review URL: https://codereview.chromium.org/558163005
247 lines
8.2 KiB
Python
247 lines
8.2 KiB
Python
# include this gypi to include all the golden master slides.
|
|
{
|
|
'include_dirs': [
|
|
'../gm',
|
|
# include dirs needed by particular GMs
|
|
'../src/utils/debugger',
|
|
'../src/images',
|
|
'../src/lazy',
|
|
],
|
|
'conditions': [
|
|
# If we're building SampleApp on the bots, no need to link in the GM slides.
|
|
# We're not going to run it; we're only making sure it still builds.
|
|
# It'd be nice to do this in SampleApp.gypi, but I can't find a way to make it work.
|
|
[ 'not ("<(_target_name)" == "SampleApp" and skia_is_bot)', {
|
|
'sources': [
|
|
'../gm/aaclip.cpp',
|
|
'../gm/aarectmodes.cpp',
|
|
'../gm/alphagradients.cpp',
|
|
'../gm/arcofzorro.cpp',
|
|
'../gm/arithmode.cpp',
|
|
'../gm/astcbitmap.cpp',
|
|
'../gm/beziereffects.cpp',
|
|
'../gm/beziers.cpp',
|
|
'../gm/bigblurs.cpp',
|
|
'../gm/bigmatrix.cpp',
|
|
'../gm/bigtext.cpp',
|
|
'../gm/bitmapcopy.cpp',
|
|
'../gm/bitmapmatrix.cpp',
|
|
'../gm/bitmapfilters.cpp',
|
|
'../gm/bitmappremul.cpp',
|
|
'../gm/bitmaprect.cpp',
|
|
'../gm/bitmaprecttest.cpp',
|
|
'../gm/bitmapscroll.cpp',
|
|
'../gm/bitmapshader.cpp',
|
|
'../gm/bitmapsource.cpp',
|
|
'../gm/bleed.cpp',
|
|
'../gm/blurcircles.cpp',
|
|
'../gm/blurs.cpp',
|
|
'../gm/blurquickreject.cpp',
|
|
'../gm/blurrect.cpp',
|
|
'../gm/blurroundrect.cpp',
|
|
'../gm/circles.cpp',
|
|
'../gm/circularclips.cpp',
|
|
'../gm/clip_strokerect.cpp',
|
|
'../gm/clippedbitmapshaders.cpp',
|
|
'../gm/colorcube.cpp',
|
|
'../gm/coloremoji.cpp',
|
|
'../gm/colorfilterimagefilter.cpp',
|
|
'../gm/colorfilters.cpp',
|
|
'../gm/colormatrix.cpp',
|
|
'../gm/colortype.cpp',
|
|
'../gm/complexclip.cpp',
|
|
'../gm/complexclip2.cpp',
|
|
'../gm/composeshader.cpp',
|
|
#'../gm/conicpaths.cpp',
|
|
'../gm/convexpaths.cpp',
|
|
'../gm/convexpolyclip.cpp',
|
|
'../gm/convexpolyeffect.cpp',
|
|
'../gm/copyTo4444.cpp',
|
|
'../gm/cubicpaths.cpp',
|
|
'../gm/cmykjpeg.cpp',
|
|
'../gm/degeneratesegments.cpp',
|
|
'../gm/discard.cpp',
|
|
'../gm/dashcubics.cpp',
|
|
'../gm/dashing.cpp',
|
|
'../gm/distantclip.cpp',
|
|
'../gm/dftext.cpp',
|
|
'../gm/displacement.cpp',
|
|
'../gm/downsamplebitmap.cpp',
|
|
'../gm/drawbitmaprect.cpp',
|
|
'../gm/drawlooper.cpp',
|
|
'../gm/dropshadowimagefilter.cpp',
|
|
'../gm/drrect.cpp',
|
|
'../gm/etc1bitmap.cpp',
|
|
'../gm/extractbitmap.cpp',
|
|
'../gm/emboss.cpp',
|
|
'../gm/emptypath.cpp',
|
|
'../gm/fatpathfill.cpp',
|
|
'../gm/factory.cpp',
|
|
'../gm/filltypes.cpp',
|
|
'../gm/filltypespersp.cpp',
|
|
'../gm/filterbitmap.cpp',
|
|
'../gm/filterindiabox.cpp',
|
|
'../gm/fontcache.cpp',
|
|
'../gm/fontmgr.cpp',
|
|
'../gm/fontscaler.cpp',
|
|
'../gm/gammatext.cpp',
|
|
'../gm/getpostextpath.cpp',
|
|
'../gm/giantbitmap.cpp',
|
|
'../gm/glyph_pos.cpp',
|
|
'../gm/glyph_pos_align.cpp',
|
|
'../gm/gradients.cpp',
|
|
'../gm/gradients_2pt_conical.cpp',
|
|
'../gm/gradients_no_texture.cpp',
|
|
'../gm/gradientDirtyLaundry.cpp',
|
|
'../gm/gradient_matrix.cpp',
|
|
'../gm/gradtext.cpp',
|
|
'../gm/hairlines.cpp',
|
|
'../gm/hairmodes.cpp',
|
|
'../gm/hittestpath.cpp',
|
|
'../gm/imagealphathreshold.cpp',
|
|
'../gm/imageblur.cpp',
|
|
'../gm/imageblur2.cpp',
|
|
'../gm/imageblurtiled.cpp',
|
|
'../gm/imagemagnifier.cpp',
|
|
'../gm/imageresizetiled.cpp',
|
|
'../gm/inversepaths.cpp',
|
|
'../gm/lerpmode.cpp',
|
|
'../gm/lighting.cpp',
|
|
'../gm/lumafilter.cpp',
|
|
'../gm/image.cpp',
|
|
'../gm/imagefiltersbase.cpp',
|
|
'../gm/imagefiltersclipped.cpp',
|
|
'../gm/imagefilterscropped.cpp',
|
|
'../gm/imagefilterscropexpand.cpp',
|
|
'../gm/imagefiltersgraph.cpp',
|
|
'../gm/imagefiltersscaled.cpp',
|
|
'../gm/internal_links.cpp',
|
|
'../gm/lcdtext.cpp',
|
|
'../gm/linepaths.cpp',
|
|
'../gm/matrixconvolution.cpp',
|
|
'../gm/matriximagefilter.cpp',
|
|
'../gm/megalooper.cpp',
|
|
'../gm/mixedxfermodes.cpp',
|
|
'../gm/modecolorfilters.cpp',
|
|
'../gm/morphology.cpp',
|
|
'../gm/multipicturedraw.cpp',
|
|
'../gm/nested.cpp',
|
|
'../gm/ninepatchstretch.cpp',
|
|
'../gm/nonclosedpaths.cpp',
|
|
'../gm/offsetimagefilter.cpp',
|
|
'../gm/ovals.cpp',
|
|
'../gm/patch.cpp',
|
|
'../gm/patchgrid.cpp',
|
|
'../gm/patheffects.cpp',
|
|
'../gm/pathfill.cpp',
|
|
'../gm/pathinterior.cpp',
|
|
'../gm/pathopsinverse.cpp',
|
|
'../gm/pathopsskpclip.cpp',
|
|
'../gm/pathreverse.cpp',
|
|
'../gm/peekpixels.cpp',
|
|
'../gm/perlinnoise.cpp',
|
|
'../gm/picture.cpp',
|
|
'../gm/pictureimagefilter.cpp',
|
|
'../gm/pictureshader.cpp',
|
|
'../gm/pictureshadertile.cpp',
|
|
'../gm/points.cpp',
|
|
'../gm/poly2poly.cpp',
|
|
'../gm/polygons.cpp',
|
|
'../gm/quadpaths.cpp',
|
|
'../gm/rects.cpp',
|
|
'../gm/resizeimagefilter.cpp',
|
|
'../gm/rrect.cpp',
|
|
'../gm/rrects.cpp',
|
|
'../gm/roundrects.cpp',
|
|
'../gm/samplerstress.cpp',
|
|
# '../gm/scalebitmap.cpp',
|
|
'../gm/shaderbounds.cpp',
|
|
'../gm/selftest.cpp',
|
|
'../gm/shadertext.cpp',
|
|
'../gm/shadertext2.cpp',
|
|
'../gm/shadertext3.cpp',
|
|
'../gm/shadows.cpp',
|
|
'../gm/shallowgradient.cpp',
|
|
'../gm/simpleaaclip.cpp',
|
|
'../gm/skbug1719.cpp',
|
|
'../gm/smallarc.cpp',
|
|
'../gm/stringart.cpp',
|
|
'../gm/spritebitmap.cpp',
|
|
'../gm/srcmode.cpp',
|
|
'../gm/strokefill.cpp',
|
|
'../gm/strokerect.cpp',
|
|
'../gm/strokerects.cpp',
|
|
'../gm/strokes.cpp',
|
|
'../gm/stroketext.cpp',
|
|
'../gm/surface.cpp',
|
|
'../gm/tablecolorfilter.cpp',
|
|
'../gm/texteffects.cpp',
|
|
'../gm/testimagefilters.cpp',
|
|
'../gm/texdata.cpp',
|
|
'../gm/variedtext.cpp',
|
|
'../gm/textblob.cpp',
|
|
'../gm/textblobshader.cpp',
|
|
'../gm/texturedomaineffect.cpp',
|
|
'../gm/thinrects.cpp',
|
|
'../gm/thinstrokedrects.cpp',
|
|
'../gm/tileimagefilter.cpp',
|
|
'../gm/tilemodes.cpp',
|
|
'../gm/tilemodes_scaled.cpp',
|
|
'../gm/tinybitmap.cpp',
|
|
'../gm/twopointradial.cpp',
|
|
'../gm/typeface.cpp',
|
|
'../gm/vertices.cpp',
|
|
'../gm/verttext.cpp',
|
|
'../gm/verttext2.cpp',
|
|
'../gm/verylargebitmap.cpp',
|
|
'../gm/xfermodeimagefilter.cpp',
|
|
'../gm/xfermodes.cpp',
|
|
'../gm/xfermodes2.cpp',
|
|
'../gm/xfermodes3.cpp',
|
|
'../gm/yuvtorgbeffect.cpp',
|
|
|
|
# Files needed by particular GMs
|
|
'../src/utils/debugger/SkDrawCommand.h',
|
|
'../src/utils/debugger/SkDrawCommand.cpp',
|
|
'../src/utils/debugger/SkDebugCanvas.h',
|
|
'../src/utils/debugger/SkDebugCanvas.cpp',
|
|
'../src/utils/debugger/SkObjectParser.h',
|
|
'../src/utils/debugger/SkObjectParser.cpp',
|
|
],
|
|
}],
|
|
# TODO: Several GMs are known to cause particular problems on Android, so
|
|
# we disable them on Android. See http://skbug.com/2326
|
|
[ 'skia_os == "android"', {
|
|
'sources!': [
|
|
# TODO(borenet): Causes assertion failure on Nexus S.
|
|
# See http://skbug.com/705
|
|
'../gm/bitmapcopy.cpp',
|
|
|
|
# SOME of the bitmaprect tests are disabled on Android; see
|
|
# ../gm/bitmaprect.cpp
|
|
|
|
# Fail for now until the appropriate freetype changes are submitted.
|
|
'../gm/coloremoji.cpp',
|
|
|
|
# We skip GPU tests in this GM; see
|
|
# ../gm/deviceproperties.cpp
|
|
|
|
# TODO(bsalomon): Hangs on Xoom and Nexus S. See http://skbug.com/637
|
|
'../gm/drawbitmaprect.cpp',
|
|
|
|
# TODO(epoger): Crashes on Nexus 10. See http://skbug.com/2313
|
|
'../gm/imagefilterscropexpand.cpp',
|
|
|
|
# TODO(borenet): Causes Nexus S to reboot. See http://skbug.com/665
|
|
'../gm/shadertext.cpp',
|
|
'../gm/shadertext2.cpp',
|
|
'../gm/shadertext3.cpp',
|
|
|
|
# TODO(reed): Allocates more memory than Android devices are capable of
|
|
# fulfilling. See http://skbug.com/1978
|
|
'../gm/verylargebitmap.cpp',
|
|
],
|
|
}],
|
|
],
|
|
}
|