Relintai/material-maker
1
0
Fork 0
mirror of https://github.com/Relintai/material-maker.git synced 2024-11-13 06:27:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve the camera zoom behavior

Browse Source 
- Invert the scroll wheel action to be more consistent with
  most 3D programs out there (Godot, Blender, …).
- Clamp the camera distance to reasonable values.
This commit is contained in:
Hugo Locurcio 2019-10-18 00:40:47 +02:00
parent b325d68f96
commit d7b16b8126
No known key found for this signature in database
GPG Key ID: 39E8F8BE30B0A49C
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
addons/material_maker/preview.gd
View File

@ -7,6 +7,9 @@ const ENVIRONMENTS = [
"experiment", "lobby", "night", "park", "schelde" "experiment", "lobby", "night", "park", "schelde"
] ]
const CAMERA_DISTANCE_MIN = 1.0
const CAMERA_DISTANCE_MAX = 10.0
onready var objects = $MaterialPreview/Preview3d/Objects onready var objects = $MaterialPreview/Preview3d/Objects
onready var current_object = objects.get_child(0) onready var current_object = objects.get_child(0)
@ -77,9 +80,17 @@ func on_gui_input(event):
$Config/Rotate.pressed = false $Config/Rotate.pressed = false
match event.button_index: match event.button_index:
BUTTON_WHEEL_UP: BUTTON_WHEEL_UP:
camera.translation.z *= 1.01 if event.shift else 1.1 camera.translation.z = clamp(
camera.translation.z / (1.01 if event.shift else 1.1),
CAMERA_DISTANCE_MIN,
CAMERA_DISTANCE_MAX
)
BUTTON_WHEEL_DOWN: BUTTON_WHEEL_DOWN:
camera.translation.z /= 1.01 if event.shift else 1.1 camera.translation.z = clamp(
camera.translation.z * (1.01 if event.shift else 1.1),
CAMERA_DISTANCE_MIN,
CAMERA_DISTANCE_MAX
)
elif event is InputEventMouseMotion: elif event is InputEventMouseMotion:
var motion = 0.01*event.relative var motion = 0.01*event.relative
var camera_basis = camera.global_transform.basis var camera_basis = camera.global_transform.basis