mirrors/misskey
1
0
Fork 1
mirror of https://github.com/misskey-dev/misskey.git synced 2026-05-27 09:34:39 +02:00
Code Releases Activity

Update controller.ts

Browse Source
This commit is contained in:
syuilo
2026-04-28 16:11:27 +09:00
parent 5a7960d0a9
commit dcb834ed41
1 changed files with 14 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
packages/frontend/src/world/room/controller.ts
View File

@@ -29,7 +29,6 @@ export class RoomController {
private engine: RoomEngine | null = null; private engine: RoomEngine | null = null;
private canvas: HTMLCanvasElement | null = null; private canvas: HTMLCanvasElement | null = null;
private options: RoomControllerOptions; private options: RoomControllerOptions;
private isCanvasDragging = false;
public isReady = ref(false); public isReady = ref(false);
public isSitting = ref(false); public isSitting = ref(false);
public isEditMode = ref(false); public isEditMode = ref(false);
@@ -42,6 +41,7 @@ export class RoomController {
} | null>(null); } | null>(null);
public roomState: ShallowRef<RoomState>; public roomState: ShallowRef<RoomState>;
public initializeProgress = ref(0); public initializeProgress = ref(0);
private pointerDownPosition: { x: number; y: number } | null = null;
constructor(roomState: RoomState, options: RoomControllerOptions) { constructor(roomState: RoomState, options: RoomControllerOptions) {
this.roomState = shallowRef(roomState); this.roomState = shallowRef(roomState);
@@ -51,9 +51,7 @@ export class RoomController {
this.onCanvasKeyup = this.onCanvasKeyup.bind(this); this.onCanvasKeyup = this.onCanvasKeyup.bind(this);
this.onCanvasWheel = this.onCanvasWheel.bind(this); this.onCanvasWheel = this.onCanvasWheel.bind(this);
this.onCanvasPointerdown = this.onCanvasPointerdown.bind(this); this.onCanvasPointerdown = this.onCanvasPointerdown.bind(this);
this.onCanvasPointermove = this.onCanvasPointermove.bind(this);
this.onCanvasPointerup = this.onCanvasPointerup.bind(this); this.onCanvasPointerup = this.onCanvasPointerup.bind(this);
this.onCanvasClick = this.onCanvasClick.bind(this);
} }
public async init(canvas: HTMLCanvasElement) { public async init(canvas: HTMLCanvasElement) {
@@ -149,9 +147,7 @@ export class RoomController {
this.canvas.addEventListener('keyup', this.onCanvasKeyup); this.canvas.addEventListener('keyup', this.onCanvasKeyup);
this.canvas.addEventListener('wheel', this.onCanvasWheel); this.canvas.addEventListener('wheel', this.onCanvasWheel);
this.canvas.addEventListener('pointerdown', this.onCanvasPointerdown); this.canvas.addEventListener('pointerdown', this.onCanvasPointerdown);
this.canvas.addEventListener('pointermove', this.onCanvasPointermove);
this.canvas.addEventListener('pointerup', this.onCanvasPointerup); this.canvas.addEventListener('pointerup', this.onCanvasPointerup);
this.canvas.addEventListener('click', this.onCanvasClick);
} }
private onCanvasKeydown(ev: KeyboardEvent) { private onCanvasKeydown(ev: KeyboardEvent) {
@@ -188,32 +184,23 @@ export class RoomController {
} }
private onCanvasPointerdown(ev: PointerEvent) { private onCanvasPointerdown(ev: PointerEvent) {
this.canvas?.setPointerCapture(ev.pointerId); this.pointerDownPosition = { x: ev.offsetX, y: ev.offsetY };
}
private onCanvasPointermove(ev: PointerEvent) {
if (this.canvas?.hasPointerCapture(ev.pointerId)) {
this.isCanvasDragging = true;
}
} }
private onCanvasPointerup(ev: PointerEvent) { private onCanvasPointerup(ev: PointerEvent) {
window.setTimeout(() => { if (this.pointerDownPosition != null) {
this.isCanvasDragging = false; const dx = Math.abs(ev.offsetX - this.pointerDownPosition.x);
this.canvas?.releasePointerCapture(ev.pointerId); const dy = Math.abs(ev.offsetY - this.pointerDownPosition.y);
}, 0); if (dx < 10 && dy < 10) {
} const median = { x: (ev.offsetX + this.pointerDownPosition.x) / 2, y: (ev.offsetY + this.pointerDownPosition.y) / 2 };
if (this.worker != null) {
private onCanvasClick(ev: MouseEvent) { this.worker.postMessage({ type: 'dom:click', ev: { x: median.x, y: median.y } });
if (this.isCanvasDragging) return; } else if (this.engine != null) {
if (this.worker != null) { this.engine.domEvents.emit('click', { x: median.x, y: median.y });
this.worker.postMessage({ type: 'dom:click', ev: { x: ev.offsetX, y: ev.offsetY } }); }
} else if (this.engine != null) { }
this.engine.domEvents.emit('click', { x: ev.offsetX, y: ev.offsetY });
} }
ev.preventDefault(); this.pointerDownPosition = null;
ev.stopPropagation();
return false;
} }
public async reset(roomState?: RoomState | null, options?: RoomControllerOptions | null, canvas?: HTMLCanvasElement | null) { public async reset(roomState?: RoomState | null, options?: RoomControllerOptions | null, canvas?: HTMLCanvasElement | null) {
@@ -397,9 +384,7 @@ export class RoomController {
this.canvas?.removeEventListener('keyup', this.onCanvasKeyup); this.canvas?.removeEventListener('keyup', this.onCanvasKeyup);
this.canvas?.removeEventListener('wheel', this.onCanvasWheel); this.canvas?.removeEventListener('wheel', this.onCanvasWheel);
this.canvas?.removeEventListener('pointerdown', this.onCanvasPointerdown); this.canvas?.removeEventListener('pointerdown', this.onCanvasPointerdown);
this.canvas?.removeEventListener('pointermove', this.onCanvasPointermove);
this.canvas?.removeEventListener('pointerup', this.onCanvasPointerup); this.canvas?.removeEventListener('pointerup', this.onCanvasPointerup);
this.canvas?.removeEventListener('click', this.onCanvasClick);
if (this.worker != null) { if (this.worker != null) {
this.worker.terminate(); this.worker.terminate();