Merge branch 'main' into feat/manage_sprite_batch_items_by_id

Author: spydon

packages/flame/lib/src/extensions/canvas.dart

@@ -30,6 +30,13 @@ extension CanvasExtension on Canvas {
     drawRect(rect, paint ?? BasicPalette.magenta.paint());
   }
 
+  /// Renders a line between [p1] and [p2] using the provided [paint].
+  ///
+  /// Equivalent to [drawLine] but using [Vector2] instead of [Offset].
+  void renderLine(Vector2 p1, Vector2 p2, Paint paint) {
+    drawLine(p1.toOffset(), p2.toOffset(), paint);
+  }
+
   /// Utility method to render stuff on a specific place in an isolated way.
   ///
   /// Some render methods don't allow to pass a vector.

packages/flame/test/extensions/canvas_test.dart

@@ -1,3 +1,5 @@
+import 'dart:ui';
+
 import 'package:canvas_test/canvas_test.dart';
 import 'package:flame/extensions.dart';
 import 'package:mocktail/mocktail.dart';
@@ -18,6 +20,7 @@ void main() {
       canvas.translateVector(Vector2(1, 2));
       verify(() => canvas.translate(1, 2)).called(1);
     });
+
     test('renderPoint', () {
       final canvas = MockCanvas();
       canvas.renderPoint(Vector2.all(10.0), size: 2);
@@ -27,6 +30,16 @@ void main() {
       );
     });
 
+    test('renderLine', () {
+      final canvas = MockCanvas();
+      final paint = Paint()..color = const Color(0xFFFF00FF);
+      canvas.renderLine(Vector2.all(1), Vector2(3, 0), paint);
+      expect(
+        canvas,
+        MockCanvas()..drawLine(const Offset(1, 1), const Offset(3, 0), paint),
+      );
+    });
+
     test('renderAt saves, translates draws and then restores', () {
       final canvas = _MocktailCanvas();
       when(canvas.save).thenReturn(null);

packages/flame_3d/README.md

@@ -69,7 +69,7 @@ In order to use flame_3d, you will need to ensure a few things. Firstly, the onl
 have explicitly tested so far for support were Android, iOS, and macOS.
 
 Then, you need to enable Impeller, if not already enabled by default. For example, for macOS, add
-the following to the `Info.plist` in your `macos/` directory:
+the following to the generated `macos/runner/Info.plist` directory:
 
 ```xml
 <dict>
@@ -82,15 +82,15 @@ the following to the `Info.plist` in your `macos/` directory:
 You can also run Flutter with the flag:
 
 ```bash
-flutter run --enable-impeller
+flutter run --enable-flutter-gpu
 ```
 
 Now everything is set up you can start doing some 3D magic! You can check out the
 [example](https://github.com/flame-engine/flame/tree/main/packages/flame_3d/example) to see how you
 can set up a simple 3D environment using Flame.
 
-Also check out the [flame_3d_extras](https://github.com/luanpotter/flame_3d_extras) package for more
-utilities and helpers not yet merged into `flame_3d`.
+Also check our more advanced examples, [Collect the Donut](https://github.com/luanpotter/collect_the_donut)
+and [Defend the Donut](https://github.com/flame-engine/defend_the_donut).
 
 
 ## Building shaders