noxious/client
6
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#159 : Camera control fixes

Browse Source
This commit is contained in:
Dennis Postma
2024-09-28 00:21:24 +02:00
parent 71042881dc
commit 0f231e10fa
4 changed files with 26 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/composables/pointerHandlers/useZoneEditorPointerHandlers.ts
View File

@ -1,4 +1,4 @@
import { computed, type Ref, ref } from 'vue'
import { computed, type Ref } from 'vue'
import { getTile, tileToWorldXY } from '@/composables/zoneComposable'
import { useZoneEditorStore } from '@/stores/zoneEditorStore'
import config from '@/config'
@ -14,9 +14,7 @@ export function useZoneEditorPointerHandlers(scene: Phaser.Scene, layer: Phaser.
const pointerTile = getTile(px, py, layer)
waypoint.value.visible = !!pointerTile
if (!pointerTile) {
return
}
if (!pointerTile) return
const worldPoint = tileToWorldXY(layer, pointerTile.x, pointerTile.y)
waypoint.value.x = worldPoint.positionX
@ -24,11 +22,11 @@ export function useZoneEditorPointerHandlers(scene: Phaser.Scene, layer: Phaser.
}
function dragZone(pointer: Phaser.Input.Pointer) {
if (gameStore.isPlayerDraggingCamera) {
const { x, y, prevPosition } = pointer
const { scrollX, scrollY, zoom } = camera
camera.setScroll(scrollX - (x - prevPosition.x) / zoom, scrollY - (y - prevPosition.y) / zoom)
}
if (!gameStore.isPlayerDraggingCamera) return
const { x, y, prevPosition } = pointer
const { scrollX, scrollY, zoom } = camera
camera.setScroll(scrollX - (x - prevPosition.x) / zoom, scrollY - (y - prevPosition.y) / zoom)
}
function handlePointerMove(pointer: Phaser.Input.Pointer) {
@ -38,13 +36,11 @@ export function useZoneEditorPointerHandlers(scene: Phaser.Scene, layer: Phaser.
updateWaypoint(pointer)
}
function handleZoom({ event, deltaY }: Phaser.Input.Pointer) {
if (event! instanceof WheelEvent && !event.shiftKey) {
return
}
function handleZoom(pointer: Phaser.Input.Pointer) {
if (!(pointer.event instanceof WheelEvent) || pointer.event.shiftKey) return
scene.scale.setZoom(scene.scale.zoom - deltaY * 0.01)
camera = scene.cameras.main
const deltaY = pointer.event.deltaY
scene.scale.setZoom(scene.scale.zoom - deltaY * 0.005)
}
const setupPointerHandlers = () => {
@ -58,4 +54,4 @@ export function useZoneEditorPointerHandlers(scene: Phaser.Scene, layer: Phaser.
}
return { setupPointerHandlers, cleanupPointerHandlers }
}
}