huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-18 17:19:50 +00:00
Code Issues Wiki Activity

Slightly improve camera zoom and pan touch gestures

Browse source 
Not quite there yet
This commit is contained in:
Emmanouil Papadeas 2024-10-10 15:29:12 +03:00
parent abcf6f5ec6
commit 8802e3ab41
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/UI/Canvas/CanvasCamera.gd
View file

@ -78,13 +78,14 @@ func _input(event: InputEvent) -> void:
zoom_camera(-1) zoom_camera(-1)
elif event is InputEventMagnifyGesture: # Zoom gesture on touchscreens elif event is InputEventMagnifyGesture: # Zoom gesture on touchscreens
if event.factor >= 1: # Zoom in #zoom_camera(event.factor)
zoom_camera(1) if event.factor >= 1.0: # Zoom in
zoom_camera(event.factor * 0.3)
else: # Zoom out else: # Zoom out
zoom_camera(-1) zoom_camera((event.factor * 0.7) - 1.0)
elif event is InputEventPanGesture: elif event is InputEventPanGesture:
# Pan gesture on touchscreens # Pan gesture on touchscreens
offset = offset + event.delta.rotated(camera_angle) * 7.0 / zoom offset = offset + event.delta.rotated(camera_angle) * 2.0 / zoom
elif event is InputEventMouseMotion: elif event is InputEventMouseMotion:
if drag: if drag:
offset = offset - event.relative.rotated(camera_angle) / zoom offset = offset - event.relative.rotated(camera_angle) / zoom
@ -95,7 +96,7 @@ func _input(event: InputEvent) -> void:
offset = offset + (dir.rotated(camera_angle) / zoom) * CAMERA_SPEED_RATE offset = offset + (dir.rotated(camera_angle) / zoom) * CAMERA_SPEED_RATE
func zoom_camera(dir: int) -> void: func zoom_camera(dir: float) -> void:
var viewport_size := viewport_container.size var viewport_size := viewport_container.size
if Global.smooth_zoom: if Global.smooth_zoom:
var zoom_margin := zoom * dir / 5 var zoom_margin := zoom * dir / 5