asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #46036 from aaronfranke/3.2-limit-zoom-half

Browse source 
[3.2] Limit max zoom to 1/2 of far plane instead of 1/4
This commit is contained in:
Rémi Verschelde 2021-02-16 14:25:59 +01:00 committed by GitHub
commit ece69f8208
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
editor/plugins/spatial_editor_plugin.cpp
View file

@ -2215,7 +2215,7 @@ void SpatialEditorViewport::set_freelook_active(bool active_now) {
void SpatialEditorViewport::scale_cursor_distance(real_t scale) { void SpatialEditorViewport::scale_cursor_distance(real_t scale) {
real_t min_distance = MAX(camera->get_znear() * 4, ZOOM_FREELOOK_MIN); real_t min_distance = MAX(camera->get_znear() * 4, ZOOM_FREELOOK_MIN);
real_t max_distance = MIN(camera->get_zfar() / 4, ZOOM_FREELOOK_MAX); real_t max_distance = MIN(camera->get_zfar() / 2, ZOOM_FREELOOK_MAX);
if (unlikely(min_distance > max_distance)) { if (unlikely(min_distance > max_distance)) {
cursor.distance = (min_distance + max_distance) / 2; cursor.distance = (min_distance + max_distance) / 2;
} else { } else {
@ -2228,7 +2228,7 @@ void SpatialEditorViewport::scale_cursor_distance(real_t scale) {
void SpatialEditorViewport::scale_freelook_speed(real_t scale) { void SpatialEditorViewport::scale_freelook_speed(real_t scale) {
real_t min_speed = MAX(camera->get_znear() * 4, ZOOM_FREELOOK_MIN); real_t min_speed = MAX(camera->get_znear() * 4, ZOOM_FREELOOK_MIN);
real_t max_speed = MIN(camera->get_zfar() / 4, ZOOM_FREELOOK_MAX); real_t max_speed = MIN(camera->get_zfar() / 2, ZOOM_FREELOOK_MAX);
if (unlikely(min_speed > max_speed)) { if (unlikely(min_speed > max_speed)) {
freelook_speed = (min_speed + max_speed) / 2; freelook_speed = (min_speed + max_speed) / 2;
} else { } else {
@ -2716,7 +2716,7 @@ void SpatialEditorViewport::_draw() {
// Show speed // Show speed
real_t min_speed = MAX(camera->get_znear() * 4, ZOOM_FREELOOK_MIN); real_t min_speed = MAX(camera->get_znear() * 4, ZOOM_FREELOOK_MIN);
real_t max_speed = MIN(camera->get_zfar() / 4, ZOOM_FREELOOK_MAX); real_t max_speed = MIN(camera->get_zfar() / 2, ZOOM_FREELOOK_MAX);
real_t scale_length = (max_speed - min_speed); real_t scale_length = (max_speed - min_speed);
if (!Math::is_zero_approx(scale_length)) { if (!Math::is_zero_approx(scale_length)) {
@ -2736,7 +2736,7 @@ void SpatialEditorViewport::_draw() {
// Show zoom // Show zoom
real_t min_distance = MAX(camera->get_znear() * 4, ZOOM_FREELOOK_MIN); real_t min_distance = MAX(camera->get_znear() * 4, ZOOM_FREELOOK_MIN);
real_t max_distance = MIN(camera->get_zfar() / 4, ZOOM_FREELOOK_MAX); real_t max_distance = MIN(camera->get_zfar() / 2, ZOOM_FREELOOK_MAX);
real_t scale_length = (max_distance - min_distance); real_t scale_length = (max_distance - min_distance);
if (!Math::is_zero_approx(scale_length)) { if (!Math::is_zero_approx(scale_length)) {