summaryrefslogtreecommitdiffstats
path: root/editor
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2020-01-01 11:37:28 +0100
committerGitHub <noreply@github.com>2020-01-01 11:37:28 +0100
commit3e649f8cba9408d7646c591a19fed6f270827602 (patch)
tree5e0e6b016931bbc98ecff5300fa4c555e48dce45 /editor
parent5aa96b72c7a379d5b869168933153ffb0820f125 (diff)
parentcbb8930813e891c67a4c917b20bd98317e182f54 (diff)
downloadredot-engine-3e649f8cba9408d7646c591a19fed6f270827602.tar.gz
Merge pull request #34665 from timothyqiu/camera-fov
Clamps fov/size for Camera gizmo
Diffstat (limited to 'editor')
-rw-r--r--editor/spatial_editor_gizmos.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/editor/spatial_editor_gizmos.cpp b/editor/spatial_editor_gizmos.cpp
index ba6c713afb..999353df8d 100644
--- a/editor/spatial_editor_gizmos.cpp
+++ b/editor/spatial_editor_gizmos.cpp
@@ -1275,7 +1275,7 @@ void CameraSpatialGizmoPlugin::set_handle(EditorSpatialGizmo *p_gizmo, int p_idx
if (camera->get_projection() == Camera::PROJECTION_PERSPECTIVE) {
Transform gt2 = camera->get_global_transform();
float a = _find_closest_angle_to_half_pi_arc(s[0], s[1], 1.0, gt2);
- camera->set("fov", a * 2.0);
+ camera->set("fov", CLAMP(a * 2.0, 1, 179));
} else {
Vector3 ra, rb;
@@ -1285,8 +1285,7 @@ void CameraSpatialGizmoPlugin::set_handle(EditorSpatialGizmo *p_gizmo, int p_idx
d = Math::stepify(d, SpatialEditor::get_singleton()->get_translate_snap());
}
- if (d < 0)
- d = 0;
+ d = CLAMP(d, 0.1, 16384);
camera->set("size", d);
}