Browse Source

[3.2] Limit max zoom to 1/2 of far plane instead of 1/4

Aaron Franke 4 years ago
parent
commit
751036ff87
1 changed files with 4 additions and 4 deletions
  1. 4 4
      editor/plugins/spatial_editor_plugin.cpp

+ 4 - 4
editor/plugins/spatial_editor_plugin.cpp

@@ -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)) {