commit 8b6283fc98fc16aaff9b28e696db1620f499e146
author Brian Osman <brianosman@google.com> Thu Feb 14 16:55:21 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Feb 15 14:10:39 2019 +0000
tree 4c4ac1f3fb03a647758f8d5f1b157110572368b8
parent 154acd7a137438b2e7f0c7c1803a3e9d969e867c

New SkCurve type with multiple curve segments

- Converted all linear force stuff into a single affector,
  used at either spawn or update time appropriately.
  The new affector can either set or adjust velocity.
- Converted lifetime to a curve.
- Removed SkRangedFloat, initial velocity params, etc.

Looks like a large addition, but that's mostly down to the
JSON getting bigger. There's a net reduction in LoC.

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

resources/particles/snowfall.json

diff --git a/resources/particles/snowfall.json b/resources/particles/snowfall.json
index 865893f..dccc506 100644
--- a/resources/particles/snowfall.json
+++ b/resources/particles/snowfall.json
@@ -1,23 +1,27 @@
 {
    "MaxCount": 4096,
+   "Duration": 1,
    "Rate": 30,
    "Life": {
-      "min": 10,
-      "max": 10
+      "XValues": [],
+      "Segments": [
+         {
+            "Constant": true,
+            "Ranged": false,
+            "Bidirectional": false,
+            "A0": 10,
+            "B0": 0,
+            "C0": 0,
+            "D0": 0,
+            "A1": 0,
+            "B1": 0,
+            "C1": 0,
+            "D1": 0
+         }
+      ]
    },
    "StartColor": [ 1, 0.999994, 0.99999, 1 ],
    "EndColor": [ 0.99999, 0.999992, 1, 1 ],
-   "Size": {
-      "Ranged": true,
-      "A0": 10,
-      "B0": 10,
-      "C0": 10,
-      "D0": 0,
-      "A1": 10,
-      "B1": 0,
-      "C1": 0,
-      "D1": 0
-   },
    "Velocity": {
       "Angle": 1.5708,
       "Spread": 0.174533,
@@ -40,12 +44,68 @@
       "P1": { "x": 61, "y": 34 },
       "P2": { "x": 606, "y": 32 }
    },
+   "Spawn": [
+      {
+         "Type": "SkLinearVelocityAffector",
+         "Force": false,
+         "Angle": {
+            "XValues": [],
+            "Segments": [
+               {
+                  "Constant": true,
+                  "Ranged": true,
+                  "Bidirectional": false,
+                  "A0": 80,
+                  "B0": 1,
+                  "C0": 0,
+                  "D0": 0,
+                  "A1": 100,
+                  "B1": 0,
+                  "C1": 0,
+                  "D1": 0
+               }
+            ]
+         },
+         "Strength": {
+            "XValues": [],
+            "Segments": [
+               {
+                  "Constant": true,
+                  "Ranged": true,
+                  "Bidirectional": false,
+                  "A0": 10,
+                  "B0": 0,
+                  "C0": 0,
+                  "D0": 0,
+                  "A1": 30,
+                  "B1": 0,
+                  "C1": 0,
+                  "D1": 0
+               }
+            ]
+         }
+      }
+   ],
    "Update": [
       {
-         "Type": "SkJitterAffector",
-         "X": {
-            "min": -0.2,
-            "max": 0.2
+         "Type": "SkSizeAffector",
+         "Curve": {
+            "XValues": [],
+            "Segments": [
+               {
+                  "Constant": false,
+                  "Ranged": true,
+                  "Bidirectional": false,
+                  "A0": 10,
+                  "B0": 10,
+                  "C0": 10,
+                  "D0": 0,
+                  "A1": 10,
+                  "B1": 0,
+                  "C1": 0,
+                  "D1": 0
+               }
+            ]
          }
       }
    ]