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

[skottie] Minor MotionBlurEffect cleanup

Browse Source 
Change-Id: I9d02ff9f6bcc86cdc10e01a4e3379014557172e9
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/244507
Commit-Queue: Florin Malita <fmalita@chromium.org>
Commit-Queue: Mike Klein <mtklein@google.com>
Auto-Submit: Florin Malita <fmalita@chromium.org>
Reviewed-by: Mike Klein <mtklein@google.com>
This commit is contained in:
Florin Malita 2019-09-26 11:34:44 -04:00 committed by Skia Commit-Bot
parent 4e8f63a92a
commit fbe61189f6
2 changed files with 13 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
modules/skottie/src/effects/MotionBlurEffect.cpp
View File

@ -11,7 +11,6 @@
#include "include/core/SkMath.h"
#include "include/core/SkPixmap.h"
#include "include/private/SkVx.h"
#include "modules/sksg/include/SkSGInvalidationController.h"
#include "src/core/SkMathPriv.h"
namespace skottie {
@ -67,27 +66,19 @@ const sksg::RenderNode* MotionBlurEffect::onNodeAt(const SkPoint&) const {
return nullptr;
}
SkRect MotionBlurEffect::onRevalidate(sksg::InvalidationController*, const SkMatrix& ctm) {
SkASSERT(this->children().size() == 1ul);
const sk_sp<RenderNode>& child = this->children()[0];
SkRect MotionBlurEffect::seekToSample(size_t sample_idx, const SkMatrix& ctm) const {
SkASSERT(sample_idx < fSampleCount);
fAnimator->tick(fT + fPhase + fDT * sample_idx);
SkASSERT(this->children().size() == 1ul);
return this->children()[0]->revalidate(nullptr, ctm);
}
SkRect MotionBlurEffect::onRevalidate(sksg::InvalidationController*, const SkMatrix& ctm) {
SkRect bounds = SkRect::MakeEmpty();
// Use a local inval controller to suppress descendent invals during sampling
// (superseded by our local inval bounds).
sksg::InvalidationController ic;
float t = fT + fPhase;
for (size_t i = 0; i < fSampleCount; ++i) {
fAnimator->tick(t);
t += fDT;
if (!child->isVisible()) {
continue;
}
bounds.join(child->revalidate(&ic, ctm));
bounds.join(this->seekToSample(i, ctm));
}
return bounds;
@ -115,18 +106,14 @@ void MotionBlurEffect::renderToRaster8888Pow2Samples(SkCanvas* canvas,
SkASSERT(info.colorType() == kRGBA_8888_SkColorType ||
info.colorType() == kBGRA_8888_SkColorType);
float t = fT + fPhase;
bool needs_clear = false; // Cleared initially by saveLayer().
for (size_t i = 0; i < fSampleCount; ++i) {
fAnimator->tick(t);
t += fDT;
this->seekToSample(i, canvas->getTotalMatrix());
if (!child->isVisible()) {
continue;
}
child->revalidate(nullptr, canvas->getTotalMatrix());
// Draw this subframe.
if (needs_clear) {
canvas->clear(0);
@ -238,18 +225,13 @@ void MotionBlurEffect::onRender(SkCanvas* canvas, const RenderContext* ctx) cons
.modulateBlendMode(SkBlendMode::kPlus);
}
float t = fT + fPhase;
for (size_t i = 0; i < fSampleCount; ++i) {
fAnimator->tick(t);
t += fDT;
this->seekToSample(i, canvas->getTotalMatrix());
if (!child->isVisible()) {
continue;
}
child->revalidate(nullptr, canvas->getTotalMatrix());
SkAutoCanvasRestore acr(canvas, false);
if (isolate_frames) {
canvas->saveLayer(nullptr, &frame_paint);

2
modules/skottie/src/effects/MotionBlurEffect.h
View File

@ -34,6 +34,8 @@ private:
void renderToRaster8888Pow2Samples(SkCanvas* canvas, const RenderContext* ctx) const;
SkRect seekToSample(size_t sample_idx, const SkMatrix& ctm) const;
MotionBlurEffect(sk_sp<sksg::Animator> animator,
sk_sp<sksg::RenderNode> child,
size_t sample_count, float phase, float dt);