Skip to content

Commit

Permalink
feat: Make Viewfinder and Viewport comply with CoordinateTransform in…
Browse files Browse the repository at this point in the history
…terface (#2872)

Make `Viewfinder` and `Viewport` comply with `CoordinateTransform`
interface; they already perform the coordinate transform operation but
didn't technically implement then interface.
  • Loading branch information
luanpotter committed Nov 26, 2023
1 parent 37f7b12 commit 685e1d9
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 8 deletions.
21 changes: 17 additions & 4 deletions packages/flame/lib/src/camera/viewfinder.dart
@@ -1,9 +1,7 @@
import 'dart:math';

import 'package:flame/components.dart';
import 'package:flame/extensions.dart';
import 'package:flame/src/anchor.dart';
import 'package:flame/src/camera/camera_component.dart';
import 'package:flame/src/components/core/component.dart';
import 'package:flame/src/effects/provider_interfaces.dart';
import 'package:flame/src/game/transform2d.dart';
import 'package:meta/meta.dart';
Expand All @@ -18,7 +16,12 @@ import 'package:meta/meta.dart';
/// If you add children to the [Viewfinder] they will appear like HUDs i.e.
/// statically in front of the world.
class Viewfinder extends Component
implements AnchorProvider, AngleProvider, PositionProvider, ScaleProvider {
implements
AnchorProvider,
AngleProvider,
PositionProvider,
ScaleProvider,
CoordinateTransform {
/// Transform matrix used by the viewfinder.
final Transform2D transform = Transform2D();

Expand Down Expand Up @@ -180,6 +183,16 @@ class Viewfinder extends Component
}
}

@override
Vector2 parentToLocal(Vector2 point) {
return globalToLocal(point);
}

@override
Vector2 localToParent(Vector2 point) {
return localToGlobal(point);
}

@override
void onGameResize(Vector2 size) {
_updateZoom();
Expand Down
20 changes: 16 additions & 4 deletions packages/flame/lib/src/camera/viewport.dart
@@ -1,9 +1,7 @@
import 'package:flame/components.dart';
import 'package:flame/extensions.dart';
import 'package:flame/game.dart';
import 'package:flame/src/anchor.dart';
import 'package:flame/src/camera/camera_component.dart';
import 'package:flame/src/camera/viewports/fixed_resolution_viewport.dart';
import 'package:flame/src/components/core/component.dart';
import 'package:flame/src/effects/provider_interfaces.dart';
import 'package:meta/meta.dart';

Expand All @@ -21,7 +19,11 @@ import 'package:meta/meta.dart';
/// A viewport establishes its own local coordinate system, with the origin at
/// the top left corner of the viewport's bounding box.
abstract class Viewport extends Component
implements AnchorProvider, PositionProvider, SizeProvider {
implements
AnchorProvider,
PositionProvider,
SizeProvider,
CoordinateTransform {
Viewport({super.children});

final Vector2 _size = Vector2.zero();
Expand Down Expand Up @@ -148,6 +150,16 @@ abstract class Viewport extends Component
return (output?..setValues(x, y)) ?? Vector2(x, y);
}

@override
Vector2 parentToLocal(Vector2 point) {
return globalToLocal(point);
}

@override
Vector2 localToParent(Vector2 point) {
return localToGlobal(point);
}

void transformCanvas(Canvas canvas) {
canvas.transform2D(transform);
}
Expand Down

0 comments on commit 685e1d9

Please sign in to comment.