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

Revert "Reland "Add particle GMs""

Browse Source 
This reverts commit cdd852b579.

Reason for revert: TSAN

Original change's description:
> Reland "Add particle GMs"
>
> This reverts commit 3b01242199.
>
> Cq-Include-Trybots: luci.skia.skia.primary:Canary-G3
> Change-Id: I83ee324d5ca927413022b08fb4b48936adbc0e2e
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/362058
> Reviewed-by: Brian Osman <brianosman@google.com>
> Commit-Queue: Brian Osman <brianosman@google.com>

TBR=brianosman@google.com

Change-Id: I497cc3e51dd0d0d0d330f34b90f4727ef2e0a8ac
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Cq-Include-Trybots: luci.skia.skia.primary:Canary-G3
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/362417
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
This commit is contained in:
Brian Osman 2021-01-29 19:21:11 +00:00 committed by Skia Commit-Bot
parent 38d8deae8f
commit ad8ce4dbb2
3 changed files with 0 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BUILD.gn
View File

@ -1865,7 +1865,6 @@ if (skia_enable_tools) {
":flags",
":skia",
":tool_utils",
"modules/particles",
"modules/skottie",
"modules/skottie:gm",
"modules/skparagraph",

78
gm/particles.cpp
View File

@ -1,78 +0,0 @@
/*
* Copyright 2021 Google LLC
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#include "gm/gm.h"
#if !defined(SK_BUILD_FOR_GOOGLE3) // Google3 doesn't build particles module
#include "include/core/SkCanvas.h"
#include "include/core/SkColor.h"
#include "modules/particles/include/SkParticleEffect.h"
#include "modules/particles/include/SkParticleSerialization.h"
#include "modules/skresources/include/SkResources.h"
#include "tools/Resources.h"
class ParticlesGM : public skiagm::GM {
public:
ParticlesGM(const char* name, double startTime, SkISize size, SkPoint origin)
: GM(SK_ColorBLACK), fName(name), fStartTime(startTime), fSize(size), fOrigin(origin) {}
SkString onShortName() override { return SkStringPrintf("particles_%s", fName); }
SkISize onISize() override { return fSize; }
void onOnceBeforeDraw() override {
SkParticleEffect::RegisterParticleTypes();
auto jsonData = GetResourceAsData(SkStringPrintf("particles/%s.json", fName).c_str());
skjson::DOM dom(static_cast<const char*>(jsonData->data()), jsonData->size());
SkFromJsonVisitor fromJson(dom.root());
auto resourceProvider = skresources::FileResourceProvider::Make(GetResourcePath());
auto effectParams = sk_make_sp<SkParticleEffectParams>();
effectParams->visitFields(&fromJson);
effectParams->prepare(resourceProvider.get());
fEffect = sk_make_sp<SkParticleEffect>(effectParams);
fEffect->start(/*now=*/0.0, /*looping=*/true);
// Fast-forward (in 30 fps time-slices) to the requested time
for (double time = 0; time < fStartTime; time += 1.0 / 30) {
fEffect->update(/*now=*/std::min(time, fStartTime));
}
}
bool onAnimate(double nanos) override {
if (fEffect) {
fEffect->update(fStartTime + (nanos * 1E-9));
}
return true;
}
void onDraw(SkCanvas* canvas) override {
canvas->save();
canvas->translate(fOrigin.fX, fOrigin.fY);
fEffect->draw(canvas);
canvas->restore();
}
protected:
const char* fName;
const double fStartTime;
const SkISize fSize;
const SkPoint fOrigin;
sk_sp<SkParticleEffect> fEffect;
};
DEF_GM(return new ParticlesGM("confetti", 1.0, {400, 400}, {200, 200});)
DEF_GM(return new ParticlesGM("cube", 1.0, {400, 400}, {200, 200});)
DEF_GM(return new ParticlesGM("curves", 4.0, {100, 200}, { 50, 190});)
DEF_GM(return new ParticlesGM("mandrill", 1.0, {250, 250}, { 25, 25});)
DEF_GM(return new ParticlesGM("spiral", 2.0, {250, 250}, {125, 125});)
DEF_GM(return new ParticlesGM("sprite_frame", 1.0, {200, 200}, {100, 100});)
DEF_GM(return new ParticlesGM("text", 1.0, {250, 110}, { 10, 100});)
#endif // SK_BUILD_FOR_GOOGLE3

1
gn/gm.gni
View File

@ -271,7 +271,6 @@ gm_sources = [
"$_gm/overdrawcolorfilter.cpp",
"$_gm/overstroke.cpp",
"$_gm/p3.cpp",
"$_gm/particles.cpp",
"$_gm/patch.cpp",
"$_gm/path_stroke_with_zero_length.cpp",
"$_gm/patharcto.cpp",