godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix rotation gizmo for empty Spatials 

The AABB for an empty Spatial has 0 size, since the stored and
compared Transform was scaled by the AABB size, it would completely
destroy the rotation information. If there is no rotation
information, the gizmo doesn't update when the rotation changes.

(cherry picked from commit a0af3094b4)
This commit is contained in:
JFonS 2020-03-10 16:23:22 +01:00 committed by Rémi Verschelde
parent d25949dd49
commit 784ff23adc
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
editor/plugins/spatial_editor_plugin.cpp
View File

@ -2389,11 +2389,18 @@ void SpatialEditorViewport::_notification(int p_what) {
if (!se) if (!se)
continue; continue;
Transform t = sp->get_global_gizmo_transform();
exist = true;
if (se->last_xform == t)
continue;
changed = true;
se->last_xform = t;
VisualInstance *vi = Object::cast_to<VisualInstance>(sp); VisualInstance *vi = Object::cast_to<VisualInstance>(sp);
se->aabb = vi ? vi->get_aabb() : _calculate_spatial_bounds(sp); se->aabb = vi ? vi->get_aabb() : _calculate_spatial_bounds(sp);
Transform t = sp->get_global_gizmo_transform();
t.translate(se->aabb.position); t.translate(se->aabb.position);
// apply AABB scaling before item's global transform // apply AABB scaling before item's global transform
@ -2401,11 +2408,6 @@ void SpatialEditorViewport::_notification(int p_what) {
aabb_s.scale(se->aabb.size); aabb_s.scale(se->aabb.size);
t.basis = t.basis * aabb_s; t.basis = t.basis * aabb_s;
exist = true;
if (se->last_xform == t)
continue;
changed = true;
se->last_xform = t;
VisualServer::get_singleton()->instance_set_transform(se->sbox_instance, t); VisualServer::get_singleton()->instance_set_transform(se->sbox_instance, t);
} }