AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
d12f2786e2
skia2/resources/particles/spiral.json

32 lines
845 B
JSON
Raw Normal View History

Refactor particle age logic Move to a model that only needs floats, and puts the age in the SkParticleState struct. Add a better test case for spawn affector animation, to verify that things are still working. Bug: skia: Change-Id: I97d99de5f5d4cb302b76116e67ecc93368fb1677 Reviewed-on: https://skia-review.googlesource.com/c/193580 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2019-02-20 19:33:49 +00:00
{
"MaxCount": 800,
"Drawable": {
"Type": "SkCircleDrawable",
"Radius": 2
},
Particle effect scripting update This change adds another layer of complexity and control to the particle system. There are now two code chunks: the old code that's run per-particle, and new code that's run for the effect itself. This allows for effect lifetime to be set by the script (eg, randomly), as well as the emission rate. Rate can vary over time (see pulse.json), and particles can be emitted in bursts by setting the effect's burst field (see fireworks.json). Additionally, the effect has its own frame of reference and color, which becomes the default state for newly emitted particles. This allows synchronizing state across particles in various interesting ways (see color in fireworks.json). Change-Id: Iec2f7a3427ce1d6411ed7ef5b3023cbef2e8a134 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/240498 Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Michael Ludwig <michaelludwig@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-12 20:25:52 +00:00
"EffectCode": [
"void effectSpawn(inout Effect effect) {",
" effect.lifetime = 4;",
" effect.rate = 120;",
" effect.spin = 6;",
"}",
""
],
"Code": [
Particles: Merge spawn & update into one code string with two functions Change-Id: If57fb79db8f8c5fd185fefaa202167c8082dd846 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/229921 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-07-25 20:58:46 +00:00
"void spawn(inout Particle p) {",
Particles: Use list of lines for multi-line string serialization Change-Id: Ic81b3433b485ca9ce0e60bd10ec12706e673ee89 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/229917 Commit-Queue: Brian Osman <brianosman@google.com> Commit-Queue: Mike Klein <mtklein@google.com> Auto-Submit: Brian Osman <brianosman@google.com> Reviewed-by: Mike Reed <reed@google.com> Reviewed-by: Mike Klein <mtklein@google.com>
2019-07-25 20:27:35 +00:00
" p.lifetime = 2 + rand;",
Particle effect scripting update This change adds another layer of complexity and control to the particle system. There are now two code chunks: the old code that's run per-particle, and new code that's run for the effect itself. This allows for effect lifetime to be set by the script (eg, randomly), as well as the emission rate. Rate can vary over time (see pulse.json), and particles can be emitted in bursts by setting the effect's burst field (see fireworks.json). Additionally, the effect has its own frame of reference and color, which becomes the default state for newly emitted particles. This allows synchronizing state across particles in various interesting ways (see color in fireworks.json). Change-Id: Iec2f7a3427ce1d6411ed7ef5b3023cbef2e8a134 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/240498 Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Michael Ludwig <michaelludwig@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-09-12 20:25:52 +00:00
" p.vel = p.dir * mix(50, 60, rand);",
Particles: Use list of lines for multi-line string serialization Change-Id: Ic81b3433b485ca9ce0e60bd10ec12706e673ee89 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/229917 Commit-Queue: Brian Osman <brianosman@google.com> Commit-Queue: Mike Klein <mtklein@google.com> Auto-Submit: Brian Osman <brianosman@google.com> Reviewed-by: Mike Reed <reed@google.com> Reviewed-by: Mike Klein <mtklein@google.com>
2019-07-25 20:27:35 +00:00
"}",
"",
Particles: Merge spawn & update into one code string with two functions Change-Id: If57fb79db8f8c5fd185fefaa202167c8082dd846 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/229921 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-07-25 20:58:46 +00:00
"void update(inout Particle p) {",
Particles: Use list of lines for multi-line string serialization Change-Id: Ic81b3433b485ca9ce0e60bd10ec12706e673ee89 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/229917 Commit-Queue: Brian Osman <brianosman@google.com> Commit-Queue: Mike Klein <mtklein@google.com> Auto-Submit: Brian Osman <brianosman@google.com> Reviewed-by: Mike Reed <reed@google.com> Reviewed-by: Mike Klein <mtklein@google.com>
2019-07-25 20:27:35 +00:00
" p.scale = 0.5 + 1.5 * p.age;",
" float3 a0 = float3(0.098, 0.141, 0.784);",
" float3 a1 = float3(0.525, 0.886, 0.980);",
" float3 b0 = float3(0.376, 0.121, 0.705);",
" float3 b1 = float3(0.933, 0.227, 0.953);",
" p.color.rgb = mix(mix(a0, a1, p.age), mix(b0, b1, p.age), rand);",
"}",
""
],
Major rewrite of the particle system based on the SkSL interpreter This removes all of the fixed-function particle affector classes. Instead, each particle effect just has two SkSL snippets, one for spawn logic, and one for update logic. Each one gets an inout copy of the particle struct. Ultimately, this makes the effects much simpler and smaller, while also being far more flexible (you can do whatever you want with any values you want). Finally, because the interpreter is vectorized and a particular effect's scripts are usually tuned to the specific behaviors desired, it's faster on basically every effect I compared. I re-created all of the old effects in the new system. Many just use pure SkSL (no curves or anything). Some of the old curve and path/text stuff was very handy, though - so those are now exposed as external values in the interpreter. Basically, an effect can have any number of named "bindings" that are a callable thing. This can be a path, text (shortcut for making fancy paths), curve, or color curve. The path ones return a float4 with position and normal, the curves return one or four floats. ... and this transposes all of the particle data storage into SoA form, so that it can use the much faster interpreter entry point. Change-Id: Iebe711c45994c4201041b12d171af976bc5e758e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/222057 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Reed <reed@google.com>
2019-07-25 19:14:50 +00:00
"Bindings": []
Refactor particle age logic Move to a model that only needs floats, and puts the age in the SkParticleState struct. Add a better test case for spawn affector animation, to verify that things are still working. Bug: skia: Change-Id: I97d99de5f5d4cb302b76116e67ecc93368fb1677 Reviewed-on: https://skia-review.googlesource.com/c/193580 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2019-02-20 19:33:49 +00:00
}
Reference in New Issue Copy Permalink