godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-11 13:10:58 +00:00
Code Releases Wiki Activity

Fix gizmo errors on "Align with view"

Browse Source
This commit is contained in:
JFonS
2019-01-25 00:52:28 +01:00
parent 6ad4f16b1d
commit 2232d3336e
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
editor/spatial_editor_gizmos.cpp
View File

@@ -514,7 +514,10 @@ bool EditorSpatialGizmo::intersect_ray(Camera *p_camera, const Point2 &p_point,
Transform t = spatial_node->get_global_transform();
t.orthonormalize();
t.set_look_at(t.origin, p_camera->get_camera_transform().origin, Vector3(0, 1, 0));
Vector3 camera_position = p_camera->get_camera_transform().origin;
if (camera_position.distance_squared_to(t.origin) > 0.01) {
t.set_look_at(t.origin, camera_position, Vector3(0, 1, 0));
}
float scale = t.origin.distance_to(p_camera->get_camera_transform().origin);
@@ -526,16 +529,18 @@ bool EditorSpatialGizmo::intersect_ray(Camera *p_camera, const Point2 &p_point,
Point2 center = p_camera->unproject_position(t.origin);
Transform oct = p_camera->get_camera_transform();
Transform orig_camera_transform = p_camera->get_camera_transform();
p_camera->look_at(t.origin, Vector3(0, 1, 0));
if (orig_camera_transform.origin.distance_squared_to(t.origin) > 0.01) {
p_camera->look_at(t.origin, Vector3(0, 1, 0));
}
Vector3 c0 = t.xform(Vector3(selectable_icon_size, selectable_icon_size, 0) * scale);
Vector3 c1 = t.xform(Vector3(-selectable_icon_size, -selectable_icon_size, 0) * scale);
Point2 p0 = p_camera->unproject_position(c0);
Point2 p1 = p_camera->unproject_position(c1);
p_camera->set_global_transform(oct);
p_camera->set_global_transform(orig_camera_transform);
Rect2 rect(p0, p1 - p0);