commit 1b20cd8d30e4055eaa15d2f2c2782158cd366ca5
author Brian Osman <brianosman@google.com> Mon Feb 25 14:15:02 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Feb 25 19:39:23 2019 +0000
tree 9f74765936af18bb0090c105a931903bf7c3779e
parent 9dc060116dbdd3eb1514e7446719c17e0f005f77

Add "enabled" flag to affectors, fix curve interaction with stable random

Flag is helpful while editing things (and could be a useful property to
animate, as well). The curve change fixes a bug where the stable generator
gets out of phase if all segments of a curve don't use the same options.

Bug: skia:
Change-Id: Ie151e775aee22957e79fa88feaafad72b6c781ff
Reviewed-on: https://skia-review.googlesource.com/c/195120
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

modules/particles/src/SkParticleAffector.cpp

diff --git a/modules/particles/src/SkParticleAffector.cpp b/modules/particles/src/SkParticleAffector.cpp
index eb6fa0f..74d55e9 100644
--- a/modules/particles/src/SkParticleAffector.cpp
+++ b/modules/particles/src/SkParticleAffector.cpp
@@ -11,6 +11,16 @@
 #include "SkParticleData.h"
 #include "SkRandom.h"
 
+void SkParticleAffector::apply(SkParticleUpdateParams& params, SkParticleState& ps) {
+    if (fEnabled) {
+        this->onApply(params, ps);
+    }
+}
+
+void SkParticleAffector::visitFields(SkFieldVisitor* v) {
+    v->visit("Enabled", fEnabled);
+}
+
 class SkLinearVelocityAffector : public SkParticleAffector {
 public:
     SkLinearVelocityAffector(const SkCurve& angle = 0.0f,
@@ -24,7 +34,7 @@
 
     REFLECTED(SkLinearVelocityAffector, SkParticleAffector)
 
-    void apply(SkParticleUpdateParams& params, SkParticleState& ps) override {
+    void onApply(SkParticleUpdateParams& params, SkParticleState& ps) override {
         float angle = fAngle.eval(ps.fAge, ps.fStableRandom);
         SkScalar c_local, s_local = SkScalarSinCos(SkDegreesToRadians(angle), &c_local);
         SkVector heading = fLocal ? ps.fPose.fHeading : SkVector{ 0, -1 };
@@ -40,6 +50,7 @@
     }
 
     void visitFields(SkFieldVisitor* v) override {
+        SkParticleAffector::visitFields(v);
         v->visit("Force", fForce);
         v->visit("Local", fLocal);
         v->visit("Angle", fAngle);
@@ -61,7 +72,7 @@
 
     REFLECTED(SkPointForceAffector, SkParticleAffector)
 
-    void apply(SkParticleUpdateParams& params, SkParticleState& ps) override {
+    void onApply(SkParticleUpdateParams& params, SkParticleState& ps) override {
         SkVector toPoint = fPoint - ps.fPose.fPosition;
         SkScalar lenSquare = toPoint.dot(toPoint);
         toPoint.normalize();
@@ -69,6 +80,7 @@
     }
 
     void visitFields(SkFieldVisitor* v) override {
+        SkParticleAffector::visitFields(v);
         v->visit("Point", fPoint);
         v->visit("Constant", fConstant);
         v->visit("InvSquare", fInvSquare);
@@ -86,7 +98,7 @@
 
     REFLECTED(SkOrientAlongVelocityAffector, SkParticleAffector)
 
-    void apply(SkParticleUpdateParams& params, SkParticleState& ps) override {
+    void onApply(SkParticleUpdateParams& params, SkParticleState& ps) override {
         SkVector heading = ps.fVelocity.fLinear;
         if (!heading.normalize()) {
             heading.set(0, -1);
@@ -94,7 +106,9 @@
         ps.fPose.fHeading = heading;
     }
 
-    void visitFields(SkFieldVisitor*) override {}
+    void visitFields(SkFieldVisitor *v) override {
+        SkParticleAffector::visitFields(v);
+    }
 };
 
 class SkSizeAffector : public SkParticleAffector {
@@ -103,11 +117,12 @@
 
     REFLECTED(SkSizeAffector, SkParticleAffector)
 
-    void apply(SkParticleUpdateParams& params, SkParticleState& ps) override {
+    void onApply(SkParticleUpdateParams& params, SkParticleState& ps) override {
         ps.fPose.fScale = fCurve.eval(ps.fAge, ps.fStableRandom);
     }
 
     void visitFields(SkFieldVisitor* v) override {
+        SkParticleAffector::visitFields(v);
         v->visit("Curve", fCurve);
     }
 
@@ -121,11 +136,12 @@
 
     REFLECTED(SkFrameAffector, SkParticleAffector)
 
-    void apply(SkParticleUpdateParams& params, SkParticleState& ps) override {
+    void onApply(SkParticleUpdateParams& params, SkParticleState& ps) override {
         ps.fFrame = fCurve.eval(ps.fAge, ps.fStableRandom);
     }
 
     void visitFields(SkFieldVisitor* v) override {
+        SkParticleAffector::visitFields(v);
         v->visit("Curve", fCurve);
     }
 
@@ -140,11 +156,12 @@
 
     REFLECTED(SkColorAffector, SkParticleAffector)
 
-    void apply(SkParticleUpdateParams& params, SkParticleState& ps) override {
+    void onApply(SkParticleUpdateParams& params, SkParticleState& ps) override {
         ps.fColor = fCurve.eval(ps.fAge, ps.fStableRandom);
     }
 
     void visitFields(SkFieldVisitor* v) override {
+        SkParticleAffector::visitFields(v);
         v->visit("Curve", fCurve);
     }