diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2018-08-04 10:45:14 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-04 10:45:14 -0300 |
| commit | 7c712a25bc40c4d8e09867b61c941af06c6799f5 (patch) | |
| tree | 05990f8e7c6880583466244c14aae07c88272530 /scene/main | |
| parent | c41397596dd829e44dab2c3fd8de9ce655238ee3 (diff) | |
| parent | c1860fe88b8dfe58828a06cdebb305e4528c6444 (diff) | |
Merge pull request #18699 from AndreaCatania/ik
Inverse kinematic
Diffstat (limited to 'scene/main')
| -rw-r--r-- | scene/main/node.cpp | 5 | ||||
| -rw-r--r-- | scene/main/node.h | 3 |
2 files changed, 1 insertions, 7 deletions
diff --git a/scene/main/node.cpp b/scene/main/node.cpp index 68de7b3a0a..6144240328 100644 --- a/scene/main/node.cpp +++ b/scene/main/node.cpp @@ -1415,11 +1415,6 @@ bool Node::is_greater_than(const Node *p_node) const { return res; } -bool Node::has_priority_higher_than(const Node *p_node) const { - ERR_FAIL_NULL_V(p_node, false); - return data.process_priority > p_node->data.process_priority; -} - void Node::get_owned_by(Node *p_by, List<Node *> *p_owned) { if (data.owner == p_by) diff --git a/scene/main/node.h b/scene/main/node.h index 9ee0340678..f3422618ce 100644 --- a/scene/main/node.h +++ b/scene/main/node.h @@ -72,7 +72,7 @@ public: struct ComparatorWithPriority { - bool operator()(const Node *p_a, const Node *p_b) const { return p_b->has_priority_higher_than(p_a) || p_b->is_greater_than(p_a); } + bool operator()(const Node *p_a, const Node *p_b) const { return p_b->data.process_priority == p_a->data.process_priority ? p_b->is_greater_than(p_a) : p_b->data.process_priority > p_a->data.process_priority; } }; private: @@ -265,7 +265,6 @@ public: bool is_a_parent_of(const Node *p_node) const; bool is_greater_than(const Node *p_node) const; - bool has_priority_higher_than(const Node *p_node) const; NodePath get_path() const; NodePath get_path_to(const Node *p_node) const; |