Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Consider displaced hitboxes in GestureHitboxes mixin #2957

Merged
merged 1 commit into from Jan 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -19,8 +19,14 @@ mixin GestureHitboxes on Component {
return hitboxes.any((hitbox) => hitbox.containsPoint(point));
}

static final _temporaryPoint = Vector2.zero();

@override
bool containsLocalPoint(Vector2 point) {
return hitboxes.any((hitbox) => hitbox.containsLocalPoint(point));
return hitboxes.any(
(hitbox) => hitbox.containsLocalPoint(
hitbox.parentToLocal(point, output: _temporaryPoint),
),
);
}
}
6 changes: 4 additions & 2 deletions packages/flame/lib/src/components/position_component.dart
Expand Up @@ -273,10 +273,12 @@ class PositionComponent extends Component
}

@override
Vector2 parentToLocal(Vector2 point) => transform.globalToLocal(point);
Vector2 parentToLocal(Vector2 point, {Vector2? output}) =>
transform.globalToLocal(point, output: output);

@override
Vector2 localToParent(Vector2 point) => transform.localToGlobal(point);
Vector2 localToParent(Vector2 point, {Vector2? output}) =>
transform.localToGlobal(point, output: output);

/// Convert local coordinates of a point [point] inside the component
/// into the parent's coordinate space.
Expand Down
43 changes: 43 additions & 0 deletions packages/flame/test/components/mixins/gesture_hitboxes_test.dart
Expand Up @@ -47,6 +47,49 @@ void main() {
expect(component.containsPoint(point), isTrue);
});

testWithFlameGame('CircleHitbox is displaced within the parent component',
(game) async {
final component = _HitboxComponent();
component.position.setAll(10);
component.size.setValues(2.0, 2.0);

final hitbox = CircleHitbox(
position: Vector2(1.0, 1.5),
radius: 0.5,
anchor: Anchor.center,
);

component.add(hitbox);
await game.ensureAdd(component);

final point = component.position + hitbox.position;
expect(component.containsPoint(point), isTrue);
final outsidePoint = component.position + Vector2(1.0, 0.99);
expect(component.containsPoint(outsidePoint), isFalse);
});

testWithFlameGame(
'RectangleHitbox is displaced within the parent component',
(game) async {
final component = _HitboxComponent();
component.position.setAll(10);
component.size.setValues(2.0, 2.0);

final hitbox = RectangleHitbox(
position: Vector2(1.0, 1.5),
size: Vector2.all(1.0),
anchor: Anchor.center,
);

component.add(hitbox);
await game.ensureAdd(component);

final point = component.position + hitbox.position;
expect(component.containsPoint(point), isTrue);
final outsidePoint = component.position + Vector2(1.0, 0.99);
expect(component.containsPoint(outsidePoint), isFalse);
});

testWithFlameGame('get component hitboxes', (game) async {
final component = _HitboxComponent();
component.position.setValues(1.0, 1.0);
Expand Down