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

Fix properties update in remote transform

Browse source
This commit is contained in:
Aron Castro 2018-12-04 15:22:58 -02:00
parent 9a8569d434
commit 7619a8a30d
1 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
scene/3d/remote_transform.cpp
View file

@ -63,38 +63,40 @@ void RemoteTransform::_update_remote() {
if (update_remote_position && update_remote_rotation && update_remote_scale) { if (update_remote_position && update_remote_rotation && update_remote_scale) {
n->set_global_transform(get_global_transform()); n->set_global_transform(get_global_transform());
} else { } else {
Transform n_trans = n->get_global_transform();
Transform our_trans = get_global_transform(); Transform our_trans = get_global_transform();
if (!update_remote_position) if (update_remote_rotation)
our_trans.set_origin(n_trans.get_origin()); n->set_rotation(our_trans.basis.get_rotation());
n->set_global_transform(our_trans); if (update_remote_scale)
n->set_scale(our_trans.basis.get_scale());
if (!update_remote_rotation) if (update_remote_position) {
n->set_rotation(n_trans.basis.get_rotation()); Transform n_trans = n->get_global_transform();
if (!update_remote_scale) n_trans.set_origin(our_trans.get_origin());
n->set_scale(n_trans.basis.get_scale()); n->set_global_transform(n_trans);
}
} }
} else { } else {
if (update_remote_position && update_remote_rotation && update_remote_scale) { if (update_remote_position && update_remote_rotation && update_remote_scale) {
n->set_global_transform(get_global_transform()); n->set_transform(get_transform());
} else { } else {
Transform n_trans = n->get_transform();
Transform our_trans = get_transform(); Transform our_trans = get_transform();
if (!update_remote_position) if (update_remote_rotation)
our_trans.set_origin(n_trans.get_origin()); n->set_rotation(our_trans.basis.get_rotation());
n->set_transform(our_trans); if (update_remote_scale)
n->set_scale(our_trans.basis.get_scale());
if (!update_remote_rotation) if (update_remote_position) {
n->set_rotation(n_trans.basis.get_rotation()); Transform n_trans = n->get_transform();
if (!update_remote_scale) n_trans.set_origin(our_trans.get_origin());
n->set_scale(n_trans.basis.get_scale()); n->set_transform(n_trans);
}
} }
} }
} }