|
@@ -120,7 +120,6 @@ void SceneTreeTimer::release_connections() {
|
|
SceneTreeTimer::SceneTreeTimer() {}
|
|
SceneTreeTimer::SceneTreeTimer() {}
|
|
|
|
|
|
void SceneTree::tree_changed() {
|
|
void SceneTree::tree_changed() {
|
|
- tree_version++;
|
|
|
|
emit_signal(tree_changed_name);
|
|
emit_signal(tree_changed_name);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -153,7 +152,6 @@ SceneTree::Group *SceneTree::add_to_group(const StringName &p_group, Node *p_nod
|
|
|
|
|
|
ERR_FAIL_COND_V_MSG(E->value.nodes.has(p_node), &E->value, "Already in group: " + p_group + ".");
|
|
ERR_FAIL_COND_V_MSG(E->value.nodes.has(p_node), &E->value, "Already in group: " + p_group + ".");
|
|
E->value.nodes.push_back(p_node);
|
|
E->value.nodes.push_back(p_node);
|
|
- //E->value.last_tree_version=0;
|
|
|
|
E->value.changed = true;
|
|
E->value.changed = true;
|
|
return &E->value;
|
|
return &E->value;
|
|
}
|
|
}
|
|
@@ -476,8 +474,6 @@ void SceneTree::iteration_prepare() {
|
|
}
|
|
}
|
|
|
|
|
|
bool SceneTree::physics_process(double p_time) {
|
|
bool SceneTree::physics_process(double p_time) {
|
|
- root_lock++;
|
|
|
|
-
|
|
|
|
current_frame++;
|
|
current_frame++;
|
|
|
|
|
|
flush_transform_notifications();
|
|
flush_transform_notifications();
|
|
@@ -501,7 +497,6 @@ bool SceneTree::physics_process(double p_time) {
|
|
process_tweens(p_time, true);
|
|
process_tweens(p_time, true);
|
|
|
|
|
|
flush_transform_notifications();
|
|
flush_transform_notifications();
|
|
- root_lock--;
|
|
|
|
|
|
|
|
_flush_delete_queue();
|
|
_flush_delete_queue();
|
|
_call_idle_callbacks();
|
|
_call_idle_callbacks();
|
|
@@ -510,8 +505,6 @@ bool SceneTree::physics_process(double p_time) {
|
|
}
|
|
}
|
|
|
|
|
|
bool SceneTree::process(double p_time) {
|
|
bool SceneTree::process(double p_time) {
|
|
- root_lock++;
|
|
|
|
-
|
|
|
|
if (MainLoop::process(p_time)) {
|
|
if (MainLoop::process(p_time)) {
|
|
_quit = true;
|
|
_quit = true;
|
|
}
|
|
}
|
|
@@ -537,8 +530,6 @@ bool SceneTree::process(double p_time) {
|
|
MessageQueue::get_singleton()->flush(); //small little hack
|
|
MessageQueue::get_singleton()->flush(); //small little hack
|
|
flush_transform_notifications(); //transforms after world update, to avoid unnecessary enter/exit notifications
|
|
flush_transform_notifications(); //transforms after world update, to avoid unnecessary enter/exit notifications
|
|
|
|
|
|
- root_lock--;
|
|
|
|
-
|
|
|
|
_flush_delete_queue();
|
|
_flush_delete_queue();
|
|
|
|
|
|
if (unlikely(pending_new_scene)) {
|
|
if (unlikely(pending_new_scene)) {
|