Merge pull request #115 from 2d-inc/master

Instance shape node from actor.
2d-inc · Jul 3, 2019 · 01387cd · 01387cd
2 parents 0ee2efe + 525613e
commit 01387cd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 16 deletions.
diff --git a/flare_dart/lib/actor_shape.dart b/flare_dart/lib/actor_shape.dart
@@ -26,29 +26,27 @@ class ActorShape extends ActorDrawable {
 
   static ActorShape read(
       ActorArtboard artboard, StreamReader reader, ActorShape component) {
-    if (component == null) {
-      component = ActorShape();
-    }
-
     ActorDrawable.read(artboard, reader, component);
 
     return component;
   }
 
+  @override
   ActorComponent makeInstance(ActorArtboard resetArtboard) {
-    ActorShape instanceEvent = ActorShape();
-    instanceEvent.copyShape(this, resetArtboard);
-    return instanceEvent;
+    ActorShape instanceShape = resetArtboard.actor.makeShapeNode();
+    instanceShape.copyShape(this, resetArtboard);
+    return instanceShape;
   }
 
   void copyShape(ActorShape node, ActorArtboard resetArtboard) {
     copyDrawable(node, resetArtboard);
   }
 
+  @override
   AABB computeAABB() {
     AABB aabb;
-    for (List<ActorShape> clips in clipShapes) {
-      for (ActorShape node in clips) {
+    for (final List<ActorShape> clips in clipShapes) {
+      for (final ActorShape node in clips) {
         AABB bounds = node.computeAABB();
         if (bounds == null) {
           continue;

diff --git a/flare_flutter/lib/flare.dart b/flare_flutter/lib/flare.dart
@@ -271,13 +271,6 @@ class FlutterActorShape extends ActorShape with FlutterActorDrawable {
 
     canvas.restore();
   }
-
-  @override
-  ActorComponent makeInstance(ActorArtboard resetArtboard) {
-    FlutterActorShape instanceNode = FlutterActorShape();
-    instanceNode.copyShape(this, resetArtboard);
-    return instanceNode;
-  }
 }
 
 class FlutterColorFill extends ColorFill with FlutterFill {