Skip to content

[FIX] Allow picker to handle arbitrary canvas resolution #122

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Feb 6, 2025
Merged

[FIX] Allow picker to handle arbitrary canvas resolution #122

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 20 additions & 10 deletions src/app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,21 +193,33 @@ class AppElement extends AsyncElement {
};
}

// New helper to convert CSS coordinates to canvas (picker) coordinates
private _getPickerCoordinates(event: PointerEvent): { x: number, y: number } {
// Get the canvas' bounding rectangle in CSS pixels.
const canvasRect = this._canvas!.getBoundingClientRect();
// Compute scale factors based on canvas actual resolution vs. its CSS display size.
const scaleX = this._canvas!.width / canvasRect.width;
const scaleY = this._canvas!.height / canvasRect.height;
// Convert the client coordinates accordingly.
const x = (event.clientX - canvasRect.left) * scaleX;
const y = (event.clientY - canvasRect.top) * scaleY;
return { x, y };
}

_onPointerMove(event: PointerEvent) {
if (!this._picker || !this.app) return;

const camera = this.app!.root.findComponent('camera') as CameraComponent;
if (!camera) return;

const canvasRect = this._canvas!.getBoundingClientRect();
const x = event.clientX - canvasRect.left;
const y = event.clientY - canvasRect.top;
// Use the helper to convert event coordinates into canvas/picker coordinates.
const { x, y } = this._getPickerCoordinates(event);

this._picker.prepare(camera, this.app!.scene);
const selection = this._picker.getSelection(x, y);

// Get the currently hovered entity by walking up the hierarchy
let newHoverEntity = null;
let newHoverEntity: EntityElement | null = null;
if (selection.length > 0) {
let currentNode: GraphNode | null = selection[0].node;
while (currentNode !== null) {
Expand Down Expand Up @@ -245,9 +257,8 @@ class AppElement extends AsyncElement {
const camera = this.app!.root.findComponent('camera') as CameraComponent;
if (!camera) return;

const canvasRect = this._canvas!.getBoundingClientRect();
const x = event.clientX - canvasRect.left;
const y = event.clientY - canvasRect.top;
// Convert the event's pointer coordinates
const { x, y } = this._getPickerCoordinates(event);

this._picker.prepare(camera, this.app!.scene);
const selection = this._picker.getSelection(x, y);
Expand All @@ -271,9 +282,8 @@ class AppElement extends AsyncElement {
const camera = this.app!.root.findComponent('camera') as CameraComponent;
if (!camera) return;

const canvasRect = this._canvas!.getBoundingClientRect();
const x = event.clientX - canvasRect.left;
const y = event.clientY - canvasRect.top;
// Convert CSS coordinates to picker coordinates
const { x, y } = this._getPickerCoordinates(event);

this._picker.prepare(camera, this.app!.scene);
const selection = this._picker.getSelection(x, y);
Expand Down