Skip to content

Commit 298a781

Browse files
committed
refactors renames and other stuff
1 parent 31ce674 commit 298a781

File tree

13 files changed

+36
-19
lines changed

13 files changed

+36
-19
lines changed

examples/lib/stories/camera_and_viewport/camera_component_example.dart

+16-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import 'dart:math';
2+
import 'dart:typed_data';
23

34
import 'package:flame/camera.dart';
45
import 'package:flame/components.dart';
@@ -116,13 +117,25 @@ class Bezel extends PositionComponent {
116117
const Radius.circular(5.0),
117118
),
118119
))
119-
.transform((Matrix4.identity()..rotateZ(pi / 4)).storage);
120+
.transform(
121+
Float64List.fromList(
122+
(Matrix4.identity()..rotateZ(pi / 4)).storage,
123+
),
124+
);
120125
connector = (Path()
121126
..addArc(Rect.fromLTRB(-outer, -outer, outer, outer), -0.22, 0.44))
122-
.transform((Matrix4.identity()..rotateZ(pi / 4)).storage);
127+
.transform(
128+
Float64List.fromList(
129+
(Matrix4.identity()..rotateZ(pi / 4)).storage,
130+
),
131+
);
123132
specularHighlight = (Path()
124133
..addOval(Rect.fromLTWH(-radius * 0.8, -8, 16, radius * 0.3)))
125-
.transform((Matrix4.identity()..rotateZ(pi / 4)).storage);
134+
.transform(
135+
Float64List.fromList(
136+
(Matrix4.identity()..rotateZ(pi / 4)).storage,
137+
),
138+
);
126139

127140
glassPaint = Paint()..color = const Color(0x1400ffae);
128141
rimBorderPaint = Paint()

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

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import 'dart:typed_data';
12
import 'dart:ui';
23

34
import 'package:flame/components.dart';
@@ -47,7 +48,7 @@ mixin Snapshot on PositionComponent {
4748
} else {
4849
final recorder = PictureRecorder();
4950
final canvas = Canvas(recorder);
50-
canvas.transform(transform.storage);
51+
canvas.transform(Float64List.fromList(transform.storage));
5152
canvas.drawPicture(_picture!);
5253
final picture = recorder.endRecording();
5354
return picture.toImageSync(width, height);
@@ -63,7 +64,7 @@ mixin Snapshot on PositionComponent {
6364
final canvas = Canvas(recorder);
6465
final matrix = transformMatrix.clone();
6566
matrix.invert();
66-
canvas.transform(matrix.storage);
67+
canvas.transform(Float64List.fromList(matrix.storage));
6768
super.renderTree(canvas);
6869
_picture = recorder.endRecording();
6970
return _picture!;
@@ -82,9 +83,7 @@ mixin Snapshot on PositionComponent {
8283
takeSnapshot();
8384
}
8485
canvas.save();
85-
canvas.transform(
86-
transformMatrix.storage,
87-
);
86+
canvas.transform(Float64List.fromList(transformMatrix.storage));
8887
canvas.drawPicture(_picture!);
8988
canvas.restore();
9089
} else {

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import 'dart:typed_data';
12
import 'dart:ui';
23

34
import 'package:flame/palette.dart';
@@ -59,6 +60,6 @@ extension CanvasExtension on Canvas {
5960

6061
/// Use the [Transform2D] object to [transform] the canvas.
6162
void transform2D(Transform2D transform2D) {
62-
transform(transform2D.transformMatrix.storage);
63+
transform(Float64List.fromList(transform2D.transformMatrix.storage));
6364
}
6465
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -185,5 +185,5 @@ class NotifyingVector2 extends Vector2 with ChangeNotifier {
185185
}
186186

187187
@override
188-
Float64List get storage => super.storage.asUnmodifiableView();
188+
Float32List get storage => super.storage.asUnmodifiableView();
189189
}

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import 'dart:typed_data';
12
import 'dart:ui';
23

34
import 'package:flame/geometry.dart';
@@ -61,7 +62,7 @@ class Rotate3DDecorator extends Decorator {
6162
..rotateY(angleY)
6263
..rotateZ(angleZ)
6364
..translate(-center.x, -center.y);
64-
canvas.transform(matrix.storage);
65+
canvas.transform(Float64List.fromList(matrix.storage));
6566
draw(canvas);
6667
canvas.restore();
6768
}

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import 'dart:typed_data';
12
import 'dart:ui';
23

34
import 'package:flame/src/palette.dart';
@@ -156,7 +157,7 @@ class Shadow3DDecorator extends Decorator {
156157

157158
canvas.saveLayer(null, _paint!);
158159
canvas.translate(base.x + _shift, base.y);
159-
canvas.transform(_transformMatrix!.storage);
160+
canvas.transform(Float64List.fromList(_transformMatrix!.storage));
160161
draw(canvas);
161162
canvas.restore();
162163
draw(canvas);

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import 'dart:typed_data';
12
import 'dart:ui';
23

34
import 'package:flame/src/components/position_component.dart';
@@ -17,7 +18,7 @@ class Transform2DDecorator extends Decorator {
1718
@override
1819
void apply(void Function(Canvas) draw, Canvas canvas) {
1920
canvas.save();
20-
canvas.transform(transform2d.transformMatrix.storage);
21+
canvas.transform(Float64List.fromList(transform2d.transformMatrix.storage));
2122
draw(canvas);
2223
canvas.restore();
2324
}

packages/flame/lib/src/sprite_batch.dart

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import 'dart:collection';
22
import 'dart:math' show pi;
3+
import 'dart:typed_data';
34
import 'dart:ui';
45

56
import 'package:flame/cache.dart';
@@ -431,7 +432,7 @@ class SpriteBatch {
431432

432433
canvas
433434
..save()
434-
..transform(batchItem.matrix.storage)
435+
..transform(Float64List.fromList(batchItem.matrix.storage))
435436
..drawRect(batchItem.destination, batchItem.paint)
436437
..drawImageRect(
437438
atlas,

packages/flame/test/components/mixins/snapshot_test.dart

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import 'package:flame/components.dart';
55
import 'package:flame/extensions.dart';
66
import 'package:flame/game.dart';
77
import 'package:flame_test/flame_test.dart';
8-
import 'package:flutter/widgets.dart';
98
import 'package:flutter_test/flutter_test.dart';
109

1110
void main() {

packages/flame/test/extensions/matrix4_test.dart

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

3-
import 'package:flame/extensions.dart';
3+
import 'package:flame/extensions_matrix4.dart';
44
import 'package:flame_test/flame_test.dart';
55
import 'package:mocktail/mocktail.dart';
66
import 'package:test/test.dart';

packages/flame_forge2d/lib/body_component.dart

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import 'dart:ui';
33
import 'package:flame/components.dart' hide World;
44
import 'package:flame/effects.dart';
55
import 'package:flame/extensions.dart';
6+
import 'package:flame/extensions_matrix4.dart';
67
import 'package:flame/game.dart';
78
import 'package:flame_forge2d/flame_forge2d.dart';
89
import 'package:flutter/foundation.dart';
@@ -101,7 +102,7 @@ class BodyComponent<T extends Forge2DGame> extends Component
101102
_lastAngle = angle;
102103
}
103104
canvas.save();
104-
canvas.transform(matrix.storage);
105+
canvas.transform(Float64List.fromList(matrix.storage));
105106
super.renderTree(canvas);
106107
canvas.restore();
107108
}

packages/flame_forge2d/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencies:
1919
flame: ^1.22.0
2020
flutter:
2121
sdk: flutter
22-
forge2d: ^0.13.1
22+
forge2d: ^0.14.0
2323

2424
dev_dependencies:
2525
dartdoc: ^8.0.8

packages/flame_studio/lib/src/widgets/panels/hierarchy_view.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'package:flame/components.dart';
1+
import 'package:flame/components.dart' show Component;
22
import 'package:flame_studio/src/core/component_tree.dart';
33
import 'package:flutter/widgets.dart';
44
import 'package:flutter_riverpod/flutter_riverpod.dart';

0 commit comments

Comments
 (0)