AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[skottie] Plumb square selector "smoothness" prop

Browse Source 
Requires https://github.com/bodymovin/bodymovin-extension/pull/22

Change-Id: I2614aeefce18f4b3e6c6373cd5503a7696253a76
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/238436
Auto-Submit: Florin Malita <fmalita@chromium.org>
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Florin Malita <fmalita@chromium.org>
This commit is contained in:
Florin Malita 2019-08-30 10:55:26 -04:00 committed by Skia Commit-Bot
parent cf39f375d1
commit f49cd70119
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/skottie/src/text/RangeSelector.cpp
View File

@ -306,6 +306,14 @@ sk_sp<RangeSelector> RangeSelector::Make(const skjson::ObjectValue* jrange,
selector->fEaseHi = xe;
});
// Optional square "smoothness" prop.
if (selector->fShape == Shape::kSquare) {
abuilder->bindProperty<ScalarValue>((*jrange)["sm"],
[selector](const ScalarValue& sm) {
selector->fSmoothness = sm;
});
}
return selector;
}
@ -382,13 +390,13 @@ void RangeSelector::modulateCoverage(const TextAnimator::DomainMaps& maps,
// We achieve this by moving the range edges outward by |smoothness|/2, and adjusting
// the generator cubic ramp size.
// TODO: support actual smoothness prop.
static constexpr float kSmoothness = 1.0f;
// smoothness is percentage-based [0..100]
const auto smoothness = SkTPin<float>(fSmoothness / 100, 0, 1);
r0 -= kSmoothness / 2;
len += kSmoothness;
r0 -= smoothness / 2;
len += smoothness;
gen.crs += kSmoothness / len;
gen.crs += smoothness / len;
}
SkASSERT(len > 0);

7
modules/skottie/src/text/RangeSelector.h
View File

@ -69,9 +69,10 @@ private:
float fStart,
fEnd,
fOffset,
fAmount = 100,
fEaseLo = 0,
fEaseHi = 0;
fAmount = 100,
fEaseLo = 0,
fEaseHi = 0,
fSmoothness = 100;
};
} // namespace internal