diff options
author | mike@reedtribe.org <mike@reedtribe.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-04-20 11:39:28 +0000 |
---|---|---|
committer | mike@reedtribe.org <mike@reedtribe.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-04-20 11:39:28 +0000 |
commit | 3334c3a1fa05b5ee0cab0f2f1ec7b19939737337 (patch) | |
tree | 7a495a7371692455221f499fe6430a79c6871ab9 /src/effects/SkDiscretePathEffect.cpp | |
parent | 6b919c353727f72342a20a7aa4ded9c022f5d816 (diff) |
code style
git-svn-id: http://skia.googlecode.com/svn/trunk@1160 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/effects/SkDiscretePathEffect.cpp')
-rw-r--r-- | src/effects/SkDiscretePathEffect.cpp | 36 |
1 files changed, 13 insertions, 23 deletions
diff --git a/src/effects/SkDiscretePathEffect.cpp b/src/effects/SkDiscretePathEffect.cpp index 62860455a3..3b8d48e7b5 100644 --- a/src/effects/SkDiscretePathEffect.cpp +++ b/src/effects/SkDiscretePathEffect.cpp @@ -20,8 +20,7 @@ #include "SkPathMeasure.h" #include "SkRandom.h" -static void Perterb(SkPoint* p, const SkVector& tangent, SkScalar scale) -{ +static void Perterb(SkPoint* p, const SkVector& tangent, SkScalar scale) { SkVector normal = tangent; normal.rotateCCW(); normal.setLength(scale); @@ -34,8 +33,8 @@ SkDiscretePathEffect::SkDiscretePathEffect(SkScalar segLength, SkScalar deviatio { } -bool SkDiscretePathEffect::filterPath(SkPath* dst, const SkPath& src, SkScalar* width) -{ +bool SkDiscretePathEffect::filterPath(SkPath* dst, const SkPath& src, + SkScalar* width) { bool doFill = *width < 0; SkPathMeasure meas(src, doFill); @@ -48,58 +47,49 @@ bool SkDiscretePathEffect::filterPath(SkPath* dst, const SkPath& src, SkScalar* do { SkScalar length = meas.getLength(); - if (fSegLength * (2 + doFill) > length) - { + if (fSegLength * (2 + doFill) > length) { meas.getSegment(0, length, dst, true); // to short for us to mangle - } - else - { + } else { int n = SkScalarRound(SkScalarDiv(length, fSegLength)); SkScalar delta = length / n; SkScalar distance = 0; - if (meas.isClosed()) - { + if (meas.isClosed()) { n -= 1; distance += delta/2; } meas.getPosTan(distance, &p, &v); Perterb(&p, v, SkScalarMul(rand.nextSScalar1(), scale)); dst->moveTo(p); - while (--n >= 0) - { + while (--n >= 0) { distance += delta; meas.getPosTan(distance, &p, &v); Perterb(&p, v, SkScalarMul(rand.nextSScalar1(), scale)); dst->lineTo(p); } - if (meas.isClosed()) + if (meas.isClosed()) { dst->close(); + } } } while (meas.nextContour()); return true; } -SkFlattenable::Factory SkDiscretePathEffect::getFactory() -{ +SkFlattenable::Factory SkDiscretePathEffect::getFactory() { return CreateProc; } -SkFlattenable* SkDiscretePathEffect::CreateProc(SkFlattenableReadBuffer& buffer) -{ +SkFlattenable* SkDiscretePathEffect::CreateProc(SkFlattenableReadBuffer& buffer) { return SkNEW_ARGS(SkDiscretePathEffect, (buffer)); } -void SkDiscretePathEffect::flatten(SkFlattenableWriteBuffer& buffer) -{ +void SkDiscretePathEffect::flatten(SkFlattenableWriteBuffer& buffer) { buffer.writeScalar(fSegLength); buffer.writeScalar(fPerterb); } -SkDiscretePathEffect::SkDiscretePathEffect(SkFlattenableReadBuffer& buffer) -{ +SkDiscretePathEffect::SkDiscretePathEffect(SkFlattenableReadBuffer& buffer) { fSegLength = buffer.readScalar(); fPerterb = buffer.readScalar(); } - |