feat: updated engine version to 4.4-rc1
This commit is contained in:
parent
ee00efde1f
commit
21ba8e33af
5459 changed files with 1128836 additions and 198305 deletions
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
#include "node_path.h"
|
||||
|
||||
#include "core/string/print_string.h"
|
||||
#include "core/variant/variant.h"
|
||||
|
||||
void NodePath::_update_hash_cache() const {
|
||||
uint32_t h = data->absolute ? 1 : 0;
|
||||
|
|
@ -215,7 +215,10 @@ StringName NodePath::get_concatenated_names() const {
|
|||
String concatenated;
|
||||
const StringName *sn = data->path.ptr();
|
||||
for (int i = 0; i < pc; i++) {
|
||||
concatenated += i == 0 ? sn[i].operator String() : "/" + sn[i];
|
||||
if (i > 0) {
|
||||
concatenated += "/";
|
||||
}
|
||||
concatenated += sn[i].operator String();
|
||||
}
|
||||
data->concatenated_path = concatenated;
|
||||
}
|
||||
|
|
@ -230,7 +233,10 @@ StringName NodePath::get_concatenated_subnames() const {
|
|||
String concatenated;
|
||||
const StringName *ssn = data->subpath.ptr();
|
||||
for (int i = 0; i < spc; i++) {
|
||||
concatenated += i == 0 ? ssn[i].operator String() : ":" + ssn[i];
|
||||
if (i > 0) {
|
||||
concatenated += ":";
|
||||
}
|
||||
concatenated += ssn[i].operator String();
|
||||
}
|
||||
data->concatenated_subpath = concatenated;
|
||||
}
|
||||
|
|
@ -249,7 +255,7 @@ NodePath NodePath::slice(int p_begin, int p_end) const {
|
|||
if (end < 0) {
|
||||
end += total_count;
|
||||
}
|
||||
const int sub_begin = MAX(begin - name_count - 1, 0);
|
||||
const int sub_begin = MAX(begin - name_count, 0);
|
||||
const int sub_end = MAX(end - name_count, 0);
|
||||
|
||||
const Vector<StringName> names = get_names().slice(begin, end);
|
||||
|
|
@ -401,7 +407,7 @@ NodePath::NodePath(const String &p_path) {
|
|||
bool absolute = (path[0] == '/');
|
||||
bool last_is_slash = true;
|
||||
int slices = 0;
|
||||
int subpath_pos = path.find(":");
|
||||
int subpath_pos = path.find_char(':');
|
||||
|
||||
if (subpath_pos != -1) {
|
||||
int from = subpath_pos + 1;
|
||||
|
|
@ -414,7 +420,7 @@ NodePath::NodePath(const String &p_path) {
|
|||
continue; // Allow end-of-path :
|
||||
}
|
||||
|
||||
ERR_FAIL_MSG("Invalid NodePath '" + p_path + "'.");
|
||||
ERR_FAIL_MSG(vformat("Invalid NodePath '%s'.", p_path));
|
||||
}
|
||||
subpath.push_back(str);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue