godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00
Code Releases Wiki Activity

Fixed some space-related bugs in RemoteTransform3D._update_remote, and optimized a bit

Browse Source
This commit is contained in:
Zi Ye
2025-01-30 20:41:52 -06:00
parent a63a8b430b
commit 7ab9fd4f13
1 changed files with 31 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
scene/3d/remote_transform_3d.cpp
View File

@@ -51,58 +51,50 @@ void RemoteTransform3D::_update_remote() {
return; return;
} }
Node3D *n = Object::cast_to<Node3D>(ObjectDB::get_instance(cache)); Node3D *target_node = Object::cast_to<Node3D>(ObjectDB::get_instance(cache));
if (!n) { if (!target_node) {
return; return;
} }
if (!n->is_inside_tree()) { if (!target_node->is_inside_tree()) {
return; return;
} }
//todo make faster Transform3D our_trans = use_global_coordinates ? get_global_transform() : get_transform();
if (use_global_coordinates) {
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()); if (use_global_coordinates) {
target_node->set_global_transform(our_trans);
} else { } else {
Transform3D our_trans = get_global_transform(); target_node->set_transform(our_trans);
}
} else {
Transform3D target_trans = use_global_coordinates ? target_node->get_global_transform() : target_node->get_transform();
if (update_remote_rotation) { if (update_remote_rotation && update_remote_scale) {
n->set_rotation(our_trans.basis.get_euler_normalized(EulerOrder(n->get_rotation_order()))); target_trans.basis = our_trans.basis;
} else if (update_remote_rotation) {
for (int i = 0; i < 3; i++) {
Vector3 our_col = our_trans.basis.get_column(i);
Vector3 target_col = target_trans.basis.get_column(i);
target_trans.basis.set_column(i, our_col.normalized() * target_col.length());
} }
} else if (update_remote_scale) {
if (update_remote_scale) { for (int i = 0; i < 3; i++) {
n->set_scale(our_trans.basis.get_scale()); Vector3 our_col = our_trans.basis.get_column(i);
} Vector3 target_col = target_trans.basis.get_column(i);
target_trans.basis.set_column(i, target_col.normalized() * our_col.length());
if (update_remote_position) {
Transform3D n_trans = n->get_global_transform();
n_trans.set_origin(our_trans.get_origin());
n->set_global_transform(n_trans);
} }
} }
} else { if (update_remote_position) {
if (update_remote_position && update_remote_rotation && update_remote_scale) { target_trans.origin = our_trans.origin;
n->set_transform(get_transform()); }
if (use_global_coordinates) {
target_node->set_global_transform(target_trans);
} else { } else {
Transform3D our_trans = get_transform(); target_node->set_transform(target_trans);
if (update_remote_rotation) {
n->set_rotation(our_trans.basis.get_euler_normalized(EulerOrder(n->get_rotation_order())));
}
if (update_remote_scale) {
n->set_scale(our_trans.basis.get_scale());
}
if (update_remote_position) {
Transform3D n_trans = n->get_transform();
n_trans.set_origin(our_trans.get_origin());
n->set_transform(n_trans);
}
} }
} }
} }