diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-05-24 10:34:12 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-05-24 10:34:12 +0200 |
| commit | 299f0ae3db6daf0e2f42d8849c970839595379c3 (patch) | |
| tree | 26375aaff920add3849cb33d292a1c77e9c914c3 | |
| parent | 7bdc45870f249522607a409ffea0b5f6ea870dbd (diff) | |
| parent | 4e4259bd7926279acbf52d3df6587f7a98446d0f (diff) | |
| download | redot-engine-299f0ae3db6daf0e2f42d8849c970839595379c3.tar.gz | |
Merge pull request #76052 from TokageItLab/fix-viewport-axis
Fix 3D Viewport Front/Rear axis and Focus button
| -rw-r--r-- | editor/plugins/node_3d_editor_plugin.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp index 00f4af47e1..34667b006d 100644 --- a/editor/plugins/node_3d_editor_plugin.cpp +++ b/editor/plugins/node_3d_editor_plugin.cpp @@ -296,10 +296,10 @@ void ViewportRotationControl::_notification(int p_what) { axis_menu_options.clear(); axis_menu_options.push_back(Node3DEditorViewport::VIEW_RIGHT); axis_menu_options.push_back(Node3DEditorViewport::VIEW_TOP); - axis_menu_options.push_back(Node3DEditorViewport::VIEW_REAR); + axis_menu_options.push_back(Node3DEditorViewport::VIEW_FRONT); axis_menu_options.push_back(Node3DEditorViewport::VIEW_LEFT); axis_menu_options.push_back(Node3DEditorViewport::VIEW_BOTTOM); - axis_menu_options.push_back(Node3DEditorViewport::VIEW_FRONT); + axis_menu_options.push_back(Node3DEditorViewport::VIEW_REAR); axis_colors.clear(); axis_colors.push_back(get_theme_color(SNAME("axis_x_color"), SNAME("Editor"))); @@ -370,7 +370,7 @@ void ViewportRotationControl::_get_sorted_axis(Vector<Axis2D> &r_axis) { Vector3 axis_3d = camera_basis.get_column(i); Vector2i axis_vector = Vector2(axis_3d.x, -axis_3d.y) * radius; - if (Math::abs(axis_3d.z) < 1.0) { + if (Math::abs(axis_3d.z) <= 1.0) { Axis2D pos_axis; pos_axis.axis = i; pos_axis.screen_point = center + axis_vector; @@ -385,7 +385,7 @@ void ViewportRotationControl::_get_sorted_axis(Vector<Axis2D> &r_axis) { } else { // Special case when the camera is aligned with one axis Axis2D axis; - axis.axis = i + (axis_3d.z < 0 ? 0 : 3); + axis.axis = i + (axis_3d.z <= 0 ? 0 : 3); axis.screen_point = center; axis.z_axis = 1.0; r_axis.push_back(axis); @@ -3176,7 +3176,7 @@ void Node3DEditorViewport::_menu_option(int p_option) { } break; case VIEW_FRONT: { cursor.x_rot = 0; - cursor.y_rot = Math_PI; + cursor.y_rot = 0; set_message(TTR("Front View."), 2); view_type = VIEW_TYPE_FRONT; _set_auto_orthogonal(); @@ -3185,7 +3185,7 @@ void Node3DEditorViewport::_menu_option(int p_option) { } break; case VIEW_REAR: { cursor.x_rot = 0; - cursor.y_rot = 0; + cursor.y_rot = Math_PI; set_message(TTR("Rear View."), 2); view_type = VIEW_TYPE_REAR; _set_auto_orthogonal(); |