Skip to content

Commit bc45d50

Browse files
committed
feat: use vector_math 32
1 parent ce7822a commit bc45d50

30 files changed

+32
-32
lines changed

packages/flame/lib/src/camera/behaviors/follow_behavior.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import 'package:flame/src/camera/viewport.dart';
33
import 'package:flame/src/components/core/component.dart';
44
import 'package:flame/src/components/position_component.dart';
55
import 'package:flame/src/effects/provider_interfaces.dart';
6-
import 'package:vector_math/vector_math_64.dart';
6+
import 'package:vector_math/vector_math.dart';
77

88
/// This behavior will make the [owner] follow the [target].
99
///

packages/flame/lib/src/camera/viewports/circular_viewport.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'dart:ui';
22

33
import 'package:flame/src/camera/viewport.dart';
4-
import 'package:vector_math/vector_math_64.dart';
4+
import 'package:vector_math/vector_math.dart';
55

66
/// A fixed-size viewport in the shape of a circle (or ellipse).
77
///

packages/flame/lib/src/camera/viewports/fixed_aspect_ratio_viewport.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import 'dart:ui';
22

33
import 'package:flame/src/camera/viewport.dart';
44
import 'package:meta/meta.dart';
5-
import 'package:vector_math/vector_math_64.dart';
5+
import 'package:vector_math/vector_math.dart';
66

77
/// [FixedAspectRatioViewport] is a rectangular viewport which auto-expands to
88
/// take as much space as possible within the canvas, while maintaining a fixed

packages/flame/lib/src/camera/viewports/fixed_size_viewport.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'dart:ui';
22

33
import 'package:flame/src/camera/viewport.dart';
4-
import 'package:vector_math/vector_math_64.dart';
4+
import 'package:vector_math/vector_math.dart';
55

66
/// A rectangular viewport with fixed dimensions.
77
///

packages/flame/lib/src/camera/viewports/max_viewport.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import 'dart:ui';
22

33
import 'package:flame/src/camera/viewport.dart';
44
import 'package:meta/meta.dart';
5-
import 'package:vector_math/vector_math_64.dart';
5+
import 'package:vector_math/vector_math.dart';
66

77
/// The default viewport, which is as big as the game canvas allows.
88
///

packages/flame/lib/src/camera/world.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import 'dart:ui';
33
import 'package:flame/src/camera/camera_component.dart';
44
import 'package:flame/src/components/core/component.dart';
55
import 'package:flame/src/components/mixins/coordinate_transform.dart';
6-
import 'package:vector_math/vector_math_64.dart';
6+
import 'package:vector_math/vector_math.dart';
77

88
/// The root component for all game world elements.
99
///

packages/flame/lib/src/components/mixins/coordinate_transform.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import 'package:flame/src/components/core/component.dart';
2-
import 'package:vector_math/vector_math_64.dart';
2+
import 'package:vector_math/vector_math.dart';
33

44
/// Interface to be implemented by components that perform a coordinate change.
55
///

packages/flame/lib/src/effects/anchor_by_effect.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import 'package:flame/src/anchor.dart';
22
import 'package:flame/src/effects/anchor_effect.dart';
33
import 'package:flame/src/effects/controllers/effect_controller.dart';
44
import 'package:flame/src/effects/provider_interfaces.dart';
5-
import 'package:vector_math/vector_math_64.dart';
5+
import 'package:vector_math/vector_math.dart';
66

77
/// An [AnchorEffect] that changes its target's anchor by the specified offset.
88
///

packages/flame/lib/src/effects/anchor_to_effect.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import 'package:flame/src/anchor.dart';
22
import 'package:flame/src/effects/anchor_effect.dart';
33
import 'package:flame/src/effects/controllers/effect_controller.dart';
44
import 'package:flame/src/effects/provider_interfaces.dart';
5-
import 'package:vector_math/vector_math_64.dart';
5+
import 'package:vector_math/vector_math.dart';
66

77
/// An effect that moves the target's anchor to the specified value.
88
///

packages/flame/lib/src/effects/move_by_effect.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'package:flame/src/effects/controllers/effect_controller.dart';
22
import 'package:flame/src/effects/move_effect.dart';
33
import 'package:flame/src/effects/provider_interfaces.dart';
4-
import 'package:vector_math/vector_math_64.dart';
4+
import 'package:vector_math/vector_math.dart';
55

66
/// A [MoveEffect] that moves its target by the specified offset vector.
77
///

packages/flame/lib/src/effects/move_to_effect.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import 'package:flame/src/effects/controllers/effect_controller.dart';
22
import 'package:flame/src/effects/move_by_effect.dart';
33
import 'package:flame/src/effects/move_effect.dart';
44
import 'package:flame/src/effects/provider_interfaces.dart';
5-
import 'package:vector_math/vector_math_64.dart';
5+
import 'package:vector_math/vector_math.dart';
66

77
/// A [MoveEffect] that moves its target towards the given destination point.
88
///

packages/flame/lib/src/experimental/geometry/shapes/rounded_rectangle.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import 'package:flame/geometry.dart';
55
import 'package:flame/math.dart';
66
import 'package:flame/src/experimental/geometry/shapes/shape.dart';
77
import 'package:flame/src/game/transform2d.dart';
8-
import 'package:vector_math/vector_math_64.dart';
8+
import 'package:vector_math/vector_math.dart';
99

1010
/// An axis-aligned rectangle with rounded corners.
1111
///

packages/flame/lib/src/experimental/geometry/shapes/shape.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import 'package:flame/src/experimental/geometry/shapes/polygon.dart';
66
import 'package:flame/src/experimental/geometry/shapes/rectangle.dart';
77
import 'package:flame/src/experimental/geometry/shapes/rounded_rectangle.dart';
88
import 'package:flame/src/game/transform2d.dart';
9-
import 'package:vector_math/vector_math_64.dart';
9+
import 'package:vector_math/vector_math.dart';
1010

1111
/// Base class for various 2D geometric primitives defined on a Cartesian
1212
/// coordinate plane.

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import 'package:vector_math/vector_math_64.dart';
1+
import 'package:vector_math/vector_math.dart';
22

3-
export 'package:vector_math/vector_math_64.dart' hide Colors;
3+
export 'package:vector_math/vector_math.dart' hide Colors;
44

55
extension Matrix4Extension on Matrix4 {
66
/// A first row and first column value.

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import 'dart:math';
22
import 'dart:ui';
33

4-
import 'package:vector_math/vector_math_64.dart';
4+
import 'package:vector_math/vector_math.dart';
55

6-
export 'package:vector_math/vector_math_64.dart' hide Colors;
6+
export 'package:vector_math/vector_math.dart' hide Colors;
77

88
extension Vector2Extension on Vector2 {
99
/// This is a reusable vector that can be used within the [Vector2Extension]

packages/flame/lib/src/game/notifying_vector2.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import 'package:flutter/foundation.dart';
2-
import 'package:vector_math/vector_math_64.dart';
2+
import 'package:vector_math/vector_math.dart';
33

44
/// Extension of the standard [Vector2] class, implementing the [ChangeNotifier]
55
/// functionality. This allows any interested party to be notified when the

packages/flame/lib/src/game/transform2d.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import 'dart:math' as math;
33
import 'package:flame/geometry.dart' as geometry;
44
import 'package:flame/src/game/notifying_vector2.dart';
55
import 'package:flutter/foundation.dart';
6-
import 'package:vector_math/vector_math_64.dart';
6+
import 'package:vector_math/vector_math.dart';
77

88
/// This class describes a generic 2D transform, which is a combination of
99
/// translations, rotations, reflections and scaling. These transforms are

packages/flame/lib/src/math/tmp_vector2.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import 'package:meta/meta.dart';
2-
import 'package:vector_math/vector_math_64.dart';
2+
import 'package:vector_math/vector_math.dart';
33

44
/// Use internally when you need a temporary [Vector2] object but don't want to
55
/// instantiate a new one due to performance.

packages/flame/lib/src/rendering/rotate3d_decorator.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import 'dart:ui';
22

33
import 'package:flame/geometry.dart';
44
import 'package:flame/src/rendering/decorator.dart';
5-
import 'package:vector_math/vector_math_64.dart';
5+
import 'package:vector_math/vector_math.dart';
66

77
/// [Rotate3DDecorator] treats the underlying component as if it was a flat
88
/// sheet of paper, and applies a 3D rotation to it.

packages/flame/lib/src/rendering/shadow3d_decorator.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import 'dart:ui';
22

33
import 'package:flame/src/palette.dart';
44
import 'package:flame/src/rendering/decorator.dart';
5-
import 'package:vector_math/vector_math_64.dart' show Matrix4, Vector2;
5+
import 'package:vector_math/vector_math.dart' show Matrix4, Vector2;
66

77
/// [Shadow3DDecorator] casts a realistic-looking shadow from the component
88
/// onto the ground.

packages/flame/test/camera/behaviors/viewport_aware_bounds_behavior_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import 'package:flame/camera.dart';
44
import 'package:flame/experimental.dart';
55
import 'package:flame_test/flame_test.dart';
66
import 'package:flutter_test/flutter_test.dart';
7-
import 'package:vector_math/vector_math_64.dart';
7+
import 'package:vector_math/vector_math.dart';
88

99
void main() {
1010
group('ViewportAwareBoundsBehavior', () {

packages/flame/test/camera/viewports/fixed_aspect_ratio_viewport_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import 'dart:ui';
44
import 'package:flame/camera.dart';
55
import 'package:flame_test/flame_test.dart';
66
import 'package:flutter_test/flutter_test.dart';
7-
import 'package:vector_math/vector_math_64.dart';
7+
import 'package:vector_math/vector_math.dart';
88

99
void main() {
1010
group('FixedAspectRatioViewport', () {

packages/flame/test/components/text_component_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'package:flame/src/components/text_component.dart';
22
import 'package:test/test.dart';
3-
import 'package:vector_math/vector_math_64.dart';
3+
import 'package:vector_math/vector_math.dart';
44

55
void main() {
66
group('TextComponent', () {

packages/flame/test/extensions/aabb_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import 'package:test/test.dart';
77
void main() {
88
group('Aabb2Extension', () {
99
// aabb2 is an axis aligned bounding box between a min and a max
10-
// see https://api.flutter.dev/flutter/vector_math_64/Aabb2-class.html
10+
// see https://api.flutter.dev/flutter/package:vector_math/vector_math.dart/Aabb2-class.html
1111
// The extension is used to convert this bounding box to a rect.
1212
test('Default aabb constructor', () {
1313
final aab2 = Aabb2();

packages/flame/test/game/notifying_vector2_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'package:flame/src/game/notifying_vector2.dart';
22
import 'package:test/test.dart';
3-
import 'package:vector_math/vector_math_64.dart';
3+
import 'package:vector_math/vector_math.dart';
44

55
void main() {
66
/// This helper function creates a "normal" Vector2 copy of [v1],

packages/flame/test/game/transform2d_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import 'dart:math' as math;
33
import 'package:flame/geometry.dart';
44
import 'package:flame/src/game/transform2d.dart';
55
import 'package:test/test.dart';
6-
import 'package:vector_math/vector_math_64.dart';
6+
import 'package:vector_math/vector_math.dart';
77

88
void main() {
99
group('Transform2D', () {

packages/flame_test/lib/src/close_to_aabb.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import 'package:flutter_test/flutter_test.dart';
2-
import 'package:vector_math/vector_math_64.dart';
2+
import 'package:vector_math/vector_math.dart';
33

44
/// Returns a matcher which checks if the argument is an axis-aligned bounding
55
/// box sufficiently close (within distance [epsilon]) to [expected]. Example

packages/flame_test/lib/src/close_to_vector.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import 'package:flutter_test/flutter_test.dart';
2-
import 'package:vector_math/vector_math_64.dart';
2+
import 'package:vector_math/vector_math.dart';
33

44
/// Returns a matcher which checks if the argument is a vector within distance
55
/// [epsilon] of [vector]. For example:

packages/flame_test/test/close_to_aabb_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'package:flame_test/src/close_to_aabb.dart';
22
import 'package:flutter_test/flutter_test.dart';
3-
import 'package:vector_math/vector_math_64.dart';
3+
import 'package:vector_math/vector_math.dart';
44

55
void main() {
66
group('closeToAabb', () {

packages/flame_test/test/close_to_vector_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'package:flame_test/src/close_to_vector.dart';
22
import 'package:flutter_test/flutter_test.dart';
3-
import 'package:vector_math/vector_math_64.dart';
3+
import 'package:vector_math/vector_math.dart';
44

55
void main() {
66
group('closeToVector', () {

0 commit comments

Comments
 (0)