feat: updated engine version to 4.4-rc1
This commit is contained in:
Sara
parent
ee00efde1f
commit
21ba8e33af
5459 changed files with 1128836 additions and 198305 deletions
|
|
@ -39,19 +39,34 @@ StaticCString StaticCString::create(const char *p_ptr) {
|
|||
return scs;
|
||||
}
|
||||
|
||||
StringName::_Data *StringName::_table[STRING_TABLE_LEN];
|
||||
bool StringName::_Data::operator==(const String &p_name) const {
|
||||
if (cname) {
|
||||
return p_name == cname;
|
||||
} else {
|
||||
return name == p_name;
|
||||
}
|
||||
}
|
||||
|
||||
bool StringName::_Data::operator!=(const String &p_name) const {
|
||||
return !operator==(p_name);
|
||||
}
|
||||
|
||||
bool StringName::_Data::operator==(const char *p_name) const {
|
||||
if (cname) {
|
||||
return strcmp(cname, p_name) == 0;
|
||||
} else {
|
||||
return name == p_name;
|
||||
}
|
||||
}
|
||||
|
||||
bool StringName::_Data::operator!=(const char *p_name) const {
|
||||
return !operator==(p_name);
|
||||
}
|
||||
|
||||
StringName _scs_create(const char *p_chr, bool p_static) {
|
||||
return (p_chr[0] ? StringName(StaticCString::create(p_chr), p_static) : StringName());
|
||||
}
|
||||
|
||||
bool StringName::configured = false;
|
||||
Mutex StringName::mutex;
|
||||
|
||||
#ifdef DEBUG_ENABLED
|
||||
bool StringName::debug_stringname = false;
|
||||
#endif
|
||||
|
||||
void StringName::setup() {
|
||||
ERR_FAIL_COND(configured);
|
||||
for (int i = 0; i < STRING_TABLE_LEN; i++) {
|
||||
|
|
@ -147,20 +162,25 @@ void StringName::unref() {
|
|||
_data = nullptr;
|
||||
}
|
||||
|
||||
uint32_t StringName::get_empty_hash() {
|
||||
static uint32_t empty_hash = String::hash("");
|
||||
return empty_hash;
|
||||
}
|
||||
|
||||
bool StringName::operator==(const String &p_name) const {
|
||||
if (!_data) {
|
||||
return (p_name.length() == 0);
|
||||
if (_data) {
|
||||
return _data->operator==(p_name);
|
||||
}
|
||||
|
||||
return (_data->get_name() == p_name);
|
||||
return p_name.is_empty();
|
||||
}
|
||||
|
||||
bool StringName::operator==(const char *p_name) const {
|
||||
if (!_data) {
|
||||
return (p_name[0] == 0);
|
||||
if (_data) {
|
||||
return _data->operator==(p_name);
|
||||
}
|
||||
|
||||
return (_data->get_name() == p_name);
|
||||
return p_name[0] == 0;
|
||||
}
|
||||
|
||||
bool StringName::operator!=(const String &p_name) const {
|
||||
|
|
@ -171,15 +191,47 @@ bool StringName::operator!=(const char *p_name) const {
|
|||
return !(operator==(p_name));
|
||||
}
|
||||
|
||||
bool StringName::operator!=(const StringName &p_name) const {
|
||||
// the real magic of all this mess happens here.
|
||||
// this is why path comparisons are very fast
|
||||
return _data != p_name._data;
|
||||
char32_t StringName::operator[](int p_index) const {
|
||||
if (_data) {
|
||||
if (_data->cname) {
|
||||
CRASH_BAD_INDEX(p_index, static_cast<long>(strlen(_data->cname)));
|
||||
return _data->cname[p_index];
|
||||
} else {
|
||||
return _data->name[p_index];
|
||||
}
|
||||
}
|
||||
|
||||
CRASH_BAD_INDEX(p_index, 0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
void StringName::operator=(const StringName &p_name) {
|
||||
int StringName::length() const {
|
||||
if (_data) {
|
||||
if (_data->cname) {
|
||||
return strlen(_data->cname);
|
||||
} else {
|
||||
return _data->name.length();
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
bool StringName::is_empty() const {
|
||||
if (_data) {
|
||||
if (_data->cname) {
|
||||
return _data->cname[0] == 0;
|
||||
} else {
|
||||
return _data->name.is_empty();
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
StringName &StringName::operator=(const StringName &p_name) {
|
||||
if (this == &p_name) {
|
||||
return;
|
||||
return *this;
|
||||
}
|
||||
|
||||
unref();
|
||||
|
|
@ -187,6 +239,8 @@ void StringName::operator=(const StringName &p_name) {
|
|||
if (p_name._data && p_name._data->refcount.ref()) {
|
||||
_data = p_name._data;
|
||||
}
|
||||
|
||||
return *this;
|
||||
}
|
||||
|
||||
StringName::StringName(const StringName &p_name) {
|
||||
|
|
@ -200,11 +254,10 @@ StringName::StringName(const StringName &p_name) {
|
|||
}
|
||||
|
||||
void StringName::assign_static_unique_class_name(StringName *ptr, const char *p_name) {
|
||||
mutex.lock();
|
||||
MutexLock lock(mutex);
|
||||
if (*ptr == StringName()) {
|
||||
*ptr = StringName(p_name, true);
|
||||
}
|
||||
mutex.unlock();
|
||||
}
|
||||
|
||||
StringName::StringName(const char *p_name, bool p_static) {
|
||||
|
|
@ -216,17 +269,15 @@ StringName::StringName(const char *p_name, bool p_static) {
|
|||
return; //empty, ignore
|
||||
}
|
||||
|
||||
const uint32_t hash = String::hash(p_name);
|
||||
const uint32_t idx = hash & STRING_TABLE_MASK;
|
||||
|
||||
MutexLock lock(mutex);
|
||||
|
||||
uint32_t hash = String::hash(p_name);
|
||||
|
||||
uint32_t idx = hash & STRING_TABLE_MASK;
|
||||
|
||||
_data = _table[idx];
|
||||
|
||||
while (_data) {
|
||||
// compare hash first
|
||||
if (_data->hash == hash && _data->get_name() == p_name) {
|
||||
if (_data->hash == hash && _data->operator==(p_name)) {
|
||||
break;
|
||||
}
|
||||
_data = _data->next;
|
||||
|
|
@ -275,17 +326,15 @@ StringName::StringName(const StaticCString &p_static_string, bool p_static) {
|
|||
|
||||
ERR_FAIL_COND(!p_static_string.ptr || !p_static_string.ptr[0]);
|
||||
|
||||
const uint32_t hash = String::hash(p_static_string.ptr);
|
||||
const uint32_t idx = hash & STRING_TABLE_MASK;
|
||||
|
||||
MutexLock lock(mutex);
|
||||
|
||||
uint32_t hash = String::hash(p_static_string.ptr);
|
||||
|
||||
uint32_t idx = hash & STRING_TABLE_MASK;
|
||||
|
||||
_data = _table[idx];
|
||||
|
||||
while (_data) {
|
||||
// compare hash first
|
||||
if (_data->hash == hash && _data->get_name() == p_static_string.ptr) {
|
||||
if (_data->hash == hash && _data->operator==(p_static_string.ptr)) {
|
||||
break;
|
||||
}
|
||||
_data = _data->next;
|
||||
|
|
@ -335,15 +384,14 @@ StringName::StringName(const String &p_name, bool p_static) {
|
|||
return;
|
||||
}
|
||||
|
||||
const uint32_t hash = p_name.hash();
|
||||
const uint32_t idx = hash & STRING_TABLE_MASK;
|
||||
|
||||
MutexLock lock(mutex);
|
||||
|
||||
uint32_t hash = p_name.hash();
|
||||
uint32_t idx = hash & STRING_TABLE_MASK;
|
||||
|
||||
_data = _table[idx];
|
||||
|
||||
while (_data) {
|
||||
if (_data->hash == hash && _data->get_name() == p_name) {
|
||||
if (_data->hash == hash && _data->operator==(p_name)) {
|
||||
break;
|
||||
}
|
||||
_data = _data->next;
|
||||
|
|
@ -393,16 +441,15 @@ StringName StringName::search(const char *p_name) {
|
|||
return StringName();
|
||||
}
|
||||
|
||||
const uint32_t hash = String::hash(p_name);
|
||||
const uint32_t idx = hash & STRING_TABLE_MASK;
|
||||
|
||||
MutexLock lock(mutex);
|
||||
|
||||
uint32_t hash = String::hash(p_name);
|
||||
uint32_t idx = hash & STRING_TABLE_MASK;
|
||||
|
||||
_Data *_data = _table[idx];
|
||||
|
||||
while (_data) {
|
||||
// compare hash first
|
||||
if (_data->hash == hash && _data->get_name() == p_name) {
|
||||
if (_data->hash == hash && _data->operator==(p_name)) {
|
||||
break;
|
||||
}
|
||||
_data = _data->next;
|
||||
|
|
@ -429,17 +476,15 @@ StringName StringName::search(const char32_t *p_name) {
|
|||
return StringName();
|
||||
}
|
||||
|
||||
const uint32_t hash = String::hash(p_name);
|
||||
const uint32_t idx = hash & STRING_TABLE_MASK;
|
||||
|
||||
MutexLock lock(mutex);
|
||||
|
||||
uint32_t hash = String::hash(p_name);
|
||||
|
||||
uint32_t idx = hash & STRING_TABLE_MASK;
|
||||
|
||||
_Data *_data = _table[idx];
|
||||
|
||||
while (_data) {
|
||||
// compare hash first
|
||||
if (_data->hash == hash && _data->get_name() == p_name) {
|
||||
if (_data->hash == hash && _data->operator==(p_name)) {
|
||||
break;
|
||||
}
|
||||
_data = _data->next;
|
||||
|
|
@ -455,17 +500,15 @@ StringName StringName::search(const char32_t *p_name) {
|
|||
StringName StringName::search(const String &p_name) {
|
||||
ERR_FAIL_COND_V(p_name.is_empty(), StringName());
|
||||
|
||||
const uint32_t hash = p_name.hash();
|
||||
const uint32_t idx = hash & STRING_TABLE_MASK;
|
||||
|
||||
MutexLock lock(mutex);
|
||||
|
||||
uint32_t hash = p_name.hash();
|
||||
|
||||
uint32_t idx = hash & STRING_TABLE_MASK;
|
||||
|
||||
_Data *_data = _table[idx];
|
||||
|
||||
while (_data) {
|
||||
// compare hash first
|
||||
if (_data->hash == hash && p_name == _data->get_name()) {
|
||||
if (_data->hash == hash && _data->operator==(p_name)) {
|
||||
break;
|
||||
}
|
||||
_data = _data->next;
|
||||
|
|
@ -484,15 +527,15 @@ StringName StringName::search(const String &p_name) {
|
|||
}
|
||||
|
||||
bool operator==(const String &p_name, const StringName &p_string_name) {
|
||||
return p_name == p_string_name.operator String();
|
||||
return p_string_name.operator==(p_name);
|
||||
}
|
||||
bool operator!=(const String &p_name, const StringName &p_string_name) {
|
||||
return p_name != p_string_name.operator String();
|
||||
return p_string_name.operator!=(p_name);
|
||||
}
|
||||
|
||||
bool operator==(const char *p_name, const StringName &p_string_name) {
|
||||
return p_name == p_string_name.operator String();
|
||||
return p_string_name.operator==(p_name);
|
||||
}
|
||||
bool operator!=(const char *p_name, const StringName &p_string_name) {
|
||||
return p_name != p_string_name.operator String();
|
||||
return p_string_name.operator!=(p_name);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue