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

[skottie] Fix Fractal Noise transform order

Browse Source 
Update the shader transform order to match AE.

Change-Id: Iff9256923bef153342fcabe5f5a1091d4b2e3895
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/457120
Auto-Submit: Florin Malita <fmalita@chromium.org>
Commit-Queue: Jorge Betancourt <jmbetancourt@google.com>
Reviewed-by: Jorge Betancourt <jmbetancourt@google.com>
This commit is contained in:
Florin Malita 2021-10-07 16:05:43 -04:00 committed by SkCQ
parent 2f7c3f51e4
commit 7e5772f448
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/skottie/src/effects/FractalNoiseEffect.cpp
View File

@ -397,9 +397,9 @@ private:
: SkV2{fScaleWidth, fScaleHeight};
return SkMatrix::Translate(fOffset.x, fOffset.y)
* SkMatrix::RotateDeg(fRotation)
* SkMatrix::Scale(SkTPin(scale.x, 1.0f, 10000.0f) * 0.01f,
SkTPin(scale.y, 1.0f, 10000.0f) * 0.01f)
* SkMatrix::RotateDeg(fRotation)
* SkMatrix::Scale(kGridSize, kGridSize);
}

1
resources/skottie/skottie-fractalnoise-scalerotate.json Normal file
View File

@ -0,0 +1 @@
{"v":"5.7.11","fr":60,"ip":0,"op":300,"w":500,"h":500,"nm":"fractal-scalerotate","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":1,"nm":"Black Solid 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[250,250,0],"ix":2,"l":2},"a":{"a":0,"k":[250,250,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ef":[{"ty":5,"nm":"Fractal Noise","np":33,"mn":"ADBE Fractal Noise","ix":1,"en":1,"ef":[{"ty":7,"nm":"Fractal Type","mn":"ADBE Fractal Noise-0001","ix":1,"v":{"a":0,"k":1,"ix":1}},{"ty":7,"nm":"Noise Type","mn":"ADBE Fractal Noise-0002","ix":2,"v":{"a":0,"k":1,"ix":2}},{"ty":7,"nm":"Invert","mn":"ADBE Fractal Noise-0003","ix":3,"v":{"a":0,"k":0,"ix":3}},{"ty":0,"nm":"Contrast","mn":"ADBE Fractal Noise-0004","ix":4,"v":{"a":0,"k":100,"ix":4}},{"ty":0,"nm":"Brightness","mn":"ADBE Fractal Noise-0005","ix":5,"v":{"a":0,"k":0,"ix":5}},{"ty":7,"nm":"Overflow","mn":"ADBE Fractal Noise-0006","ix":6,"v":{"a":0,"k":1,"ix":6}},{"ty":6,"nm":"Transform","mn":"ADBE Fractal Noise-0007","ix":7,"v":0},{"ty":0,"nm":"Rotation","mn":"ADBE Fractal Noise-0008","ix":8,"v":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":299,"s":[360]}],"ix":8}},{"ty":7,"nm":"Uniform Scaling","mn":"ADBE Fractal Noise-0009","ix":9,"v":{"a":0,"k":0,"ix":9}},{"ty":0,"nm":"Scale","mn":"ADBE Fractal Noise-0010","ix":10,"v":{"a":0,"k":100,"ix":10}},{"ty":0,"nm":"Scale Width","mn":"ADBE Fractal Noise-0011","ix":11,"v":{"a":0,"k":100,"ix":11}},{"ty":0,"nm":"Scale Height","mn":"ADBE Fractal Noise-0012","ix":12,"v":{"a":0,"k":20,"ix":12}},{"ty":3,"nm":"Offset Turbulence","mn":"ADBE Fractal Noise-0013","ix":13,"v":{"a":0,"k":[250,250],"ix":13}},{"ty":7,"nm":"Perspective Offset","mn":"ADBE Fractal Noise-0031","ix":14,"v":{"a":0,"k":0,"ix":14}},{"ty":6,"nm":"","mn":"ADBE Fractal Noise-0014","ix":15,"v":0},{"ty":0,"nm":"Complexity","mn":"ADBE Fractal Noise-0015","ix":16,"v":{"a":0,"k":1,"ix":16}},{"ty":6,"nm":"Sub Settings","mn":"ADBE Fractal Noise-0016","ix":17,"v":0},{"ty":0,"nm":"Sub Influence (%)","mn":"ADBE Fractal Noise-0017","ix":18,"v":{"a":0,"k":70,"ix":18}},{"ty":0,"nm":"Sub Scaling","mn":"ADBE Fractal Noise-0018","ix":19,"v":{"a":0,"k":100,"ix":19}},{"ty":0,"nm":"Sub Rotation","mn":"ADBE Fractal Noise-0019","ix":20,"v":{"a":0,"k":-90,"ix":20}},{"ty":3,"nm":"Sub Offset","mn":"ADBE Fractal Noise-0020","ix":21,"v":{"a":0,"k":[0,0],"ix":21}},{"ty":7,"nm":"Center Subscale","mn":"ADBE Fractal Noise-0021","ix":22,"v":{"a":0,"k":0,"ix":22}},{"ty":6,"nm":"","mn":"ADBE Fractal Noise-0022","ix":23,"v":0},{"ty":0,"nm":"Evolution","mn":"ADBE Fractal Noise-0023","ix":24,"v":{"a":0,"k":0,"ix":24}},{"ty":6,"nm":"Evolution Options","mn":"ADBE Fractal Noise-0024","ix":25,"v":0},{"ty":7,"nm":"Cycle Evolution","mn":"ADBE Fractal Noise-0025","ix":26,"v":{"a":0,"k":0,"ix":26}},{"ty":0,"nm":"Cycle (in Revolutions)","mn":"ADBE Fractal Noise-0026","ix":27,"v":{"a":0,"k":1,"ix":27}},{"ty":0,"nm":"Random Seed","mn":"ADBE Fractal Noise-0027","ix":28,"v":{"a":0,"k":0,"ix":28}},{"ty":6,"nm":"Random Seed","mn":"ADBE Fractal Noise-0028","ix":29,"v":0},{"ty":0,"nm":"Opacity","mn":"ADBE Fractal Noise-0029","ix":30,"v":{"a":0,"k":100,"ix":30}},{"ty":7,"nm":"Blending Mode","mn":"ADBE Fractal Noise-0030","ix":31,"v":{"a":0,"k":2,"ix":31}}]}],"sw":500,"sh":500,"sc":"#000000","ip":0,"op":300,"st":0,"bm":0}],"markers":[]}