feat: updated godot version
This commit is contained in:
parent
0c508b0831
commit
42b028dbb5
4694 changed files with 236470 additions and 401376 deletions
|
|
@ -30,16 +30,10 @@
|
|||
|
||||
#include "node_3d.h"
|
||||
|
||||
#include "core/config/engine.h"
|
||||
#include "core/math/transform_interpolator.h"
|
||||
#include "core/object/callable_mp.h"
|
||||
#include "core/object/class_db.h"
|
||||
#include "scene/3d/visual_instance_3d.h"
|
||||
#include "scene/main/scene_tree.h"
|
||||
#include "scene/main/viewport.h"
|
||||
#include "scene/property_utils.h"
|
||||
#include "servers/display/accessibility_server.h"
|
||||
#include "servers/rendering/rendering_server.h"
|
||||
|
||||
/*
|
||||
|
||||
|
|
@ -128,11 +122,10 @@ void Node3D::_propagate_transform_changed(Node3D *p_origin) {
|
|||
#else
|
||||
if (data.notify_transform && !data.ignore_notification && !xform_change.in_list()) {
|
||||
#endif
|
||||
// SceneTree::xform_change_list is not thread safe to modify, and is read by the main thread when processings are done.
|
||||
if (Thread::is_main_thread()) {
|
||||
if (likely(is_accessible_from_caller_thread())) {
|
||||
get_tree()->xform_change_list.add(&xform_change);
|
||||
} else {
|
||||
// For any threaded-processed node, add it to xform_change_list on the main thread in a deferred manner.
|
||||
// This should very rarely happen, but if it does at least make sure the notification is received eventually.
|
||||
callable_mp(this, &Node3D::_propagate_transform_changed_deferred).call_deferred();
|
||||
}
|
||||
}
|
||||
|
|
@ -145,7 +138,7 @@ void Node3D::_notification(int p_what) {
|
|||
RID ae = get_accessibility_element();
|
||||
ERR_FAIL_COND(ae.is_null());
|
||||
|
||||
AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_CONTAINER);
|
||||
DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_CONTAINER);
|
||||
} break;
|
||||
|
||||
case NOTIFICATION_ENTER_TREE: {
|
||||
|
|
@ -1356,15 +1349,19 @@ NodePath Node3D::get_visibility_parent() const {
|
|||
|
||||
void Node3D::_validate_property(PropertyInfo &p_property) const {
|
||||
if (data.rotation_edit_mode != ROTATION_EDIT_MODE_BASIS && p_property.name == "basis") {
|
||||
p_property.usage = PROPERTY_USAGE_NONE;
|
||||
} else if (data.rotation_edit_mode == ROTATION_EDIT_MODE_BASIS && p_property.name == "scale") {
|
||||
p_property.usage = PROPERTY_USAGE_NONE;
|
||||
} else if (data.rotation_edit_mode != ROTATION_EDIT_MODE_QUATERNION && p_property.name == "quaternion") {
|
||||
p_property.usage = PROPERTY_USAGE_NONE;
|
||||
} else if (data.rotation_edit_mode != ROTATION_EDIT_MODE_EULER && p_property.name == "rotation") {
|
||||
p_property.usage = PROPERTY_USAGE_NONE;
|
||||
} else if (data.rotation_edit_mode != ROTATION_EDIT_MODE_EULER && p_property.name == "rotation_order") {
|
||||
p_property.usage = PROPERTY_USAGE_NONE;
|
||||
p_property.usage = 0;
|
||||
}
|
||||
if (data.rotation_edit_mode == ROTATION_EDIT_MODE_BASIS && p_property.name == "scale") {
|
||||
p_property.usage = 0;
|
||||
}
|
||||
if (data.rotation_edit_mode != ROTATION_EDIT_MODE_QUATERNION && p_property.name == "quaternion") {
|
||||
p_property.usage = 0;
|
||||
}
|
||||
if (data.rotation_edit_mode != ROTATION_EDIT_MODE_EULER && p_property.name == "rotation") {
|
||||
p_property.usage = 0;
|
||||
}
|
||||
if (data.rotation_edit_mode != ROTATION_EDIT_MODE_EULER && p_property.name == "rotation_order") {
|
||||
p_property.usage = 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue