Moved image params out to SkParticleDrawable
Added a simpler circle drawable, moved drawing code out so that frame
calculation is handled by the drawable. Fixed all the sample effects,
including some size adjustments to better create the intended effect.
Bug: skia:
Change-Id: I60af9cd6262ff98352ca8ceaf6768aef9c7e164c
Reviewed-on: https://skia-review.googlesource.com/c/193029
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
diff --git a/resources/particles/warp.json b/resources/particles/warp.json
index edbbec1..cb73892 100644
--- a/resources/particles/warp.json
+++ b/resources/particles/warp.json
@@ -22,42 +22,36 @@
},
"StartColor": [ 1, 0.999994, 0.99999, 1 ],
"EndColor": [ 0.99999, 0.999992, 1, 1 ],
- "Velocity": {
- "Angle": 1.5708,
- "Spread": 6.28319,
- "Strength": {
- "min": 0,
- "max": 0
- },
- "Bidirectional": false,
- "Spin": {
- "min": 0,
- "max": 0
- },
- "BidirectionalSpin": false
+ "Drawable": {
+ "Type": "SkCircleDrawable",
+ "Radius": 2
},
- "Image": "images/half-transparent-white-pixel.png",
- "ImageCols": 1,
- "ImageRows": 1,
"Emitter": {
"Type": "SkCircleEmitter",
"Center": { "x": 380.8, "y": 273.92 },
"Radius": 43
},
- "Spawn": [
+ "Spawn": [],
+ "Update": [
+ {
+ "Type": "SkPointForceAffector",
+ "Point": { "x": 375, "y": 273 },
+ "Constant": -10,
+ "InvSquare": 0
+ },
{
"Type": "SkSizeAffector",
"Curve": {
"XValues": [],
"Segments": [
{
- "Constant": true,
+ "Constant": false,
"Ranged": false,
"Bidirectional": false,
- "A0": 2,
- "B0": 0,
- "C0": 0,
- "D0": 0,
+ "A0": 0.25,
+ "B0": 1,
+ "C0": 2,
+ "D0": 3,
"A1": 0,
"B1": 0,
"C1": 0,
@@ -66,13 +60,5 @@
]
}
}
- ],
- "Update": [
- {
- "Type": "SkPointForceAffector",
- "Point": { "x": 375, "y": 273 },
- "Constant": -10,
- "InvSquare": 0
- }
]
}
\ No newline at end of file