AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
ef7677fc60
skia2/modules/skottie/skottie.gni

68 lines
1.9 KiB
Plaintext
Raw Normal View History

[skottie/sksg] Move source files list to .gni To facilitate Chromium integration. Change-Id: Ie6a08e90feda4c6deace9754f0baef7176882334 Reviewed-on: https://skia-review.googlesource.com/145146 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-08-02 15:54:16 +00:00
# Copyright 2018 Google Inc.
#
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
# Things are easiest for everyone if these source paths are absolute.
_src = get_path_info("src", "abspath")
_include = get_path_info("include", "abspath")
Reland: [skottie] Initial property setters Introduce a PropertyObserver to receive property notifications for layer and shape nodes. Properties are communicated using strongly-typed "handles", which act as impedance adapters between the AE/BM model and the internal Skottie model. Reviewed-by: Mike Reed <reed@google.com> Change-Id: Id155076faa8595f6b4d81672559f01c2e0c7455a TBR= Reviewed-on: https://skia-review.googlesource.com/156626 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-09-24 21:24:59 +00:00
skia_skottie_public = [
"$_include/Skottie.h",
"$_include/SkottieProperty.h",
]
[skottie/sksg] Move source files list to .gni To facilitate Chromium integration. Change-Id: Ie6a08e90feda4c6deace9754f0baef7176882334 Reviewed-on: https://skia-review.googlesource.com/145146 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-08-02 15:54:16 +00:00
skia_skottie_sources = [
[skottie] Cleanup: split off layers into own CUs TBR= Change-Id: Ia6c27cca33f9dc8f242a50e624341dd0b465b380 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/224738 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2019-07-01 17:57:43 +00:00
"$_src/Composition.cpp",
[skottie] 3D layer parenting refinements Observed AE layer parenting semantics: * layers are flagged as either 2D or 3D * camera applies to 3D layers, but not to 2D layers * parented 3D layers treat their ancestor transform chain as 3D (SkMatrix44) * parented 2D layers treat their ancestor transform chain as 2D (SkMatrix, ignoring 3D components) This means that for a given layer, we may need to build two distinct transform chains - depending on the type of descendant layer being considered. Furthermore, transforms are animatable and their animators are scoped to a layer controller. Since we're potentially building two version of the transform node, we need to ensure all animators for both of them are transferred to controller object (we still want to only instantiate a single layer controller and render tree to avoid duplication). IOW, all dependent layer transforms need to be considered before "sealing off" a given layer controller. In order to avoid a layer dependency/topological sort, we can split off the transform tree construction into a separate pass. High-level changes: -- replace existing LayerAttachContext with CompositionBuilder (holds LayerBuilders and other Composition-wide state) -- replace LayerRec with LayerBuilder (holds Layer-wide state and also caches transform nodes) -- pass 1: for each LayerBuilder, transitively build and cache a transform chain of a type (2d/3d) determined by the leaf (entry point) layer -- pass 2: for each LayerBuilder, build the actual layer content render tree and instantiate the layer controller objects Bug: skia:8914 Change-Id: I9f7efcf4819424282fd3dda98f5621ba12fd001b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/251001 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2019-10-28 17:57:12 +00:00
"$_src/Composition.h",
[skottie] Cleanup: split off layers into own CUs TBR= Change-Id: Ia6c27cca33f9dc8f242a50e624341dd0b465b380 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/224738 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2019-07-01 17:57:43 +00:00
"$_src/Layer.cpp",
[skottie] 3D layer parenting refinements Observed AE layer parenting semantics: * layers are flagged as either 2D or 3D * camera applies to 3D layers, but not to 2D layers * parented 3D layers treat their ancestor transform chain as 3D (SkMatrix44) * parented 2D layers treat their ancestor transform chain as 2D (SkMatrix, ignoring 3D components) This means that for a given layer, we may need to build two distinct transform chains - depending on the type of descendant layer being considered. Furthermore, transforms are animatable and their animators are scoped to a layer controller. Since we're potentially building two version of the transform node, we need to ensure all animators for both of them are transferred to controller object (we still want to only instantiate a single layer controller and render tree to avoid duplication). IOW, all dependent layer transforms need to be considered before "sealing off" a given layer controller. In order to avoid a layer dependency/topological sort, we can split off the transform tree construction into a separate pass. High-level changes: -- replace existing LayerAttachContext with CompositionBuilder (holds LayerBuilders and other Composition-wide state) -- replace LayerRec with LayerBuilder (holds Layer-wide state and also caches transform nodes) -- pass 1: for each LayerBuilder, transitively build and cache a transform chain of a type (2d/3d) determined by the leaf (entry point) layer -- pass 2: for each LayerBuilder, build the actual layer content render tree and instantiate the layer controller objects Bug: skia:8914 Change-Id: I9f7efcf4819424282fd3dda98f5621ba12fd001b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/251001 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2019-10-28 17:57:12 +00:00
"$_src/Layer.h",
[skottie/sksg] Move source files list to .gni To facilitate Chromium integration. Change-Id: Ie6a08e90feda4c6deace9754f0baef7176882334 Reviewed-on: https://skia-review.googlesource.com/145146 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-08-02 15:54:16 +00:00
"$_src/Skottie.cpp",
"$_src/SkottieAdapter.cpp",
"$_src/SkottieAdapter.h",
"$_src/SkottieAnimator.cpp",
"$_src/SkottieJson.cpp",
"$_src/SkottieJson.h",
[skottie] Initial text layer plumbing Still loads to do. For now just draws trivial text nodes using a default fontmgr. Change-Id: I7343b648726d2c4f376f43437f6ae1377ad8ba86 Reviewed-on: https://skia-review.googlesource.com/147465 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-08-17 16:29:45 +00:00
"$_src/SkottiePriv.h",
Reland: [skottie] Initial property setters Introduce a PropertyObserver to receive property notifications for layer and shape nodes. Properties are communicated using strongly-typed "handles", which act as impedance adapters between the AE/BM model and the internal Skottie model. Reviewed-by: Mike Reed <reed@google.com> Change-Id: Id155076faa8595f6b4d81672559f01c2e0c7455a TBR= Reviewed-on: https://skia-review.googlesource.com/156626 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-09-24 21:24:59 +00:00
"$_src/SkottieProperty.cpp",
[skottie/sksg] Move source files list to .gni To facilitate Chromium integration. Change-Id: Ie6a08e90feda4c6deace9754f0baef7176882334 Reviewed-on: https://skia-review.googlesource.com/145146 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-08-02 15:54:16 +00:00
"$_src/SkottieValue.cpp",
"$_src/SkottieValue.h",
[skottie] Cleanup: relocate text sources Move text-related sources to a dedicated 'text' subdirii, and drop "Skottie" src prefix. TBR= Change-Id: I4f8d1633d649d371f76840405b6e567bd93f0c00 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/212724 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2019-05-08 14:04:09 +00:00
[skottie] Effects cleanup pass Split-off effects into separate CUs. TBR= Change-Id: Ic214027d27e1c341085d9a8c74f605caba260630 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/221118 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2019-06-14 20:05:22 +00:00
"$_src/effects/DropShadowEffect.cpp",
[skottie] Add support for Transform distort effect Yet another way to transform a layer, disguised as a distort effect. TBR= Change-Id: Ic2d5479fa6ae27b460de60875924f73f77fc7f71 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/221001 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2019-06-14 16:20:10 +00:00
"$_src/effects/Effects.cpp",
"$_src/effects/Effects.h",
[skottie] Effects cleanup pass Split-off effects into separate CUs. TBR= Change-Id: Ic214027d27e1c341085d9a8c74f605caba260630 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/221118 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2019-06-14 20:05:22 +00:00
"$_src/effects/FillEffect.cpp",
"$_src/effects/GaussianBlurEffect.cpp",
"$_src/effects/GradientEffect.cpp",
[skottie] Initial Hue/Saturate effect support Due to limitations in BodyMovin/AE JSX, full effect data is not available (specifically the "channel range" property). We only support static master hue, static master saturation and static master lightness at this point. This CL also introduces a new animation builder pattern: DiscardableAdapterBase and attachDiscardableAdapter(). The former is a base class for adapters with full animator ownership. This enables a) capturing raw adapter pointers in animator lambdas and b) syncing to SG only once, after all local animators are updated). The latter is a helper for managing adapter creation and optional destruction (when all adapter properties are static we can discard it). Change-Id: Iecc4b78830e5464e7958cb12cdfd75a61010aa25 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/231956 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2019-08-02 17:10:14 +00:00
"$_src/effects/HueSaturationEffect.cpp",
[skottie] Effects cleanup pass Split-off effects into separate CUs. TBR= Change-Id: Ic214027d27e1c341085d9a8c74f605caba260630 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/221118 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2019-06-14 20:05:22 +00:00
"$_src/effects/LevelsEffect.cpp",
[skottie] Linear Wipe effect Add SkMaskFilter scene graph nodes and implement AE's linear wipe effect as a gradient shader mask filter. Change-Id: I3b2d8677c894d27249cfae7e3ea6b1248b53546b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/221776 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2019-06-19 01:13:21 +00:00
"$_src/effects/LinearWipeEffect.cpp",
[skottie] Motion blur support Unlike all other Skottie effects, motion blur requires sampling at multiple points on the timeline. To support this: 1) Introduce MotionBlurEffect - a custom SG render node which can drive the timeline of its subtree using an sksg::Animator. 2) Introduce MotionBlurController to swap for a regular LayerController when needed. MotionBlurController dispatches time ticks to MotionBlurEffect instead of directly to the layer animators. The actual motion blur impl is based on https://skia-review.googlesource.com/c/skia/+/221416. Motion blur requires Lottie files exported with this BodyMovin patch: https://github.com/bodymovin/bodymovin-extension/pull/15 Change-Id: I075e101ea91ec9aa300bac35ee810fd539f1aced Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225416 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2019-07-03 14:09:31 +00:00
"$_src/effects/MotionBlurEffect.cpp",
"$_src/effects/MotionBlurEffect.h",
[skottie] Motion tile effect Implement support for AE's Motion Tile effect [1]. This is the first effect which needs layer size information, so the CL includes related plumbing. Limitations: no phase support at this point. [1] https://helpx.adobe.com/after-effects/using/stylize-effects.html#motion_tile_effect Change-Id: I023bf8a9d3e3d2a48458fa94218f143e6aac4c9f Reviewed-on: https://skia-review.googlesource.com/c/skia/+/221244 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2019-06-17 15:37:02 +00:00
"$_src/effects/MotionTileEffect.cpp",
[skottie] Radial swipe effect Implement radial wipe with a sweep gradient shader mask filter. The implementation is slightly convoluted because edge feathering requires a real blur, which in turn requires content layer isolation. So there are two distinct operation modes: - no feather -> draw the content directly into the dest buffer, with the mask filter deferred in SG context - feather -> draw the content into a separate layer, then blend (dstOut) the composed blur+shader mask on top Change-Id: I253701aff42db8010ce463762252c262e2c5d92b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/222596 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2019-06-21 13:12:21 +00:00
"$_src/effects/RadialWipeEffect.cpp",
[skottie] Shift Channels effect support (https://helpx.adobe.com/after-effects/using/channel-effects.html#shift_channels_effect) Limitations: no HSL sources for now. Change-Id: Iffd63f2bbfc8c5f1de00846412be26847e822420 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/250036 Commit-Queue: Florin Malita <fmalita@chromium.org> Reviewed-by: Mike Klein <mtklein@google.com> Reviewed-by: Mike Reed <reed@google.com>
2019-10-22 19:48:55 +00:00
"$_src/effects/ShiftChannelsEffect.cpp",
[skottie] Effects cleanup pass Split-off effects into separate CUs. TBR= Change-Id: Ic214027d27e1c341085d9a8c74f605caba260630 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/221118 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2019-06-14 20:05:22 +00:00
"$_src/effects/TintEffect.cpp",
[skottie] Add support for Transform distort effect Yet another way to transform a layer, disguised as a distort effect. TBR= Change-Id: Ic2d5479fa6ae27b460de60875924f73f77fc7f71 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/221001 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2019-06-14 16:20:10 +00:00
"$_src/effects/TransformEffect.cpp",
[skottie] Effects cleanup pass Split-off effects into separate CUs. TBR= Change-Id: Ic214027d27e1c341085d9a8c74f605caba260630 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/221118 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2019-06-14 20:05:22 +00:00
"$_src/effects/TritoneEffect.cpp",
[skottie] Venetian Blinds effect Change-Id: I50e133dea448e044fef45379490cb85b39eea3bc Reviewed-on: https://skia-review.googlesource.com/c/skia/+/223856 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2019-06-26 01:14:02 +00:00
"$_src/effects/VenetianBlindsEffect.cpp",
[skottie] Add support for Transform distort effect Yet another way to transform a layer, disguised as a distort effect. TBR= Change-Id: Ic2d5479fa6ae27b460de60875924f73f77fc7f71 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/221001 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2019-06-14 16:20:10 +00:00
[skottie] Cleanup: split off layers into own CUs TBR= Change-Id: Ia6c27cca33f9dc8f242a50e624341dd0b465b380 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/224738 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2019-07-01 17:57:43 +00:00
"$_src/layers/ImageLayer.cpp",
"$_src/layers/NullLayer.cpp",
"$_src/layers/PrecompLayer.cpp",
"$_src/layers/ShapeLayer.cpp",
"$_src/layers/SolidLayer.cpp",
"$_src/layers/TextLayer.cpp",
[skottie] Initial text range selector support Each animator can have multiple range selectors, whose combined "coverage" modulates how the animator props compose with other/initial props. Since there can be multiple animators with different/arbitrary selectors, we compute independent property values for each fragment. Supported features: - start, end, offset, amount - units: percentage, index - based-on: characters-only for now - mode: add-only for now - shape: square-only for now Change-Id: If7fee46ffb29e1f92542822481ed699fd0b0b521 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/218076 Commit-Queue: Florin Malita <fmalita@chromium.org> Reviewed-by: Ben Wagner <bungeman@google.com>
2019-06-04 19:48:34 +00:00
"$_src/text/RangeSelector.cpp",
"$_src/text/RangeSelector.h",
[skottie] Cleanup: relocate text sources Move text-related sources to a dedicated 'text' subdirii, and drop "Skottie" src prefix. TBR= Change-Id: I4f8d1633d649d371f76840405b6e567bd93f0c00 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/212724 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2019-05-08 14:04:09 +00:00
"$_src/text/SkottieShaper.cpp",
"$_src/text/SkottieShaper.h",
"$_src/text/TextAdapter.cpp",
"$_src/text/TextAdapter.h",
[skottie] Initial animated text properties support Limitations: - no range selectors (applies to the whole text) - only position, fill color and stroke color for now Change-Id: I91e88a6107c5f66687c1c27f27a71be3914bde25 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/217386 Commit-Queue: Florin Malita <fmalita@chromium.org> Reviewed-by: Ben Wagner <bungeman@google.com>
2019-05-31 18:15:04 +00:00
"$_src/text/TextAnimator.cpp",
"$_src/text/TextAnimator.h",
[skottie] Cleanup: relocate text sources Move text-related sources to a dedicated 'text' subdirii, and drop "Skottie" src prefix. TBR= Change-Id: I4f8d1633d649d371f76840405b6e567bd93f0c00 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/212724 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2019-05-08 14:04:09 +00:00
"$_src/text/TextValue.cpp",
"$_src/text/TextValue.h",
[skottie/sksg] Move source files list to .gni To facilitate Chromium integration. Change-Id: Ie6a08e90feda4c6deace9754f0baef7176882334 Reviewed-on: https://skia-review.googlesource.com/145146 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-08-02 15:54:16 +00:00
]
Reference in New Issue Copy Permalink