Squashed commit of the following:

commit 788c662 Author: Luigi Rosso <[email protected]> Date: Mon Dec 9 19:35:25 2019 -0500 Fix for blur close to 0. commit f0b24f4 Author: Luigi Rosso <[email protected]> Date: Thu Dec 5 18:24:59 2019 -0500 Minor fixes for analyze. commit 333249f Author: Luigi Rosso <[email protected]> Date: Thu Dec 5 17:36:58 2019 -0500 Preparing for publish. commit 0aa32c5 Author: Luigi Rosso <[email protected]> Date: Wed Dec 4 15:19:37 2019 -0800 Adding Guss. commit 6ba1f70 Author: Luigi Rosso <[email protected]> Date: Wed Dec 4 09:12:26 2019 -0800 Fixing type error in jelly component. commit a522dff Author: Luigi Rosso <[email protected]> Date: Sun Dec 1 17:31:28 2019 -0800 Fixing effect on self. commit 2375f0c Author: Luigi Rosso <[email protected]> Date: Wed Nov 27 18:03:08 2019 -0800 Adding animation for effects. commit dee0d83 Author: Luigi Rosso <[email protected]> Date: Tue Nov 26 16:40:01 2019 -0800 Getting drop shadow, blur, and inner shadows working. commit 31aa641 Author: Luigi Rosso <[email protected]> Date: Mon Nov 25 19:57:39 2019 -0800 Major groundwork for effects & masking. commit 9ff2b94 Author: Luigi Rosso <[email protected]> Date: Wed Nov 20 16:38:28 2019 -0800 Fixing gradient transformations for shapes with transformAffectsStroke set to true. commit 1e88ddf Merge: c7758eb 17f73ec Author: Luigi Rosso <[email protected]> Date: Mon Nov 18 16:32:28 2019 -0800 Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter commit c7758eb Author: Luigi Rosso <[email protected]> Date: Mon Nov 18 16:32:23 2019 -0800 Fixing FlareControls. commit 17f73ec Author: Umberto Sonnino <[email protected]> Date: Fri Nov 15 11:09:51 2019 +0000 Update README with latest version commit c9f4341 Author: Luigi Rosso <[email protected]> Date: Thu Nov 7 15:05:04 2019 -0800 Backing out changeImageFromNetwork. Issue #183 commit e9712a4 Author: Luigi Rosso <[email protected]> Date: Thu Nov 7 12:32:17 2019 -0800 Bumping versions. commit 366cdc0 Author: Luigi Rosso <[email protected]> Date: Thu Nov 7 12:27:53 2019 -0800 Adding support for runtime image swapping, requires marking image nodes as isDynamic in Flare. Issue #183. commit 53a7c65 Author: Luigi Rosso <[email protected]> Date: Wed Nov 6 17:30:42 2019 -0800 Updating flare_flutter version. commit b391dd4 Merge: 1e9b22e 9ec074b Author: Luigi Rosso <[email protected]> Date: Wed Nov 6 17:28:34 2019 -0800 Merge branch 'warmth_fix' commit 9ec074b Author: Luigi Rosso <[email protected]> Date: Wed Nov 6 15:43:31 2019 -0800 Call setState if mounted. commit c66ac64 Author: Luigi Rosso <[email protected]> Date: Wed Nov 6 15:38:06 2019 -0800 Addressing an issue found in #177 with FlareCacheBuilder setting state when widget is no longer mounted. commit 1e9b22e Author: Umberto Sonnino <[email protected]> Date: Wed Nov 6 19:02:25 2019 +0100 Init mat before inverting commit bc07b87 Author: Umberto Sonnino <[email protected]> Date: Wed Nov 6 19:00:13 2019 +0100 Remove local flare_dart from examples pubspec #184 commit e1cca7c Author: Luigi Rosso <[email protected]> Date: Tue Oct 29 12:50:30 2019 -0700 Bumping versions, merging optimal_load branch, and persisting settings in checkbox example. commit 55cae39 Author: Luigi Rosso <[email protected]> Date: Tue Oct 29 12:41:43 2019 -0700 Copy transform affects stroke properly when instancing shapes. commit 43716dd Author: Luigi Rosso <[email protected]> Date: Mon Oct 28 12:52:09 2019 -0700 Prevent coldLoad (async) from happening when widget isn’t ready to load. commit 506837e Author: Luigi Rosso <[email protected]> Date: Fri Oct 25 13:00:56 2019 -0700 Improving loading. commit 9ee95b9 Author: Luigi Rosso <[email protected]> Date: Fri Oct 25 10:42:42 2019 -0700 Make sure overrideColor is set even when drawableNodes is null. commit 7d59de1 Author: Umberto Sonnino <[email protected]> Date: Fri Oct 25 13:15:34 2019 +0100 Move null check commit 528af53 Author: Umberto Sonnino <[email protected]> Date: Fri Oct 25 13:10:17 2019 +0100 Insert null checks for artboards with no drawables #178 commit 33f23a7 Author: Umberto Sonnino <[email protected]> Date: Fri Oct 25 12:16:16 2019 +0100 Remove GradientColor override of ActorPaint opacity getter #179 commit 59ba2f0 Author: Umberto Sonnino <[email protected]> Date: Thu Oct 24 09:31:41 2019 +0100 Document the `actor_animatino.apply()` function commit d77438f Author: Umberto Sonnino <[email protected]> Date: Thu Oct 24 09:31:10 2019 +0100 Fix division by 0 on transform constraint commit f0cf988 Author: Luigi Rosso <[email protected]> Date: Fri Oct 11 12:59:13 2019 -0700 Fix reading of JSON clip values. Issue #172 commit a7796e0 Author: Luigi Rosso <[email protected]> Date: Fri Oct 11 12:39:48 2019 -0700 Mitigating issue #172. commit 373c14a Author: Luigi Rosso <[email protected]> Date: Wed Oct 9 14:21:47 2019 -0700 Fixing issue with image clipping. commit ae1c901 Author: Luigi Rosso <[email protected]> Date: Wed Oct 9 11:19:16 2019 -0700 Fix merge bugs. commit d8cb780 Author: Luigi Rosso <[email protected]> Date: Wed Oct 9 11:09:42 2019 -0700 Adding support for difference clipping. commit bf99a76 Author: Luigi Rosso <[email protected]> Date: Tue Oct 8 19:07:26 2019 -0700 Matching stable version commit 9becc74 Author: Luigi Rosso <[email protected]> Date: Tue Oct 8 13:58:11 2019 -0700 Bumping flare_dart to 2.0 due to breaking changes. commit 0a292cc Author: Luigi Rosso <[email protected]> Date: Tue Oct 8 13:39:57 2019 -0700 Bumping versions and changelogs. commit 431a98e Author: Luigi Rosso <[email protected]> Date: Tue Oct 8 13:35:26 2019 -0700 Fixing up analysis issues for #169 commit 72fb6fc Merge: 4d00202 dc68dea Author: Luigi Rosso <[email protected]> Date: Tue Oct 8 13:02:17 2019 -0700 Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter commit 4d00202 Author: Luigi Rosso <[email protected]> Date: Tue Oct 8 13:02:11 2019 -0700 Cleaning up analysis issues. commit dc68dea Merge: 5ca8d49 f1d9749 Author: Luigi Rosso <[email protected]> Date: Tue Oct 8 11:06:53 2019 -0700 Merge pull request #168 from mehmetf/master Escalate the severity of unused imports in analyzer commit f1d9749 Author: Mehmet Fidanboylu <[email protected]> Date: Tue Oct 8 10:20:58 2019 -0700 Do the same changes to flare_dart commit 64f395e Author: Mehmet Fidanboylu <[email protected]> Date: Tue Oct 8 10:17:51 2019 -0700 Escalate the severity of unused imports in analyzer commit 5ca8d49 Author: Luigi Rosso <[email protected]> Date: Mon Oct 7 11:22:38 2019 -0700 Bumping versions and changelog. commit 874ce8e Author: Luigi Rosso <[email protected]> Date: Mon Oct 7 11:20:28 2019 -0700 Adding support for nodes inside of shapes. commit 4d06431 Author: Luigi Rosso <[email protected]> Date: Fri Oct 4 18:06:09 2019 -0700 Introducing FlareTesting.setup(); commit 2c5f420 Author: Luigi Rosso <[email protected]> Date: Fri Oct 4 13:44:25 2019 -0700 Clamping trim start/end. commit daba34d Author: Luigi Rosso <[email protected]> Date: Mon Sep 30 21:21:55 2019 +0200 Cherry picking critical lints from #1 63 and updating for pub.
2d-inc · Dec 10, 2019 · 9f82fa8 · 9f82fa8
1 parent 446c92f
commit 9f82fa8
Show file tree

Hide file tree

Showing 4 changed files with 229 additions and 9 deletions.
diff --git a/example/checkbox/pubspec.lock b/example/checkbox/pubspec.lock
@@ -0,0 +1,211 @@
+# Generated by pub
+# See https://dart.dev/tools/pub/glossary#lockfile
+packages:
+  archive:
+    dependency: transitive
+    description:
+      name: archive
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.11"
+  args:
+    dependency: transitive
+    description:
+      name: args
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.5.2"
+  async:
+    dependency: transitive
+    description:
+      name: async
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.4.0"
+  boolean_selector:
+    dependency: transitive
+    description:
+      name: boolean_selector
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.5"
+  charcode:
+    dependency: transitive
+    description:
+      name: charcode
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.2"
+  collection:
+    dependency: transitive
+    description:
+      name: collection
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.14.11"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.1"
+  crypto:
+    dependency: transitive
+    description:
+      name: crypto
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.3"
+  cupertino_icons:
+    dependency: "direct main"
+    description:
+      name: cupertino_icons
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.2"
+  flare_dart:
+    dependency: transitive
+    description:
+      path: flare_dart
+      ref: dev
+      resolved-ref: "393c22461e127714a3a25c986bb59a666cba72ac"
+      url: "git://github.com/2d-inc/Flare-Flutter.git"
+    source: git
+    version: "2.3.0"
+  flare_flutter:
+    dependency: "direct main"
+    description:
+      path: "../../flare_flutter"
+      relative: true
+    source: path
+    version: "1.8.0"
+  flutter:
+    dependency: "direct main"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  flutter_test:
+    dependency: "direct dev"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  image:
+    dependency: transitive
+    description:
+      name: image
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.4"
+  matcher:
+    dependency: transitive
+    description:
+      name: matcher
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.12.6"
+  meta:
+    dependency: transitive
+    description:
+      name: meta
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.8"
+  path:
+    dependency: transitive
+    description:
+      name: path
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.6.4"
+  pedantic:
+    dependency: transitive
+    description:
+      name: pedantic
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.8.0+1"
+  petitparser:
+    dependency: transitive
+    description:
+      name: petitparser
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.4.0"
+  quiver:
+    dependency: transitive
+    description:
+      name: quiver
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.5"
+  sky_engine:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.99"
+  source_span:
+    dependency: transitive
+    description:
+      name: source_span
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.5.5"
+  stack_trace:
+    dependency: transitive
+    description:
+      name: stack_trace
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.9.3"
+  stream_channel:
+    dependency: transitive
+    description:
+      name: stream_channel
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.0"
+  string_scanner:
+    dependency: transitive
+    description:
+      name: string_scanner
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.5"
+  term_glyph:
+    dependency: transitive
+    description:
+      name: term_glyph
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.0"
+  test_api:
+    dependency: transitive
+    description:
+      name: test_api
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.2.11"
+  typed_data:
+    dependency: transitive
+    description:
+      name: typed_data
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.6"
+  vector_math:
+    dependency: transitive
+    description:
+      name: vector_math
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.8"
+  xml:
+    dependency: transitive
+    description:
+      name: xml
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.5.0"
+sdks:
+  dart: ">=2.4.0 <3.0.0"
diff --git a/flare_flutter/CHANGELOG.md b/flare_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [1.8.1] - 2019-12-09 19:33:06
+
+- Disable blur effects if they are less than a certain threshold. Skia seems to drop the whole layer if it's too close to zero (but not zero).
+
 ## [1.8.0] - 2019-12-05 17:34:01
 
 - Support for layer effects including masking, drop shadows, inner shadows, and blurs.

diff --git a/flare_flutter/lib/flare.dart b/flare_flutter/lib/flare.dart
@@ -1305,6 +1305,14 @@ class FlutterActorInnerShadow extends ActorInnerShadow {
   ui.BlendMode blendMode;
 }
 
+ui.ImageFilter _blurFilter(double x, double y) {
+  double bx = x.abs() < 0.1 ? 0 : x;
+  double by = y.abs() < 0.1 ? 0 : y;
+  return bx == 0 && by == 0
+      ? null
+      : ui.ImageFilter.blur(sigmaX: bx, sigmaY: by);
+}
+
 class FlutterActorLayerEffectRenderer extends ActorLayerEffectRenderer
     with FlutterActorDrawable {
   @override
@@ -1320,8 +1328,7 @@ class FlutterActorLayerEffectRenderer extends ActorLayerEffectRenderer
     if (blur?.isActive ?? false) {
       baseBlurX = blur.blurX;
       baseBlurY = blur.blurY;
-      layerPaint.imageFilter =
-          ui.ImageFilter.blur(sigmaX: baseBlurX, sigmaY: baseBlurY);
+      layerPaint.imageFilter = _blurFilter(baseBlurX, baseBlurY);
     }
 
     if (dropShadows.isNotEmpty) {
@@ -1337,9 +1344,8 @@ class FlutterActorLayerEffectRenderer extends ActorLayerEffectRenderer
         canvas.translate(dropShadow.offsetX, dropShadow.offsetY);
         var shadowPaint = Paint()
           ..color = layerColor
-          ..imageFilter = ui.ImageFilter.blur(
-              sigmaX: dropShadow.blurX + baseBlurX,
-              sigmaY: dropShadow.blurY + baseBlurY)
+          ..imageFilter = _blurFilter(
+              dropShadow.blurX + baseBlurX, dropShadow.blurY + baseBlurY)
           ..colorFilter = ui.ColorFilter.mode(
               ui.Color.fromRGBO(
                   (color[0] * 255.0).round(),
@@ -1382,9 +1388,8 @@ class FlutterActorLayerEffectRenderer extends ActorLayerEffectRenderer
           ..color = layerColor
           ..blendMode =
               extraBlendPass ? ui.BlendMode.srcIn : ui.BlendMode.srcATop
-          ..imageFilter = ui.ImageFilter.blur(
-              sigmaX: innerShadow.blurX + baseBlurX,
-              sigmaY: innerShadow.blurY + baseBlurY)
+          ..imageFilter = _blurFilter(
+              innerShadow.blurX + baseBlurX, innerShadow.blurY + baseBlurY)
           ..colorFilter = ui.ColorFilter.mode(
               ui.Color.fromRGBO(
                   (color[0] * 255.0).round(),

diff --git a/flare_flutter/pubspec.yaml b/flare_flutter/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flare_flutter
 description: Vector design and runtime animation for Flutter.
-version: 1.8.0
+version: 1.8.1
 author: "Rive Team <[email protected]>"
 homepage: https://github.com/2d-inc/Flare-Flutter
 environment: