Merge branch 'main' into spydon/hud-events-should-be-before-world

flame-engine · Aug 7, 2023 · 96bbd57 · 96bbd57
2 parents 3083ea8 + c542d3c
commit 96bbd57
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/packages/flame/lib/src/geometry/polygon_component.dart b/packages/flame/lib/src/geometry/polygon_component.dart
@@ -38,6 +38,7 @@ class PolygonComponent extends ShapeComponent {
     super.priority,
     super.paint,
     super.paintLayers,
+    super.key,
     bool? shrinkToBounds,
   })  : assert(
           _vertices.length > 2,
@@ -78,6 +79,7 @@ class PolygonComponent extends ShapeComponent {
     Paint? paint,
     List<Paint>? paintLayers,
     bool? shrinkToBounds,
+    ComponentKey? key,
   }) : this(
           normalsToVertices(relation, parentSize),
           position: position,
@@ -88,6 +90,7 @@ class PolygonComponent extends ShapeComponent {
           paint: paint,
           paintLayers: paintLayers,
           shrinkToBounds: shrinkToBounds,
+          key: key,
         );
 
   @internal

diff --git a/packages/flame/lib/src/geometry/rectangle_component.dart b/packages/flame/lib/src/geometry/rectangle_component.dart
@@ -14,6 +14,7 @@ class RectangleComponent extends PolygonComponent {
     super.priority,
     super.paint,
     super.paintLayers,
+    super.key,
   }) : super(sizeToVertices(size ?? Vector2.zero(), anchor)) {
     size.addListener(
       () => refreshVertices(
@@ -32,6 +33,7 @@ class RectangleComponent extends PolygonComponent {
     super.paint,
     super.paintLayers,
     super.children,
+    super.key,
   }) : super(sizeToVertices(Vector2.all(size), anchor)) {
     this.size.addListener(
           () => refreshVertices(
@@ -56,6 +58,7 @@ class RectangleComponent extends PolygonComponent {
     super.paint,
     super.paintLayers,
     super.shrinkToBounds,
+    super.key,
   }) : super.relative([
           relation.clone(),
           Vector2(relation.x, -relation.y),
@@ -78,6 +81,7 @@ class RectangleComponent extends PolygonComponent {
     int? priority,
     Paint? paint,
     List<Paint>? paintLayers,
+    ComponentKey? key,
   }) {
     return RectangleComponent(
       position: anchor == Anchor.topLeft
@@ -93,6 +97,7 @@ class RectangleComponent extends PolygonComponent {
       priority: priority,
       paint: paint,
       paintLayers: paintLayers,
+      key: key,
     );
   }
 

diff --git a/packages/flame/lib/src/geometry/shape_component.dart b/packages/flame/lib/src/geometry/shape_component.dart
@@ -15,6 +15,7 @@ abstract class ShapeComponent extends PositionComponent with HasPaint {
     super.anchor,
     super.children,
     super.priority,
+    super.key,
     Paint? paint,
     List<Paint>? paintLayers,
   }) {