maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Style: clang-format: Disable KeepEmptyLinesAtTheStartOfBlocks

Browse source 
Which means that reduz' beloved style which we all became used to
will now be changed automatically to remove the first empty line.

This makes us lean closer to 1TBS (the one true brace style) instead
of hybridating it with some Allman-inspired spacing.

There's still the case of braces around single-statement blocks that
needs to be addressed (but clang-format can't help with that, but
clang-tidy may if we agree about it).

Part of #33027.
This commit is contained in:
Rémi Verschelde 2020-05-14 13:23:58 +02:00
parent 710b34b702
commit 0be6d925dc
1552 changed files with 1 additions and 33876 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.clang-format
View file

@ -76,7 +76,7 @@ IndentWidth: 4
# IndentWrappedFunctionNames: false # IndentWrappedFunctionNames: false
# JavaScriptQuotes: Leave # JavaScriptQuotes: Leave
# JavaScriptWrapImports: true # JavaScriptWrapImports: true
# KeepEmptyLinesAtTheStartOfBlocks: true KeepEmptyLinesAtTheStartOfBlocks: false
# MacroBlockBegin: '' # MacroBlockBegin: ''
# MacroBlockEnd: '' # MacroBlockEnd: ''
# MaxEmptyLinesToKeep: 1 # MaxEmptyLinesToKeep: 1

44
core/array.cpp
View file

@ -46,7 +46,6 @@ public:
}; };
void Array::_ref(const Array &p_from) const { void Array::_ref(const Array &p_from) const {
ArrayPrivate *_fp = p_from._p; ArrayPrivate *_fp = p_from._p;
ERR_FAIL_COND(!_fp); // should NOT happen. ERR_FAIL_COND(!_fp); // should NOT happen.
@ -64,7 +63,6 @@ void Array::_ref(const Array &p_from) const {
} }
void Array::_unref() const { void Array::_unref() const {
if (!_p) if (!_p)
return; return;
@ -75,46 +73,37 @@ void Array::_unref() const {
} }
Variant &Array::operator[](int p_idx) { Variant &Array::operator[](int p_idx) {
return _p->array.write[p_idx]; return _p->array.write[p_idx];
} }
const Variant &Array::operator[](int p_idx) const { const Variant &Array::operator[](int p_idx) const {
return _p->array[p_idx]; return _p->array[p_idx];
} }
int Array::size() const { int Array::size() const {
return _p->array.size(); return _p->array.size();
} }
bool Array::empty() const { bool Array::empty() const {
return _p->array.empty(); return _p->array.empty();
} }
void Array::clear() { void Array::clear() {
_p->array.clear(); _p->array.clear();
} }
bool Array::operator==(const Array &p_array) const { bool Array::operator==(const Array &p_array) const {
return _p == p_array._p; return _p == p_array._p;
} }
uint32_t Array::hash() const { uint32_t Array::hash() const {
uint32_t h = hash_djb2_one_32(0); uint32_t h = hash_djb2_one_32(0);
for (int i = 0; i < _p->array.size(); i++) { for (int i = 0; i < _p->array.size(); i++) {
h = hash_djb2_one_32(_p->array[i].hash(), h); h = hash_djb2_one_32(_p->array[i].hash(), h);
} }
return h; return h;
} }
void Array::_assign(const Array &p_array) { void Array::_assign(const Array &p_array) {
if (_p->typed.type != Variant::OBJECT && _p->typed.type == p_array._p->typed.type) { if (_p->typed.type != Variant::OBJECT && _p->typed.type == p_array._p->typed.type) {
//same type or untyped, just reference, shuold be fine //same type or untyped, just reference, shuold be fine
_ref(p_array); _ref(p_array);
@ -163,24 +152,20 @@ void Array::operator=(const Array &p_array) {
_assign(p_array); _assign(p_array);
} }
void Array::push_back(const Variant &p_value) { void Array::push_back(const Variant &p_value) {
ERR_FAIL_COND(!_p->typed.validate(p_value, "push_back")); ERR_FAIL_COND(!_p->typed.validate(p_value, "push_back"));
_p->array.push_back(p_value); _p->array.push_back(p_value);
} }
Error Array::resize(int p_new_size) { Error Array::resize(int p_new_size) {
return _p->array.resize(p_new_size); return _p->array.resize(p_new_size);
} }
void Array::insert(int p_pos, const Variant &p_value) { void Array::insert(int p_pos, const Variant &p_value) {
ERR_FAIL_COND(!_p->typed.validate(p_value, "insert")); ERR_FAIL_COND(!_p->typed.validate(p_value, "insert"));
_p->array.insert(p_pos, p_value); _p->array.insert(p_pos, p_value);
} }
void Array::erase(const Variant &p_value) { void Array::erase(const Variant &p_value) {
ERR_FAIL_COND(!_p->typed.validate(p_value, "erase")); ERR_FAIL_COND(!_p->typed.validate(p_value, "erase"));
_p->array.erase(p_value); _p->array.erase(p_value);
} }
@ -196,13 +181,11 @@ Variant Array::back() const {
} }
int Array::find(const Variant &p_value, int p_from) const { int Array::find(const Variant &p_value, int p_from) const {
ERR_FAIL_COND_V(!_p->typed.validate(p_value, "find"), -1); ERR_FAIL_COND_V(!_p->typed.validate(p_value, "find"), -1);
return _p->array.find(p_value, p_from); return _p->array.find(p_value, p_from);
} }
int Array::rfind(const Variant &p_value, int p_from) const { int Array::rfind(const Variant &p_value, int p_from) const {
if (_p->array.size() == 0) if (_p->array.size() == 0)
return -1; return -1;
ERR_FAIL_COND_V(!_p->typed.validate(p_value, "rfind"), -1); ERR_FAIL_COND_V(!_p->typed.validate(p_value, "rfind"), -1);
@ -217,7 +200,6 @@ int Array::rfind(const Variant &p_value, int p_from) const {
} }
for (int i = p_from; i >= 0; i--) { for (int i = p_from; i >= 0; i--) {
if (_p->array[i] == p_value) { if (_p->array[i] == p_value) {
return i; return i;
} }
@ -227,20 +209,17 @@ int Array::rfind(const Variant &p_value, int p_from) const {
} }
int Array::find_last(const Variant &p_value) const { int Array::find_last(const Variant &p_value) const {
ERR_FAIL_COND_V(!_p->typed.validate(p_value, "find_last"), -1); ERR_FAIL_COND_V(!_p->typed.validate(p_value, "find_last"), -1);
return rfind(p_value); return rfind(p_value);
} }
int Array::count(const Variant &p_value) const { int Array::count(const Variant &p_value) const {
ERR_FAIL_COND_V(!_p->typed.validate(p_value, "count"), 0); ERR_FAIL_COND_V(!_p->typed.validate(p_value, "count"), 0);
if (_p->array.size() == 0) if (_p->array.size() == 0)
return 0; return 0;
int amount = 0; int amount = 0;
for (int i = 0; i < _p->array.size(); i++) { for (int i = 0; i < _p->array.size(); i++) {
if (_p->array[i] == p_value) { if (_p->array[i] == p_value) {
amount++; amount++;
} }
@ -256,24 +235,20 @@ bool Array::has(const Variant &p_value) const {
} }
void Array::remove(int p_pos) { void Array::remove(int p_pos) {
_p->array.remove(p_pos); _p->array.remove(p_pos);
} }
void Array::set(int p_idx, const Variant &p_value) { void Array::set(int p_idx, const Variant &p_value) {
ERR_FAIL_COND(!_p->typed.validate(p_value, "set")); ERR_FAIL_COND(!_p->typed.validate(p_value, "set"));
operator[](p_idx) = p_value; operator[](p_idx) = p_value;
} }
const Variant &Array::get(int p_idx) const { const Variant &Array::get(int p_idx) const {
return operator[](p_idx); return operator[](p_idx);
} }
Array Array::duplicate(bool p_deep) const { Array Array::duplicate(bool p_deep) const {
Array new_arr; Array new_arr;
int element_count = size(); int element_count = size();
new_arr.resize(element_count); new_arr.resize(element_count);
@ -286,7 +261,6 @@ Array Array::duplicate(bool p_deep) const {
} }
int Array::_clamp_slice_index(int p_index) const { int Array::_clamp_slice_index(int p_index) const {
int arr_size = size(); int arr_size = size();
int fixed_index = CLAMP(p_index, -arr_size, arr_size - 1); int fixed_index = CLAMP(p_index, -arr_size, arr_size - 1);
if (fixed_index < 0) { if (fixed_index < 0) {
@ -335,7 +309,6 @@ Array Array::slice(int p_begin, int p_end, int p_step, bool p_deep) const { // l
} }
struct _ArrayVariantSort { struct _ArrayVariantSort {
_FORCE_INLINE_ bool operator()(const Variant &p_l, const Variant &p_r) const { _FORCE_INLINE_ bool operator()(const Variant &p_l, const Variant &p_r) const {
bool valid = false; bool valid = false;
Variant res; Variant res;
@ -347,18 +320,15 @@ struct _ArrayVariantSort {
}; };
Array &Array::sort() { Array &Array::sort() {
_p->array.sort_custom<_ArrayVariantSort>(); _p->array.sort_custom<_ArrayVariantSort>();
return *this; return *this;
} }
struct _ArrayVariantSortCustom { struct _ArrayVariantSortCustom {
Object *obj; Object *obj;
StringName func; StringName func;
_FORCE_INLINE_ bool operator()(const Variant &p_l, const Variant &p_r) const { _FORCE_INLINE_ bool operator()(const Variant &p_l, const Variant &p_r) const {
const Variant *args[2] = { &p_l, &p_r }; const Variant *args[2] = { &p_l, &p_r };
Callable::CallError err; Callable::CallError err;
bool res = obj->call(func, args, 2, err); bool res = obj->call(func, args, 2, err);
@ -368,7 +338,6 @@ struct _ArrayVariantSortCustom {
} }
}; };
Array &Array::sort_custom(Object *p_obj, const StringName &p_function) { Array &Array::sort_custom(Object *p_obj, const StringName &p_function) {
ERR_FAIL_NULL_V(p_obj, *this); ERR_FAIL_NULL_V(p_obj, *this);
SortArray<Variant, _ArrayVariantSortCustom, true> avs; SortArray<Variant, _ArrayVariantSortCustom, true> avs;
@ -379,7 +348,6 @@ Array &Array::sort_custom(Object *p_obj, const StringName &p_function) {
} }
void Array::shuffle() { void Array::shuffle() {
const int n = _p->array.size(); const int n = _p->array.size();
if (n < 2) if (n < 2)
return; return;
@ -394,7 +362,6 @@ void Array::shuffle() {
template <typename Less> template <typename Less>
_FORCE_INLINE_ int bisect(const Vector<Variant> &p_array, const Variant &p_value, bool p_before, const Less &p_less) { _FORCE_INLINE_ int bisect(const Vector<Variant> &p_array, const Variant &p_value, bool p_before, const Less &p_less) {
int lo = 0; int lo = 0;
int hi = p_array.size(); int hi = p_array.size();
if (p_before) { if (p_before) {
@ -420,13 +387,11 @@ _FORCE_INLINE_ int bisect(const Vector<Variant> &p_array, const Variant &p_value
} }
int Array::bsearch(const Variant &p_value, bool p_before) { int Array::bsearch(const Variant &p_value, bool p_before) {
ERR_FAIL_COND_V(!_p->typed.validate(p_value, "binary search"), -1); ERR_FAIL_COND_V(!_p->typed.validate(p_value, "binary search"), -1);
return bisect(_p->array, p_value, p_before, _ArrayVariantSort()); return bisect(_p->array, p_value, p_before, _ArrayVariantSort());
} }
int Array::bsearch_custom(const Variant &p_value, Object *p_obj, const StringName &p_function, bool p_before) { int Array::bsearch_custom(const Variant &p_value, Object *p_obj, const StringName &p_function, bool p_before) {
ERR_FAIL_COND_V(!_p->typed.validate(p_value, "custom binary search"), -1); ERR_FAIL_COND_V(!_p->typed.validate(p_value, "custom binary search"), -1);
ERR_FAIL_NULL_V(p_obj, 0); ERR_FAIL_NULL_V(p_obj, 0);
@ -438,19 +403,16 @@ int Array::bsearch_custom(const Variant &p_value, Object *p_obj, const StringNam
} }
Array &Array::invert() { Array &Array::invert() {
_p->array.invert(); _p->array.invert();
return *this; return *this;
} }
void Array::push_front(const Variant &p_value) { void Array::push_front(const Variant &p_value) {
ERR_FAIL_COND(!_p->typed.validate(p_value, "push_front")); ERR_FAIL_COND(!_p->typed.validate(p_value, "push_front"));
_p->array.insert(0, p_value); _p->array.insert(0, p_value);
} }
Variant Array::pop_back() { Variant Array::pop_back() {
if (!_p->array.empty()) { if (!_p->array.empty()) {
int n = _p->array.size() - 1; int n = _p->array.size() - 1;
Variant ret = _p->array.get(n); Variant ret = _p->array.get(n);
@ -461,7 +423,6 @@ Variant Array::pop_back() {
} }
Variant Array::pop_front() { Variant Array::pop_front() {
if (!_p->array.empty()) { if (!_p->array.empty()) {
Variant ret = _p->array.get(0); Variant ret = _p->array.get(0);
_p->array.remove(0); _p->array.remove(0);
@ -471,7 +432,6 @@ Variant Array::pop_front() {
} }
Variant Array::min() const { Variant Array::min() const {
Variant minval; Variant minval;
for (int i = 0; i < size(); i++) { for (int i = 0; i < size(); i++) {
if (i == 0) { if (i == 0) {
@ -494,7 +454,6 @@ Variant Array::min() const {
} }
Variant Array::max() const { Variant Array::max() const {
Variant maxval; Variant maxval;
for (int i = 0; i < size(); i++) { for (int i = 0; i < size(); i++) {
if (i == 0) { if (i == 0) {
@ -542,17 +501,14 @@ void Array::set_typed(uint32_t p_type, const StringName &p_class_name, const Var
} }
Array::Array(const Array &p_from) { Array::Array(const Array &p_from) {
_p = nullptr; _p = nullptr;
_ref(p_from); _ref(p_from);
} }
Array::Array() { Array::Array() {
_p = memnew(ArrayPrivate); _p = memnew(ArrayPrivate);
_p->refcount.init(); _p->refcount.init();
} }
Array::~Array() { Array::~Array() {
_unref(); _unref();
} }

1
core/array.h
View file

@ -39,7 +39,6 @@ class Object;
class StringName; class StringName;
class Array { class Array {
mutable ArrayPrivate *_p; mutable ArrayPrivate *_p;
void _ref(const Array &p_from) const; void _ref(const Array &p_from) const;
void _unref() const; void _unref() const;

231
core/bind/core_bind.cpp
View file

File diff suppressed because it is too large Load diff

7
core/bind/core_bind.h
View file

@ -254,7 +254,6 @@ VARIANT_ENUM_CAST(_OS::Month);
VARIANT_ENUM_CAST(_OS::SystemDir); VARIANT_ENUM_CAST(_OS::SystemDir);
class _Geometry : public Object { class _Geometry : public Object {
GDCLASS(_Geometry, Object); GDCLASS(_Geometry, Object);
static _Geometry *singleton; static _Geometry *singleton;
@ -437,7 +436,6 @@ VARIANT_ENUM_CAST(_File::ModeFlags);
VARIANT_ENUM_CAST(_File::CompressionMode); VARIANT_ENUM_CAST(_File::CompressionMode);
class _Directory : public Reference { class _Directory : public Reference {
GDCLASS(_Directory, Reference); GDCLASS(_Directory, Reference);
DirAccess *d; DirAccess *d;
@ -481,7 +479,6 @@ private:
}; };
class _Marshalls : public Object { class _Marshalls : public Object {
GDCLASS(_Marshalls, Object); GDCLASS(_Marshalls, Object);
static _Marshalls *singleton; static _Marshalls *singleton;
@ -506,7 +503,6 @@ public:
}; };
class _Mutex : public Reference { class _Mutex : public Reference {
GDCLASS(_Mutex, Reference); GDCLASS(_Mutex, Reference);
Mutex mutex; Mutex mutex;
@ -519,7 +515,6 @@ public:
}; };
class _Semaphore : public Reference { class _Semaphore : public Reference {
GDCLASS(_Semaphore, Reference); GDCLASS(_Semaphore, Reference);
Semaphore semaphore; Semaphore semaphore;
@ -532,7 +527,6 @@ public:
}; };
class _Thread : public Reference { class _Thread : public Reference {
GDCLASS(_Thread, Reference); GDCLASS(_Thread, Reference);
protected: protected:
@ -566,7 +560,6 @@ public:
VARIANT_ENUM_CAST(_Thread::Priority); VARIANT_ENUM_CAST(_Thread::Priority);
class _ClassDB : public Object { class _ClassDB : public Object {
GDCLASS(_ClassDB, Object); GDCLASS(_ClassDB, Object);
protected: protected:

7
core/callable.cpp
View file

@ -40,7 +40,6 @@ void Callable::call_deferred(const Variant **p_arguments, int p_argcount) const
} }
void Callable::call(const Variant **p_arguments, int p_argcount, Variant &r_return_value, CallError &r_call_error) const { void Callable::call(const Variant **p_arguments, int p_argcount, Variant &r_return_value, CallError &r_call_error) const {
if (is_null()) { if (is_null()) {
r_call_error.error = CallError::CALL_ERROR_INSTANCE_IS_NULL; r_call_error.error = CallError::CALL_ERROR_INSTANCE_IS_NULL;
r_call_error.argument = 0; r_call_error.argument = 0;
@ -179,7 +178,6 @@ void Callable::operator=(const Callable &p_callable) {
} }
Callable::operator String() const { Callable::operator String() const {
if (is_custom()) { if (is_custom()) {
return custom->get_as_text(); return custom->get_as_text();
} else { } else {
@ -192,7 +190,6 @@ Callable::operator String() const {
String class_name = base->get_class(); String class_name = base->get_class();
Ref<Script> script = base->get_script(); Ref<Script> script = base->get_script();
if (script.is_valid() && script->get_path().is_resource_file()) { if (script.is_valid() && script->get_path().is_resource_file()) {
class_name += "(" + script->get_path().get_file() + ")"; class_name += "(" + script->get_path().get_file() + ")";
} }
return class_name + "::" + String(method); return class_name + "::" + String(method);
@ -294,7 +291,6 @@ Signal::operator String() const {
String class_name = base->get_class(); String class_name = base->get_class();
Ref<Script> script = base->get_script(); Ref<Script> script = base->get_script();
if (script.is_valid() && script->get_path().is_resource_file()) { if (script.is_valid() && script->get_path().is_resource_file()) {
class_name += "(" + script->get_path().get_file() + ")"; class_name += "(" + script->get_path().get_file() + ")";
} }
return class_name + "::[signal]" + String(name); return class_name + "::[signal]" + String(name);
@ -312,7 +308,6 @@ Error Signal::emit(const Variant **p_arguments, int p_argcount) const {
return obj->emit_signal(name, p_arguments, p_argcount); return obj->emit_signal(name, p_arguments, p_argcount);
} }
Error Signal::connect(const Callable &p_callable, const Vector<Variant> &p_binds, uint32_t p_flags) { Error Signal::connect(const Callable &p_callable, const Vector<Variant> &p_binds, uint32_t p_flags) {
Object *object = get_object(); Object *object = get_object();
ERR_FAIL_COND_V(!object, ERR_UNCONFIGURED); ERR_FAIL_COND_V(!object, ERR_UNCONFIGURED);
@ -347,7 +342,6 @@ Array Signal::get_connections() const {
} }
Signal::Signal(const Object *p_object, const StringName &p_name) { Signal::Signal(const Object *p_object, const StringName &p_name) {
ERR_FAIL_COND_MSG(p_object == nullptr, "Object argument to Signal constructor must be non-null"); ERR_FAIL_COND_MSG(p_object == nullptr, "Object argument to Signal constructor must be non-null");
object = p_object->get_instance_id(); object = p_object->get_instance_id();
@ -355,7 +349,6 @@ Signal::Signal(const Object *p_object, const StringName &p_name) {
} }
Signal::Signal(ObjectID p_object, const StringName &p_name) { Signal::Signal(ObjectID p_object, const StringName &p_name) {
object = p_object; object = p_object;
name = p_name; name = p_name;
} }

1
core/callable.h
View file

@ -45,7 +45,6 @@ class CallableCustom;
// but can be optimized or customized. // but can be optimized or customized.
class Callable { class Callable {
//needs to be max 16 bytes in 64 bits //needs to be max 16 bytes in 64 bits
StringName method; StringName method;
union { union {

1
core/callable_method_pointer.cpp
View file

@ -48,7 +48,6 @@ bool CallableCustomMethodPointerBase::compare_equal(const CallableCustom *p_a, c
} }
bool CallableCustomMethodPointerBase::compare_less(const CallableCustom *p_a, const CallableCustom *p_b) { bool CallableCustomMethodPointerBase::compare_less(const CallableCustom *p_a, const CallableCustom *p_b) {
const CallableCustomMethodPointerBase *a = static_cast<const CallableCustomMethodPointerBase *>(p_a); const CallableCustomMethodPointerBase *a = static_cast<const CallableCustomMethodPointerBase *>(p_a);
const CallableCustomMethodPointerBase *b = static_cast<const CallableCustomMethodPointerBase *>(p_b); const CallableCustomMethodPointerBase *b = static_cast<const CallableCustomMethodPointerBase *>(p_b);

8
core/callable_method_pointer.h
View file

@ -38,7 +38,6 @@
#include "core/simple_type.h" #include "core/simple_type.h"
class CallableCustomMethodPointerBase : public CallableCustom { class CallableCustomMethodPointerBase : public CallableCustom {
uint32_t *comp_ptr; uint32_t *comp_ptr;
uint32_t comp_size; uint32_t comp_size;
uint32_t h; uint32_t h;
@ -74,7 +73,6 @@ public:
template <class T> template <class T>
struct VariantCasterAndValidate { struct VariantCasterAndValidate {
static _FORCE_INLINE_ T cast(const Variant **p_args, uint32_t p_arg_idx, Callable::CallError &r_error) { static _FORCE_INLINE_ T cast(const Variant **p_args, uint32_t p_arg_idx, Callable::CallError &r_error) {
Variant::Type argtype = GetTypeInfo<T>::VARIANT_TYPE; Variant::Type argtype = GetTypeInfo<T>::VARIANT_TYPE;
if (!Variant::can_convert_strict(p_args[p_arg_idx]->get_type(), argtype)) { if (!Variant::can_convert_strict(p_args[p_arg_idx]->get_type(), argtype)) {
@ -89,7 +87,6 @@ struct VariantCasterAndValidate {
template <class T> template <class T>
struct VariantCasterAndValidate<T &> { struct VariantCasterAndValidate<T &> {
static _FORCE_INLINE_ T cast(const Variant **p_args, uint32_t p_arg_idx, Callable::CallError &r_error) { static _FORCE_INLINE_ T cast(const Variant **p_args, uint32_t p_arg_idx, Callable::CallError &r_error) {
Variant::Type argtype = GetTypeInfo<T>::VARIANT_TYPE; Variant::Type argtype = GetTypeInfo<T>::VARIANT_TYPE;
if (!Variant::can_convert_strict(p_args[p_arg_idx]->get_type(), argtype)) { if (!Variant::can_convert_strict(p_args[p_arg_idx]->get_type(), argtype)) {
@ -104,7 +101,6 @@ struct VariantCasterAndValidate<T &> {
template <class T> template <class T>
struct VariantCasterAndValidate<const T &> { struct VariantCasterAndValidate<const T &> {
static _FORCE_INLINE_ T cast(const Variant **p_args, uint32_t p_arg_idx, Callable::CallError &r_error) { static _FORCE_INLINE_ T cast(const Variant **p_args, uint32_t p_arg_idx, Callable::CallError &r_error) {
Variant::Type argtype = GetTypeInfo<T>::VARIANT_TYPE; Variant::Type argtype = GetTypeInfo<T>::VARIANT_TYPE;
if (!Variant::can_convert_strict(p_args[p_arg_idx]->get_type(), argtype)) { if (!Variant::can_convert_strict(p_args[p_arg_idx]->get_type(), argtype)) {
@ -163,7 +159,6 @@ void call_with_variant_args(T *p_instance, void (T::*p_method)(P...), const Vari
template <class T, class... P> template <class T, class... P>
class CallableCustomMethodPointer : public CallableCustomMethodPointerBase { class CallableCustomMethodPointer : public CallableCustomMethodPointerBase {
struct Data { struct Data {
T *instance; T *instance;
void (T::*method)(P...); void (T::*method)(P...);
@ -173,7 +168,6 @@ public:
virtual ObjectID get_object() const { return data.instance->get_instance_id(); } virtual ObjectID get_object() const { return data.instance->get_instance_id(); }
virtual void call(const Variant **p_arguments, int p_argcount, Variant &r_return_value, Callable::CallError &r_call_error) const { virtual void call(const Variant **p_arguments, int p_argcount, Variant &r_return_value, Callable::CallError &r_call_error) const {
call_with_variant_args(data.instance, data.method, p_arguments, p_argcount, r_call_error); call_with_variant_args(data.instance, data.method, p_arguments, p_argcount, r_call_error);
} }
@ -246,7 +240,6 @@ void call_with_variant_args_ret(T *p_instance, R (T::*p_method)(P...), const Var
template <class T, class R, class... P> template <class T, class R, class... P>
class CallableCustomMethodPointerRet : public CallableCustomMethodPointerBase { class CallableCustomMethodPointerRet : public CallableCustomMethodPointerBase {
struct Data { struct Data {
T *instance; T *instance;
R(T::*method) R(T::*method)
@ -257,7 +250,6 @@ public:
virtual ObjectID get_object() const { return data.instance->get_instance_id(); } virtual ObjectID get_object() const { return data.instance->get_instance_id(); }
virtual void call(const Variant **p_arguments, int p_argcount, Variant &r_return_value, Callable::CallError &r_call_error) const { virtual void call(const Variant **p_arguments, int p_argcount, Variant &r_return_value, Callable::CallError &r_call_error) const {
call_with_variant_args_ret(data.instance, data.method, p_arguments, p_argcount, r_return_value, r_call_error); call_with_variant_args_ret(data.instance, data.method, p_arguments, p_argcount, r_return_value, r_call_error);
} }

119
core/class_db.cpp
View file

@ -40,14 +40,12 @@
#ifdef DEBUG_METHODS_ENABLED #ifdef DEBUG_METHODS_ENABLED
MethodDefinition D_METHOD(const char *p_name) { MethodDefinition D_METHOD(const char *p_name) {
MethodDefinition md; MethodDefinition md;
md.name = StaticCString::create(p_name); md.name = StaticCString::create(p_name);
return md; return md;
} }
MethodDefinition D_METHOD(const char *p_name, const char *p_arg1) { MethodDefinition D_METHOD(const char *p_name, const char *p_arg1) {
MethodDefinition md; MethodDefinition md;
md.name = StaticCString::create(p_name); md.name = StaticCString::create(p_name);
md.args.push_back(StaticCString::create(p_arg1)); md.args.push_back(StaticCString::create(p_arg1));
@ -55,7 +53,6 @@ MethodDefinition D_METHOD(const char *p_name, const char *p_arg1) {
} }
MethodDefinition D_METHOD(const char *p_name, const char *p_arg1, const char *p_arg2) { MethodDefinition D_METHOD(const char *p_name, const char *p_arg1, const char *p_arg2) {
MethodDefinition md; MethodDefinition md;
md.name = StaticCString::create(p_name); md.name = StaticCString::create(p_name);
md.args.resize(2); md.args.resize(2);
@ -65,7 +62,6 @@ MethodDefinition D_METHOD(const char *p_name, const char *p_arg1, const char *p_
} }
MethodDefinition D_METHOD(const char *p_name, const char *p_arg1, const char *p_arg2, const char *p_arg3) { MethodDefinition D_METHOD(const char *p_name, const char *p_arg1, const char *p_arg2, const char *p_arg3) {
MethodDefinition md; MethodDefinition md;
md.name = StaticCString::create(p_name); md.name = StaticCString::create(p_name);
md.args.resize(3); md.args.resize(3);
@ -76,7 +72,6 @@ MethodDefinition D_METHOD(const char *p_name, const char *p_arg1, const char *p_
} }
MethodDefinition D_METHOD(const char *p_name, const char *p_arg1, const char *p_arg2, const char *p_arg3, const char *p_arg4) { MethodDefinition D_METHOD(const char *p_name, const char *p_arg1, const char *p_arg2, const char *p_arg3, const char *p_arg4) {
MethodDefinition md; MethodDefinition md;
md.name = StaticCString::create(p_name); md.name = StaticCString::create(p_name);
md.args.resize(4); md.args.resize(4);
@ -88,7 +83,6 @@ MethodDefinition D_METHOD(const char *p_name, const char *p_arg1, const char *p_
} }
MethodDefinition D_METHOD(const char *p_name, const char *p_arg1, const char *p_arg2, const char *p_arg3, const char *p_arg4, const char *p_arg5) { MethodDefinition D_METHOD(const char *p_name, const char *p_arg1, const char *p_arg2, const char *p_arg3, const char *p_arg4, const char *p_arg5) {
MethodDefinition md; MethodDefinition md;
md.name = StaticCString::create(p_name); md.name = StaticCString::create(p_name);
md.args.resize(5); md.args.resize(5);
@ -101,7 +95,6 @@ MethodDefinition D_METHOD(const char *p_name, const char *p_arg1, const char *p_
} }
MethodDefinition D_METHOD(const char *p_name, const char *p_arg1, const char *p_arg2, const char *p_arg3, const char *p_arg4, const char *p_arg5, const char *p_arg6) { MethodDefinition D_METHOD(const char *p_name, const char *p_arg1, const char *p_arg2, const char *p_arg3, const char *p_arg4, const char *p_arg5, const char *p_arg6) {
MethodDefinition md; MethodDefinition md;
md.name = StaticCString::create(p_name); md.name = StaticCString::create(p_name);
md.args.resize(6); md.args.resize(6);
@ -115,7 +108,6 @@ MethodDefinition D_METHOD(const char *p_name, const char *p_arg1, const char *p_
} }
MethodDefinition D_METHOD(const char *p_name, const char *p_arg1, const char *p_arg2, const char *p_arg3, const char *p_arg4, const char *p_arg5, const char *p_arg6, const char *p_arg7) { MethodDefinition D_METHOD(const char *p_name, const char *p_arg1, const char *p_arg2, const char *p_arg3, const char *p_arg4, const char *p_arg5, const char *p_arg6, const char *p_arg7) {
MethodDefinition md; MethodDefinition md;
md.name = StaticCString::create(p_name); md.name = StaticCString::create(p_name);
md.args.resize(7); md.args.resize(7);
@ -130,7 +122,6 @@ MethodDefinition D_METHOD(const char *p_name, const char *p_arg1, const char *p_
} }
MethodDefinition D_METHOD(const char *p_name, const char *p_arg1, const char *p_arg2, const char *p_arg3, const char *p_arg4, const char *p_arg5, const char *p_arg6, const char *p_arg7, const char *p_arg8) { MethodDefinition D_METHOD(const char *p_name, const char *p_arg1, const char *p_arg2, const char *p_arg3, const char *p_arg4, const char *p_arg5, const char *p_arg6, const char *p_arg7, const char *p_arg8) {
MethodDefinition md; MethodDefinition md;
md.name = StaticCString::create(p_name); md.name = StaticCString::create(p_name);
md.args.resize(8); md.args.resize(8);
@ -146,7 +137,6 @@ MethodDefinition D_METHOD(const char *p_name, const char *p_arg1, const char *p_
} }
MethodDefinition D_METHOD(const char *p_name, const char *p_arg1, const char *p_arg2, const char *p_arg3, const char *p_arg4, const char *p_arg5, const char *p_arg6, const char *p_arg7, const char *p_arg8, const char *p_arg9) { MethodDefinition D_METHOD(const char *p_name, const char *p_arg1, const char *p_arg2, const char *p_arg3, const char *p_arg4, const char *p_arg5, const char *p_arg6, const char *p_arg7, const char *p_arg8, const char *p_arg9) {
MethodDefinition md; MethodDefinition md;
md.name = StaticCString::create(p_name); md.name = StaticCString::create(p_name);
md.args.resize(9); md.args.resize(9);
@ -163,7 +153,6 @@ MethodDefinition D_METHOD(const char *p_name, const char *p_arg1, const char *p_
} }
MethodDefinition D_METHOD(const char *p_name, const char *p_arg1, const char *p_arg2, const char *p_arg3, const char *p_arg4, const char *p_arg5, const char *p_arg6, const char *p_arg7, const char *p_arg8, const char *p_arg9, const char *p_arg10) { MethodDefinition D_METHOD(const char *p_name, const char *p_arg1, const char *p_arg2, const char *p_arg3, const char *p_arg4, const char *p_arg5, const char *p_arg6, const char *p_arg7, const char *p_arg8, const char *p_arg9, const char *p_arg10) {
MethodDefinition md; MethodDefinition md;
md.name = StaticCString::create(p_name); md.name = StaticCString::create(p_name);
md.args.resize(10); md.args.resize(10);
@ -181,7 +170,6 @@ MethodDefinition D_METHOD(const char *p_name, const char *p_arg1, const char *p_
} }
MethodDefinition D_METHOD(const char *p_name, const char *p_arg1, const char *p_arg2, const char *p_arg3, const char *p_arg4, const char *p_arg5, const char *p_arg6, const char *p_arg7, const char *p_arg8, const char *p_arg9, const char *p_arg10, const char *p_arg11) { MethodDefinition D_METHOD(const char *p_name, const char *p_arg1, const char *p_arg2, const char *p_arg3, const char *p_arg4, const char *p_arg5, const char *p_arg6, const char *p_arg7, const char *p_arg8, const char *p_arg9, const char *p_arg10, const char *p_arg11) {
MethodDefinition md; MethodDefinition md;
md.name = StaticCString::create(p_name); md.name = StaticCString::create(p_name);
md.args.resize(11); md.args.resize(11);
@ -200,7 +188,6 @@ MethodDefinition D_METHOD(const char *p_name, const char *p_arg1, const char *p_
} }
MethodDefinition D_METHOD(const char *p_name, const char *p_arg1, const char *p_arg2, const char *p_arg3, const char *p_arg4, const char *p_arg5, const char *p_arg6, const char *p_arg7, const char *p_arg8, const char *p_arg9, const char *p_arg10, const char *p_arg11, const char *p_arg12) { MethodDefinition D_METHOD(const char *p_name, const char *p_arg1, const char *p_arg2, const char *p_arg3, const char *p_arg4, const char *p_arg5, const char *p_arg6, const char *p_arg7, const char *p_arg8, const char *p_arg9, const char *p_arg10, const char *p_arg11, const char *p_arg12) {
MethodDefinition md; MethodDefinition md;
md.name = StaticCString::create(p_name); md.name = StaticCString::create(p_name);
md.args.resize(12); md.args.resize(12);
@ -220,7 +207,6 @@ MethodDefinition D_METHOD(const char *p_name, const char *p_arg1, const char *p_
} }
MethodDefinition D_METHOD(const char *p_name, const char *p_arg1, const char *p_arg2, const char *p_arg3, const char *p_arg4, const char *p_arg5, const char *p_arg6, const char *p_arg7, const char *p_arg8, const char *p_arg9, const char *p_arg10, const char *p_arg11, const char *p_arg12, const char *p_arg13) { MethodDefinition D_METHOD(const char *p_name, const char *p_arg1, const char *p_arg2, const char *p_arg3, const char *p_arg4, const char *p_arg5, const char *p_arg6, const char *p_arg7, const char *p_arg8, const char *p_arg9, const char *p_arg10, const char *p_arg11, const char *p_arg12, const char *p_arg13) {
MethodDefinition md; MethodDefinition md;
md.name = StaticCString::create(p_name); md.name = StaticCString::create(p_name);
md.args.resize(13); md.args.resize(13);
@ -245,12 +231,10 @@ MethodDefinition D_METHOD(const char *p_name, const char *p_arg1, const char *p_
ClassDB::APIType ClassDB::current_api = API_CORE; ClassDB::APIType ClassDB::current_api = API_CORE;
void ClassDB::set_current_api(APIType p_api) { void ClassDB::set_current_api(APIType p_api) {
current_api = p_api; current_api = p_api;
} }
ClassDB::APIType ClassDB::get_current_api() { ClassDB::APIType ClassDB::get_current_api() {
return current_api; return current_api;
} }
@ -259,13 +243,11 @@ HashMap<StringName, StringName> ClassDB::resource_base_extensions;
HashMap<StringName, StringName> ClassDB::compat_classes; HashMap<StringName, StringName> ClassDB::compat_classes;
bool ClassDB::is_parent_class(const StringName &p_class, const StringName &p_inherits) { bool ClassDB::is_parent_class(const StringName &p_class, const StringName &p_inherits) {
OBJTYPE_RLOCK; OBJTYPE_RLOCK;
StringName inherits = p_class; StringName inherits = p_class;
while (inherits.operator String().length()) { while (inherits.operator String().length()) {
if (inherits == p_inherits) if (inherits == p_inherits)
return true; return true;
inherits = get_parent_class(inherits); inherits = get_parent_class(inherits);
@ -274,13 +256,11 @@ bool ClassDB::is_parent_class(const StringName &p_class, const StringName &p_inh
return false; return false;
} }
void ClassDB::get_class_list(List<StringName> *p_classes) { void ClassDB::get_class_list(List<StringName> *p_classes) {
OBJTYPE_RLOCK; OBJTYPE_RLOCK;
const StringName *k = nullptr; const StringName *k = nullptr;
while ((k = classes.next(k))) { while ((k = classes.next(k))) {
p_classes->push_back(*k); p_classes->push_back(*k);
} }
@ -288,33 +268,28 @@ void ClassDB::get_class_list(List<StringName> *p_classes) {
} }
void ClassDB::get_inheriters_from_class(const StringName &p_class, List<StringName> *p_classes) { void ClassDB::get_inheriters_from_class(const StringName &p_class, List<StringName> *p_classes) {
OBJTYPE_RLOCK; OBJTYPE_RLOCK;
const StringName *k = nullptr; const StringName *k = nullptr;
while ((k = classes.next(k))) { while ((k = classes.next(k))) {
if (*k != p_class && is_parent_class(*k, p_class)) if (*k != p_class && is_parent_class(*k, p_class))
p_classes->push_back(*k); p_classes->push_back(*k);
} }
} }
void ClassDB::get_direct_inheriters_from_class(const StringName &p_class, List<StringName> *p_classes) { void ClassDB::get_direct_inheriters_from_class(const StringName &p_class, List<StringName> *p_classes) {
OBJTYPE_RLOCK; OBJTYPE_RLOCK;
const StringName *k = nullptr; const StringName *k = nullptr;
while ((k = classes.next(k))) { while ((k = classes.next(k))) {
if (*k != p_class && get_parent_class(*k) == p_class) if (*k != p_class && get_parent_class(*k) == p_class)
p_classes->push_back(*k); p_classes->push_back(*k);
} }
} }
StringName ClassDB::get_parent_class_nocheck(const StringName &p_class) { StringName ClassDB::get_parent_class_nocheck(const StringName &p_class) {
OBJTYPE_RLOCK; OBJTYPE_RLOCK;
ClassInfo *ti = classes.getptr(p_class); ClassInfo *ti = classes.getptr(p_class);
@ -324,7 +299,6 @@ StringName ClassDB::get_parent_class_nocheck(const StringName &p_class) {
} }
StringName ClassDB::get_compatibility_remapped_class(const StringName &p_class) { StringName ClassDB::get_compatibility_remapped_class(const StringName &p_class) {
if (classes.has(p_class)) { if (classes.has(p_class)) {
return p_class; return p_class;
} }
@ -337,7 +311,6 @@ StringName ClassDB::get_compatibility_remapped_class(const StringName &p_class)
} }
StringName ClassDB::get_parent_class(const StringName &p_class) { StringName ClassDB::get_parent_class(const StringName &p_class) {
OBJTYPE_RLOCK; OBJTYPE_RLOCK;
ClassInfo *ti = classes.getptr(p_class); ClassInfo *ti = classes.getptr(p_class);
@ -346,7 +319,6 @@ StringName ClassDB::get_parent_class(const StringName &p_class) {
} }
ClassDB::APIType ClassDB::get_api_type(const StringName &p_class) { ClassDB::APIType ClassDB::get_api_type(const StringName &p_class) {
OBJTYPE_RLOCK; OBJTYPE_RLOCK;
ClassInfo *ti = classes.getptr(p_class); ClassInfo *ti = classes.getptr(p_class);
@ -356,7 +328,6 @@ ClassDB::APIType ClassDB::get_api_type(const StringName &p_class) {
} }
uint64_t ClassDB::get_api_hash(APIType p_api) { uint64_t ClassDB::get_api_hash(APIType p_api) {
OBJTYPE_RLOCK; OBJTYPE_RLOCK;
#ifdef DEBUG_METHODS_ENABLED #ifdef DEBUG_METHODS_ENABLED
@ -367,14 +338,12 @@ uint64_t ClassDB::get_api_hash(APIType p_api) {
const StringName *k = nullptr; const StringName *k = nullptr;
while ((k = classes.next(k))) { while ((k = classes.next(k))) {
names.push_back(*k); names.push_back(*k);
} }
//must be alphabetically sorted for hash to compute //must be alphabetically sorted for hash to compute
names.sort_custom<StringName::AlphCompare>(); names.sort_custom<StringName::AlphCompare>();
for (List<StringName>::Element *E = names.front(); E; E = E->next()) { for (List<StringName>::Element *E = names.front(); E; E = E->next()) {
ClassInfo *t = classes.getptr(E->get()); ClassInfo *t = classes.getptr(E->get());
ERR_FAIL_COND_V_MSG(!t, 0, "Cannot get class '" + String(E->get()) + "'."); ERR_FAIL_COND_V_MSG(!t, 0, "Cannot get class '" + String(E->get()) + "'.");
if (t->api != p_api || !t->exposed) if (t->api != p_api || !t->exposed)
@ -389,7 +358,6 @@ uint64_t ClassDB::get_api_hash(APIType p_api) {
k = nullptr; k = nullptr;
while ((k = t->method_map.next(k))) { while ((k = t->method_map.next(k))) {
String name = k->operator String(); String name = k->operator String();
ERR_CONTINUE(name.empty()); ERR_CONTINUE(name.empty());
@ -403,7 +371,6 @@ uint64_t ClassDB::get_api_hash(APIType p_api) {
snames.sort_custom<StringName::AlphCompare>(); snames.sort_custom<StringName::AlphCompare>();
for (List<StringName>::Element *F = snames.front(); F; F = F->next()) { for (List<StringName>::Element *F = snames.front(); F; F = F->next()) {
MethodBind *mb = t->method_map[F->get()]; MethodBind *mb = t->method_map[F->get()];
hash = hash_djb2_one_64(mb->get_name().hash(), hash); hash = hash_djb2_one_64(mb->get_name().hash(), hash);
hash = hash_djb2_one_64(mb->get_argument_count(), hash); hash = hash_djb2_one_64(mb->get_argument_count(), hash);
@ -436,14 +403,12 @@ uint64_t ClassDB::get_api_hash(APIType p_api) {
k = nullptr; k = nullptr;
while ((k = t->constant_map.next(k))) { while ((k = t->constant_map.next(k))) {
snames.push_back(*k); snames.push_back(*k);
} }
snames.sort_custom<StringName::AlphCompare>(); snames.sort_custom<StringName::AlphCompare>();
for (List<StringName>::Element *F = snames.front(); F; F = F->next()) { for (List<StringName>::Element *F = snames.front(); F; F = F->next()) {
hash = hash_djb2_one_64(F->get().hash(), hash); hash = hash_djb2_one_64(F->get().hash(), hash);
hash = hash_djb2_one_64(t->constant_map[F->get()], hash); hash = hash_djb2_one_64(t->constant_map[F->get()], hash);
} }
@ -456,14 +421,12 @@ uint64_t ClassDB::get_api_hash(APIType p_api) {
k = nullptr; k = nullptr;
while ((k = t->signal_map.next(k))) { while ((k = t->signal_map.next(k))) {
snames.push_back(*k); snames.push_back(*k);
} }
snames.sort_custom<StringName::AlphCompare>(); snames.sort_custom<StringName::AlphCompare>();
for (List<StringName>::Element *F = snames.front(); F; F = F->next()) { for (List<StringName>::Element *F = snames.front(); F; F = F->next()) {
MethodInfo &mi = t->signal_map[F->get()]; MethodInfo &mi = t->signal_map[F->get()];
hash = hash_djb2_one_64(F->get().hash(), hash); hash = hash_djb2_one_64(F->get().hash(), hash);
for (int i = 0; i < mi.arguments.size(); i++) { for (int i = 0; i < mi.arguments.size(); i++) {
@ -479,14 +442,12 @@ uint64_t ClassDB::get_api_hash(APIType p_api) {
k = nullptr; k = nullptr;
while ((k = t->property_setget.next(k))) { while ((k = t->property_setget.next(k))) {
snames.push_back(*k); snames.push_back(*k);
} }
snames.sort_custom<StringName::AlphCompare>(); snames.sort_custom<StringName::AlphCompare>();
for (List<StringName>::Element *F = snames.front(); F; F = F->next()) { for (List<StringName>::Element *F = snames.front(); F; F = F->next()) {
PropertySetGet *psg = t->property_setget.getptr(F->get()); PropertySetGet *psg = t->property_setget.getptr(F->get());
ERR_FAIL_COND_V(!psg, 0); ERR_FAIL_COND_V(!psg, 0);
@ -498,7 +459,6 @@ uint64_t ClassDB::get_api_hash(APIType p_api) {
//property list //property list
for (List<PropertyInfo>::Element *F = t->property_list.front(); F; F = F->next()) { for (List<PropertyInfo>::Element *F = t->property_list.front(); F; F = F->next()) {
hash = hash_djb2_one_64(F->get().name.hash(), hash); hash = hash_djb2_one_64(F->get().name.hash(), hash);
hash = hash_djb2_one_64(F->get().type, hash); hash = hash_djb2_one_64(F->get().type, hash);
hash = hash_djb2_one_64(F->get().hint, hash); hash = hash_djb2_one_64(F->get().hint, hash);
@ -514,19 +474,16 @@ uint64_t ClassDB::get_api_hash(APIType p_api) {
} }
bool ClassDB::class_exists(const StringName &p_class) { bool ClassDB::class_exists(const StringName &p_class) {
OBJTYPE_RLOCK; OBJTYPE_RLOCK;
return classes.has(p_class); return classes.has(p_class);
} }
void ClassDB::add_compatibility_class(const StringName &p_class, const StringName &p_fallback) { void ClassDB::add_compatibility_class(const StringName &p_class, const StringName &p_fallback) {
OBJTYPE_WLOCK; OBJTYPE_WLOCK;
compat_classes[p_class] = p_fallback; compat_classes[p_class] = p_fallback;
} }
Object *ClassDB::instance(const StringName &p_class) { Object *ClassDB::instance(const StringName &p_class) {
ClassInfo *ti; ClassInfo *ti;
{ {
OBJTYPE_RLOCK; OBJTYPE_RLOCK;
@ -549,7 +506,6 @@ Object *ClassDB::instance(const StringName &p_class) {
return ti->creation_func(); return ti->creation_func();
} }
bool ClassDB::can_instance(const StringName &p_class) { bool ClassDB::can_instance(const StringName &p_class) {
OBJTYPE_RLOCK; OBJTYPE_RLOCK;
ClassInfo *ti = classes.getptr(p_class); ClassInfo *ti = classes.getptr(p_class);
@ -563,7 +519,6 @@ bool ClassDB::can_instance(const StringName &p_class) {
} }
void ClassDB::_add_class2(const StringName &p_class, const StringName &p_inherits) { void ClassDB::_add_class2(const StringName &p_class, const StringName &p_inherits) {
OBJTYPE_WLOCK; OBJTYPE_WLOCK;
const StringName &name = p_class; const StringName &name = p_class;
@ -577,7 +532,6 @@ void ClassDB::_add_class2(const StringName &p_class, const StringName &p_inherit
ti.api = current_api; ti.api = current_api;
if (ti.inherits) { if (ti.inherits) {
ERR_FAIL_COND(!classes.has(ti.inherits)); //it MUST be registered. ERR_FAIL_COND(!classes.has(ti.inherits)); //it MUST be registered.
ti.inherits_ptr = &classes[ti.inherits]; ti.inherits_ptr = &classes[ti.inherits];
@ -587,15 +541,12 @@ void ClassDB::_add_class2(const StringName &p_class, const StringName &p_inherit
} }
void ClassDB::get_method_list(StringName p_class, List<MethodInfo> *p_methods, bool p_no_inheritance, bool p_exclude_from_properties) { void ClassDB::get_method_list(StringName p_class, List<MethodInfo> *p_methods, bool p_no_inheritance, bool p_exclude_from_properties) {
OBJTYPE_RLOCK; OBJTYPE_RLOCK;
ClassInfo *type = classes.getptr(p_class); ClassInfo *type = classes.getptr(p_class);
while (type) { while (type) {
if (type->disabled) { if (type->disabled) {
if (p_no_inheritance) if (p_no_inheritance)
break; break;
@ -606,12 +557,10 @@ void ClassDB::get_method_list(StringName p_class, List<MethodInfo> *p_methods, b
#ifdef DEBUG_METHODS_ENABLED #ifdef DEBUG_METHODS_ENABLED
for (List<MethodInfo>::Element *E = type->virtual_methods.front(); E; E = E->next()) { for (List<MethodInfo>::Element *E = type->virtual_methods.front(); E; E = E->next()) {
p_methods->push_back(E->get()); p_methods->push_back(E->get());
} }
for (List<StringName>::Element *E = type->method_order.front(); E; E = E->next()) { for (List<StringName>::Element *E = type->method_order.front(); E; E = E->next()) {
MethodBind *method = type->method_map.get(E->get()); MethodBind *method = type->method_map.get(E->get());
MethodInfo minfo; MethodInfo minfo;
minfo.name = E->get(); minfo.name = E->get();
@ -621,7 +570,6 @@ void ClassDB::get_method_list(StringName p_class, List<MethodInfo> *p_methods, b
continue; continue;
for (int i = 0; i < method->get_argument_count(); i++) { for (int i = 0; i < method->get_argument_count(); i++) {
//Variant::Type t=method->get_argument_type(i); //Variant::Type t=method->get_argument_type(i);
minfo.arguments.push_back(method->get_argument_info(i)); minfo.arguments.push_back(method->get_argument_info(i));
@ -643,7 +591,6 @@ void ClassDB::get_method_list(StringName p_class, List<MethodInfo> *p_methods, b
const StringName *K = nullptr; const StringName *K = nullptr;
while ((K = type->method_map.next(K))) { while ((K = type->method_map.next(K))) {
MethodBind *m = type->method_map[*K]; MethodBind *m = type->method_map[*K];
MethodInfo mi; MethodInfo mi;
mi.name = m->get_name(); mi.name = m->get_name();
@ -660,13 +607,11 @@ void ClassDB::get_method_list(StringName p_class, List<MethodInfo> *p_methods, b
} }
MethodBind *ClassDB::get_method(StringName p_class, StringName p_name) { MethodBind *ClassDB::get_method(StringName p_class, StringName p_name) {
OBJTYPE_RLOCK; OBJTYPE_RLOCK;
ClassInfo *type = classes.getptr(p_class); ClassInfo *type = classes.getptr(p_class);
while (type) { while (type) {
MethodBind **method = type->method_map.getptr(p_name); MethodBind **method = type->method_map.getptr(p_name);
if (method && *method) if (method && *method)
return *method; return *method;
@ -676,7 +621,6 @@ MethodBind *ClassDB::get_method(StringName p_class, StringName p_name) {
} }
void ClassDB::bind_integer_constant(const StringName &p_class, const StringName &p_enum, const StringName &p_name, int p_constant) { void ClassDB::bind_integer_constant(const StringName &p_class, const StringName &p_enum, const StringName &p_name, int p_constant) {
OBJTYPE_WLOCK; OBJTYPE_WLOCK;
ClassInfo *type = classes.getptr(p_class); ClassInfo *type = classes.getptr(p_class);
@ -684,7 +628,6 @@ void ClassDB::bind_integer_constant(const StringName &p_class, const StringName
ERR_FAIL_COND(!type); ERR_FAIL_COND(!type);
if (type->constant_map.has(p_name)) { if (type->constant_map.has(p_name)) {
ERR_FAIL(); ERR_FAIL();
} }
@ -713,13 +656,11 @@ void ClassDB::bind_integer_constant(const StringName &p_class, const StringName
} }
void ClassDB::get_integer_constant_list(const StringName &p_class, List<String> *p_constants, bool p_no_inheritance) { void ClassDB::get_integer_constant_list(const StringName &p_class, List<String> *p_constants, bool p_no_inheritance) {
OBJTYPE_RLOCK; OBJTYPE_RLOCK;
ClassInfo *type = classes.getptr(p_class); ClassInfo *type = classes.getptr(p_class);
while (type) { while (type) {
#ifdef DEBUG_METHODS_ENABLED #ifdef DEBUG_METHODS_ENABLED
for (List<StringName>::Element *E = type->constant_order.front(); E; E = E->next()) for (List<StringName>::Element *E = type->constant_order.front(); E; E = E->next())
p_constants->push_back(E->get()); p_constants->push_back(E->get());
@ -739,16 +680,13 @@ void ClassDB::get_integer_constant_list(const StringName &p_class, List<String>
} }
int ClassDB::get_integer_constant(const StringName &p_class, const StringName &p_name, bool *p_success) { int ClassDB::get_integer_constant(const StringName &p_class, const StringName &p_name, bool *p_success) {
OBJTYPE_RLOCK; OBJTYPE_RLOCK;
ClassInfo *type = classes.getptr(p_class); ClassInfo *type = classes.getptr(p_class);
while (type) { while (type) {
int *constant = type->constant_map.getptr(p_name); int *constant = type->constant_map.getptr(p_name);
if (constant) { if (constant) {
if (p_success) if (p_success)
*p_success = true; *p_success = true;
return *constant; return *constant;
@ -764,16 +702,13 @@ int ClassDB::get_integer_constant(const StringName &p_class, const StringName &p
} }
StringName ClassDB::get_integer_constant_enum(const StringName &p_class, const StringName &p_name, bool p_no_inheritance) { StringName ClassDB::get_integer_constant_enum(const StringName &p_class, const StringName &p_name, bool p_no_inheritance) {
OBJTYPE_RLOCK; OBJTYPE_RLOCK;
ClassInfo *type = classes.getptr(p_class); ClassInfo *type = classes.getptr(p_class);
while (type) { while (type) {
const StringName *k = nullptr; const StringName *k = nullptr;
while ((k = type->enum_map.next(k))) { while ((k = type->enum_map.next(k))) {
List<StringName> &constants_list = type->enum_map.get(*k); List<StringName> &constants_list = type->enum_map.get(*k);
const List<StringName>::Element *found = constants_list.find(p_name); const List<StringName>::Element *found = constants_list.find(p_name);
if (found) if (found)
@ -790,13 +725,11 @@ StringName ClassDB::get_integer_constant_enum(const StringName &p_class, const S
} }
void ClassDB::get_enum_list(const StringName &p_class, List<StringName> *p_enums, bool p_no_inheritance) { void ClassDB::get_enum_list(const StringName &p_class, List<StringName> *p_enums, bool p_no_inheritance) {
OBJTYPE_RLOCK; OBJTYPE_RLOCK;
ClassInfo *type = classes.getptr(p_class); ClassInfo *type = classes.getptr(p_class);
while (type) { while (type) {
const StringName *k = nullptr; const StringName *k = nullptr;
while ((k = type->enum_map.next(k))) { while ((k = type->enum_map.next(k))) {
p_enums->push_back(*k); p_enums->push_back(*k);
@ -810,13 +743,11 @@ void ClassDB::get_enum_list(const StringName &p_class, List<StringName> *p_enums
} }
void ClassDB::get_enum_constants(const StringName &p_class, const StringName &p_enum, List<StringName> *p_constants, bool p_no_inheritance) { void ClassDB::get_enum_constants(const StringName &p_class, const StringName &p_enum, List<StringName> *p_constants, bool p_no_inheritance) {
OBJTYPE_RLOCK; OBJTYPE_RLOCK;
ClassInfo *type = classes.getptr(p_class); ClassInfo *type = classes.getptr(p_class);
while (type) { while (type) {
const List<StringName> *constants = type->enum_map.getptr(p_enum); const List<StringName> *constants = type->enum_map.getptr(p_enum);
if (constants) { if (constants) {
@ -833,7 +764,6 @@ void ClassDB::get_enum_constants(const StringName &p_class, const StringName &p_
} }
void ClassDB::add_signal(StringName p_class, const MethodInfo &p_signal) { void ClassDB::add_signal(StringName p_class, const MethodInfo &p_signal) {
OBJTYPE_WLOCK; OBJTYPE_WLOCK;
ClassInfo *type = classes.getptr(p_class); ClassInfo *type = classes.getptr(p_class);
@ -853,7 +783,6 @@ void ClassDB::add_signal(StringName p_class, const MethodInfo &p_signal) {
} }
void ClassDB::get_signal_list(StringName p_class, List<MethodInfo> *p_signals, bool p_no_inheritance) { void ClassDB::get_signal_list(StringName p_class, List<MethodInfo> *p_signals, bool p_no_inheritance) {
OBJTYPE_RLOCK; OBJTYPE_RLOCK;
ClassInfo *type = classes.getptr(p_class); ClassInfo *type = classes.getptr(p_class);
@ -862,10 +791,8 @@ void ClassDB::get_signal_list(StringName p_class, List<MethodInfo> *p_signals, b
ClassInfo *check = type; ClassInfo *check = type;
while (check) { while (check) {
const StringName *S = nullptr; const StringName *S = nullptr;
while ((S = check->signal_map.next(S))) { while ((S = check->signal_map.next(S))) {
p_signals->push_back(check->signal_map[*S]); p_signals->push_back(check->signal_map[*S]);
} }
@ -877,7 +804,6 @@ void ClassDB::get_signal_list(StringName p_class, List<MethodInfo> *p_signals, b
} }
bool ClassDB::has_signal(StringName p_class, StringName p_signal) { bool ClassDB::has_signal(StringName p_class, StringName p_signal) {
OBJTYPE_RLOCK; OBJTYPE_RLOCK;
ClassInfo *type = classes.getptr(p_class); ClassInfo *type = classes.getptr(p_class);
ClassInfo *check = type; ClassInfo *check = type;
@ -891,7 +817,6 @@ bool ClassDB::has_signal(StringName p_class, StringName p_signal) {
} }
bool ClassDB::get_signal(StringName p_class, StringName p_signal, MethodInfo *r_signal) { bool ClassDB::get_signal(StringName p_class, StringName p_signal, MethodInfo *r_signal) {
OBJTYPE_RLOCK; OBJTYPE_RLOCK;
ClassInfo *type = classes.getptr(p_class); ClassInfo *type = classes.getptr(p_class);
ClassInfo *check = type; ClassInfo *check = type;
@ -909,7 +834,6 @@ bool ClassDB::get_signal(StringName p_class, StringName p_signal, MethodInfo *r_
} }
void ClassDB::add_property_group(StringName p_class, const String &p_name, const String &p_prefix) { void ClassDB::add_property_group(StringName p_class, const String &p_name, const String &p_prefix) {
OBJTYPE_WLOCK; OBJTYPE_WLOCK;
ClassInfo *type = classes.getptr(p_class); ClassInfo *type = classes.getptr(p_class);
ERR_FAIL_COND(!type); ERR_FAIL_COND(!type);
@ -918,7 +842,6 @@ void ClassDB::add_property_group(StringName p_class, const String &p_name, const
} }
void ClassDB::add_property_subgroup(StringName p_class, const String &p_name, const String &p_prefix) { void ClassDB::add_property_subgroup(StringName p_class, const String &p_name, const String &p_prefix) {
OBJTYPE_WLOCK; OBJTYPE_WLOCK;
ClassInfo *type = classes.getptr(p_class); ClassInfo *type = classes.getptr(p_class);
ERR_FAIL_COND(!type); ERR_FAIL_COND(!type);
@ -927,7 +850,6 @@ void ClassDB::add_property_subgroup(StringName p_class, const String &p_name, co
} }
void ClassDB::add_property(StringName p_class, const PropertyInfo &p_pinfo, const StringName &p_setter, const StringName &p_getter, int p_index) { void ClassDB::add_property(StringName p_class, const PropertyInfo &p_pinfo, const StringName &p_setter, const StringName &p_getter, int p_index) {
lock->read_lock(); lock->read_lock();
ClassInfo *type = classes.getptr(p_class); ClassInfo *type = classes.getptr(p_class);
lock->read_unlock(); lock->read_unlock();
@ -948,7 +870,6 @@ void ClassDB::add_property(StringName p_class, const PropertyInfo &p_pinfo, cons
MethodBind *mb_get = nullptr; MethodBind *mb_get = nullptr;
if (p_getter) { if (p_getter) {
mb_get = get_method(p_class, p_getter); mb_get = get_method(p_class, p_getter);
#ifdef DEBUG_METHODS_ENABLED #ifdef DEBUG_METHODS_ENABLED
@ -993,15 +914,12 @@ void ClassDB::set_property_default_value(StringName p_class, const StringName &p
} }
void ClassDB::get_property_list(StringName p_class, List<PropertyInfo> *p_list, bool p_no_inheritance, const Object *p_validator) { void ClassDB::get_property_list(StringName p_class, List<PropertyInfo> *p_list, bool p_no_inheritance, const Object *p_validator) {
OBJTYPE_RLOCK; OBJTYPE_RLOCK;
ClassInfo *type = classes.getptr(p_class); ClassInfo *type = classes.getptr(p_class);
ClassInfo *check = type; ClassInfo *check = type;
while (check) { while (check) {
for (List<PropertyInfo>::Element *E = check->property_list.front(); E; E = E->next()) { for (List<PropertyInfo>::Element *E = check->property_list.front(); E; E = E->next()) {
if (p_validator) { if (p_validator) {
PropertyInfo pi = E->get(); PropertyInfo pi = E->get();
p_validator->_validate_property(pi); p_validator->_validate_property(pi);
@ -1017,13 +935,11 @@ void ClassDB::get_property_list(StringName p_class, List<PropertyInfo> *p_list,
} }
} }
bool ClassDB::set_property(Object *p_object, const StringName &p_property, const Variant &p_value, bool *r_valid) { bool ClassDB::set_property(Object *p_object, const StringName &p_property, const Variant &p_value, bool *r_valid) {
ClassInfo *type = classes.getptr(p_object->get_class_name()); ClassInfo *type = classes.getptr(p_object->get_class_name());
ClassInfo *check = type; ClassInfo *check = type;
while (check) { while (check) {
const PropertySetGet *psg = check->property_setget.getptr(p_property); const PropertySetGet *psg = check->property_setget.getptr(p_property);
if (psg) { if (psg) {
if (!psg->setter) { if (!psg->setter) {
if (r_valid) if (r_valid)
*r_valid = false; *r_valid = false;
@ -1063,7 +979,6 @@ bool ClassDB::set_property(Object *p_object, const StringName &p_property, const
return false; return false;
} }
bool ClassDB::get_property(Object *p_object, const StringName &p_property, Variant &r_value) { bool ClassDB::get_property(Object *p_object, const StringName &p_property, Variant &r_value) {
ClassInfo *type = classes.getptr(p_object->get_class_name()); ClassInfo *type = classes.getptr(p_object->get_class_name());
ClassInfo *check = type; ClassInfo *check = type;
while (check) { while (check) {
@ -1079,10 +994,8 @@ bool ClassDB::get_property(Object *p_object, const StringName &p_property, Varia
r_value = p_object->call(psg->getter, arg, 1, ce); r_value = p_object->call(psg->getter, arg, 1, ce);
} else { } else {
Callable::CallError ce; Callable::CallError ce;
if (psg->_getptr) { if (psg->_getptr) {
r_value = psg->_getptr->call(p_object, nullptr, 0, ce); r_value = psg->_getptr->call(p_object, nullptr, 0, ce);
} else { } else {
r_value = p_object->call(psg->getter, nullptr, 0, ce); r_value = p_object->call(psg->getter, nullptr, 0, ce);
@ -1093,7 +1006,6 @@ bool ClassDB::get_property(Object *p_object, const StringName &p_property, Varia
const int *c = check->constant_map.getptr(p_property); //constants count const int *c = check->constant_map.getptr(p_property); //constants count
if (c) { if (c) {
r_value = *c; r_value = *c;
return true; return true;
} }
@ -1115,13 +1027,11 @@ bool ClassDB::get_property(Object *p_object, const StringName &p_property, Varia
} }
int ClassDB::get_property_index(const StringName &p_class, const StringName &p_property, bool *r_is_valid) { int ClassDB::get_property_index(const StringName &p_class, const StringName &p_property, bool *r_is_valid) {
ClassInfo *type = classes.getptr(p_class); ClassInfo *type = classes.getptr(p_class);
ClassInfo *check = type; ClassInfo *check = type;
while (check) { while (check) {
const PropertySetGet *psg = check->property_setget.getptr(p_property); const PropertySetGet *psg = check->property_setget.getptr(p_property);
if (psg) { if (psg) {
if (r_is_valid) if (r_is_valid)
*r_is_valid = true; *r_is_valid = true;
@ -1137,13 +1047,11 @@ int ClassDB::get_property_index(const StringName &p_class, const StringName &p_p
} }
Variant::Type ClassDB::get_property_type(const StringName &p_class, const StringName &p_property, bool *r_is_valid) { Variant::Type ClassDB::get_property_type(const StringName &p_class, const StringName &p_property, bool *r_is_valid) {
ClassInfo *type = classes.getptr(p_class); ClassInfo *type = classes.getptr(p_class);
ClassInfo *check = type; ClassInfo *check = type;
while (check) { while (check) {
const PropertySetGet *psg = check->property_setget.getptr(p_property); const PropertySetGet *psg = check->property_setget.getptr(p_property);
if (psg) { if (psg) {
if (r_is_valid) if (r_is_valid)
*r_is_valid = true; *r_is_valid = true;
@ -1159,13 +1067,11 @@ Variant::Type ClassDB::get_property_type(const StringName &p_class, const String
} }
StringName ClassDB::get_property_setter(StringName p_class, const StringName &p_property) { StringName ClassDB::get_property_setter(StringName p_class, const StringName &p_property) {
ClassInfo *type = classes.getptr(p_class); ClassInfo *type = classes.getptr(p_class);
ClassInfo *check = type; ClassInfo *check = type;
while (check) { while (check) {
const PropertySetGet *psg = check->property_setget.getptr(p_property); const PropertySetGet *psg = check->property_setget.getptr(p_property);
if (psg) { if (psg) {
return psg->setter; return psg->setter;
} }
@ -1176,13 +1082,11 @@ StringName ClassDB::get_property_setter(StringName p_class, const StringName &p_
} }
StringName ClassDB::get_property_getter(StringName p_class, const StringName &p_property) { StringName ClassDB::get_property_getter(StringName p_class, const StringName &p_property) {
ClassInfo *type = classes.getptr(p_class); ClassInfo *type = classes.getptr(p_class);
ClassInfo *check = type; ClassInfo *check = type;
while (check) { while (check) {
const PropertySetGet *psg = check->property_setget.getptr(p_property); const PropertySetGet *psg = check->property_setget.getptr(p_property);
if (psg) { if (psg) {
return psg->getter; return psg->getter;
} }
@ -1193,7 +1097,6 @@ StringName ClassDB::get_property_getter(StringName p_class, const StringName &p_
} }
bool ClassDB::has_property(const StringName &p_class, const StringName &p_property, bool p_no_inheritance) { bool ClassDB::has_property(const StringName &p_class, const StringName &p_property, bool p_no_inheritance) {
ClassInfo *type = classes.getptr(p_class); ClassInfo *type = classes.getptr(p_class);
ClassInfo *check = type; ClassInfo *check = type;
while (check) { while (check) {
@ -1209,7 +1112,6 @@ bool ClassDB::has_property(const StringName &p_class, const StringName &p_proper
} }
void ClassDB::set_method_flags(StringName p_class, StringName p_method, int p_flags) { void ClassDB::set_method_flags(StringName p_class, StringName p_method, int p_flags) {
OBJTYPE_WLOCK; OBJTYPE_WLOCK;
ClassInfo *type = classes.getptr(p_class); ClassInfo *type = classes.getptr(p_class);
ClassInfo *check = type; ClassInfo *check = type;
@ -1219,7 +1121,6 @@ void ClassDB::set_method_flags(StringName p_class, StringName p_method, int p_fl
} }
bool ClassDB::has_method(StringName p_class, StringName p_method, bool p_no_inheritance) { bool ClassDB::has_method(StringName p_class, StringName p_method, bool p_no_inheritance) {
ClassInfo *type = classes.getptr(p_class); ClassInfo *type = classes.getptr(p_class);
ClassInfo *check = type; ClassInfo *check = type;
while (check) { while (check) {
@ -1282,7 +1183,6 @@ MethodBind *ClassDB::bind_methodfi(uint32_t p_flags, MethodBind *p_bind, const c
defvals.resize(p_defcount); defvals.resize(p_defcount);
for (int i = 0; i < p_defcount; i++) { for (int i = 0; i < p_defcount; i++) {
defvals.write[i] = *p_defs[p_defcount - i - 1]; defvals.write[i] = *p_defs[p_defcount - i - 1];
} }
@ -1306,7 +1206,6 @@ void ClassDB::add_virtual_method(const StringName &p_class, const MethodInfo &p_
} }
void ClassDB::get_virtual_methods(const StringName &p_class, List<MethodInfo> *p_methods, bool p_no_inheritance) { void ClassDB::get_virtual_methods(const StringName &p_class, List<MethodInfo> *p_methods, bool p_no_inheritance) {
ERR_FAIL_COND_MSG(!classes.has(p_class), "Request for nonexistent class '" + p_class + "'."); ERR_FAIL_COND_MSG(!classes.has(p_class), "Request for nonexistent class '" + p_class + "'.");
#ifdef DEBUG_METHODS_ENABLED #ifdef DEBUG_METHODS_ENABLED
@ -1314,7 +1213,6 @@ void ClassDB::get_virtual_methods(const StringName &p_class, List<MethodInfo> *p
ClassInfo *type = classes.getptr(p_class); ClassInfo *type = classes.getptr(p_class);
ClassInfo *check = type; ClassInfo *check = type;
while (check) { while (check) {
for (List<MethodInfo>::Element *E = check->virtual_methods.front(); E; E = E->next()) { for (List<MethodInfo>::Element *E = check->virtual_methods.front(); E; E = E->next()) {
p_methods->push_back(E->get()); p_methods->push_back(E->get());
} }
@ -1328,7 +1226,6 @@ void ClassDB::get_virtual_methods(const StringName &p_class, List<MethodInfo> *p
} }
void ClassDB::set_class_enabled(StringName p_class, bool p_enable) { void ClassDB::set_class_enabled(StringName p_class, bool p_enable) {
OBJTYPE_WLOCK; OBJTYPE_WLOCK;
ERR_FAIL_COND_MSG(!classes.has(p_class), "Request for nonexistent class '" + p_class + "'."); ERR_FAIL_COND_MSG(!classes.has(p_class), "Request for nonexistent class '" + p_class + "'.");
@ -1336,7 +1233,6 @@ void ClassDB::set_class_enabled(StringName p_class, bool p_enable) {
} }
bool ClassDB::is_class_enabled(StringName p_class) { bool ClassDB::is_class_enabled(StringName p_class) {
OBJTYPE_RLOCK; OBJTYPE_RLOCK;
ClassInfo *ti = classes.getptr(p_class); ClassInfo *ti = classes.getptr(p_class);
@ -1351,7 +1247,6 @@ bool ClassDB::is_class_enabled(StringName p_class) {
} }
bool ClassDB::is_class_exposed(StringName p_class) { bool ClassDB::is_class_exposed(StringName p_class) {
OBJTYPE_RLOCK; OBJTYPE_RLOCK;
ClassInfo *ti = classes.getptr(p_class); ClassInfo *ti = classes.getptr(p_class);
@ -1360,7 +1255,6 @@ bool ClassDB::is_class_exposed(StringName p_class) {
} }
StringName ClassDB::get_category(const StringName &p_node) { StringName ClassDB::get_category(const StringName &p_node) {
ERR_FAIL_COND_V(!classes.has(p_node), StringName()); ERR_FAIL_COND_V(!classes.has(p_node), StringName());
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
return classes[p_node].category; return classes[p_node].category;
@ -1370,7 +1264,6 @@ StringName ClassDB::get_category(const StringName &p_node) {
} }
void ClassDB::add_resource_base_extension(const StringName &p_extension, const StringName &p_class) { void ClassDB::add_resource_base_extension(const StringName &p_extension, const StringName &p_class) {
if (resource_base_extensions.has(p_extension)) if (resource_base_extensions.has(p_extension))
return; return;
@ -1378,17 +1271,14 @@ void ClassDB::add_resource_base_extension(const StringName &p_extension, const S
} }
void ClassDB::get_resource_base_extensions(List<String> *p_extensions) { void ClassDB::get_resource_base_extensions(List<String> *p_extensions) {
const StringName *K = nullptr; const StringName *K = nullptr;
while ((K = resource_base_extensions.next(K))) { while ((K = resource_base_extensions.next(K))) {
p_extensions->push_back(*K); p_extensions->push_back(*K);
} }
} }
void ClassDB::get_extensions_for_type(const StringName &p_class, List<String> *p_extensions) { void ClassDB::get_extensions_for_type(const StringName &p_class, List<String> *p_extensions) {
const StringName *K = nullptr; const StringName *K = nullptr;
while ((K = resource_base_extensions.next(K))) { while ((K = resource_base_extensions.next(K))) {
@ -1402,9 +1292,7 @@ HashMap<StringName, HashMap<StringName, Variant>> ClassDB::default_values;
Set<StringName> ClassDB::default_values_cached; Set<StringName> ClassDB::default_values_cached;
Variant ClassDB::class_get_default_property_value(const StringName &p_class, const StringName &p_property, bool *r_valid) { Variant ClassDB::class_get_default_property_value(const StringName &p_class, const StringName &p_property, bool *r_valid) {
if (!default_values_cached.has(p_class)) { if (!default_values_cached.has(p_class)) {
if (!default_values.has(p_class)) { if (!default_values.has(p_class)) {
default_values[p_class] = HashMap<StringName, Variant>(); default_values[p_class] = HashMap<StringName, Variant>();
} }
@ -1421,12 +1309,10 @@ Variant ClassDB::class_get_default_property_value(const StringName &p_class, con
} }
if (c) { if (c) {
List<PropertyInfo> plist; List<PropertyInfo> plist;
c->get_property_list(&plist); c->get_property_list(&plist);
for (List<PropertyInfo>::Element *E = plist.front(); E; E = E->next()) { for (List<PropertyInfo>::Element *E = plist.front(); E; E = E->next()) {
if (E->get().usage & (PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_EDITOR)) { if (E->get().usage & (PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_EDITOR)) {
if (!default_values[p_class].has(E->get().name)) { if (!default_values[p_class].has(E->get().name)) {
Variant v = c->get(E->get().name); Variant v = c->get(E->get().name);
default_values[p_class][E->get().name] = v; default_values[p_class][E->get().name] = v;
@ -1462,29 +1348,24 @@ Variant ClassDB::class_get_default_property_value(const StringName &p_class, con
RWLock *ClassDB::lock = nullptr; RWLock *ClassDB::lock = nullptr;
void ClassDB::init() { void ClassDB::init() {
lock = RWLock::create(); lock = RWLock::create();
} }
void ClassDB::cleanup_defaults() { void ClassDB::cleanup_defaults() {
default_values.clear(); default_values.clear();
default_values_cached.clear(); default_values_cached.clear();
} }
void ClassDB::cleanup() { void ClassDB::cleanup() {
//OBJTYPE_LOCK; hah not here //OBJTYPE_LOCK; hah not here
const StringName *k = nullptr; const StringName *k = nullptr;
while ((k = classes.next(k))) { while ((k = classes.next(k))) {
ClassInfo &ti = classes[*k]; ClassInfo &ti = classes[*k];
const StringName *m = nullptr; const StringName *m = nullptr;
while ((m = ti.method_map.next(m))) { while ((m = ti.method_map.next(m))) {
memdelete(ti.method_map[*m]); memdelete(ti.method_map[*m]);
} }
} }

18
core/class_db.h
View file

@ -48,7 +48,6 @@
#ifdef DEBUG_METHODS_ENABLED #ifdef DEBUG_METHODS_ENABLED
struct MethodDefinition { struct MethodDefinition {
StringName name; StringName name;
Vector<StringName> args; Vector<StringName> args;
MethodDefinition() {} MethodDefinition() {}
@ -103,7 +102,6 @@ public:
public: public:
struct PropertySetGet { struct PropertySetGet {
int index; int index;
StringName setter; StringName setter;
StringName getter; StringName getter;
@ -113,7 +111,6 @@ public:
}; };
struct ClassInfo { struct ClassInfo {
APIType api = API_NONE; APIType api = API_NONE;
ClassInfo *inherits_ptr = nullptr; ClassInfo *inherits_ptr = nullptr;
void *class_ptr = nullptr; void *class_ptr = nullptr;
@ -169,13 +166,11 @@ public:
// DO NOT USE THIS!!!!!! NEEDS TO BE PUBLIC BUT DO NOT USE NO MATTER WHAT!!! // DO NOT USE THIS!!!!!! NEEDS TO BE PUBLIC BUT DO NOT USE NO MATTER WHAT!!!
template <class T> template <class T>
static void _add_class() { static void _add_class() {
_add_class2(T::get_class_static(), T::get_parent_class_static()); _add_class2(T::get_class_static(), T::get_parent_class_static());
} }
template <class T> template <class T>
static void register_class() { static void register_class() {
GLOBAL_LOCK_FUNCTION; GLOBAL_LOCK_FUNCTION;
T::initialize_class(); T::initialize_class();
ClassInfo *t = classes.getptr(T::get_class_static()); ClassInfo *t = classes.getptr(T::get_class_static());
@ -188,7 +183,6 @@ public:
template <class T> template <class T>
static void register_virtual_class() { static void register_virtual_class() {
GLOBAL_LOCK_FUNCTION; GLOBAL_LOCK_FUNCTION;
T::initialize_class(); T::initialize_class();
ClassInfo *t = classes.getptr(T::get_class_static()); ClassInfo *t = classes.getptr(T::get_class_static());
@ -200,13 +194,11 @@ public:
template <class T> template <class T>
static Object *_create_ptr_func() { static Object *_create_ptr_func() {
return T::create(); return T::create();
} }
template <class T> template <class T>
static void register_custom_instance_class() { static void register_custom_instance_class() {
GLOBAL_LOCK_FUNCTION; GLOBAL_LOCK_FUNCTION;
T::initialize_class(); T::initialize_class();
ClassInfo *t = classes.getptr(T::get_class_static()); ClassInfo *t = classes.getptr(T::get_class_static());
@ -233,7 +225,6 @@ public:
template <class N, class M> template <class N, class M>
static MethodBind *bind_method(N p_method_name, M p_method) { static MethodBind *bind_method(N p_method_name, M p_method) {
MethodBind *bind = create_method_bind(p_method); MethodBind *bind = create_method_bind(p_method);
return bind_methodfi(METHOD_FLAGS_DEFAULT, bind, p_method_name, nullptr, 0); //use static function, much smaller binary usage return bind_methodfi(METHOD_FLAGS_DEFAULT, bind, p_method_name, nullptr, 0); //use static function, much smaller binary usage
@ -241,7 +232,6 @@ public:
template <class N, class M> template <class N, class M>
static MethodBind *bind_method(N p_method_name, M p_method, const Variant &p_def1) { static MethodBind *bind_method(N p_method_name, M p_method, const Variant &p_def1) {
MethodBind *bind = create_method_bind(p_method); MethodBind *bind = create_method_bind(p_method);
const Variant *ptr[1] = { &p_def1 }; const Variant *ptr[1] = { &p_def1 };
@ -250,7 +240,6 @@ public:
template <class N, class M> template <class N, class M>
static MethodBind *bind_method(N p_method_name, M p_method, const Variant &p_def1, const Variant &p_def2) { static MethodBind *bind_method(N p_method_name, M p_method, const Variant &p_def1, const Variant &p_def2) {
MethodBind *bind = create_method_bind(p_method); MethodBind *bind = create_method_bind(p_method);
const Variant *ptr[2] = { &p_def1, &p_def2 }; const Variant *ptr[2] = { &p_def1, &p_def2 };
@ -259,7 +248,6 @@ public:
template <class N, class M> template <class N, class M>
static MethodBind *bind_method(N p_method_name, M p_method, const Variant &p_def1, const Variant &p_def2, const Variant &p_def3) { static MethodBind *bind_method(N p_method_name, M p_method, const Variant &p_def1, const Variant &p_def2, const Variant &p_def3) {
MethodBind *bind = create_method_bind(p_method); MethodBind *bind = create_method_bind(p_method);
const Variant *ptr[3] = { &p_def1, &p_def2, &p_def3 }; const Variant *ptr[3] = { &p_def1, &p_def2, &p_def3 };
@ -268,7 +256,6 @@ public:
template <class N, class M> template <class N, class M>
static MethodBind *bind_method(N p_method_name, M p_method, const Variant &p_def1, const Variant &p_def2, const Variant &p_def3, const Variant &p_def4) { static MethodBind *bind_method(N p_method_name, M p_method, const Variant &p_def1, const Variant &p_def2, const Variant &p_def3, const Variant &p_def4) {
MethodBind *bind = create_method_bind(p_method); MethodBind *bind = create_method_bind(p_method);
const Variant *ptr[4] = { &p_def1, &p_def2, &p_def3, &p_def4 }; const Variant *ptr[4] = { &p_def1, &p_def2, &p_def3, &p_def4 };
@ -277,7 +264,6 @@ public:
template <class N, class M> template <class N, class M>
static MethodBind *bind_method(N p_method_name, M p_method, const Variant &p_def1, const Variant &p_def2, const Variant &p_def3, const Variant &p_def4, const Variant &p_def5) { static MethodBind *bind_method(N p_method_name, M p_method, const Variant &p_def1, const Variant &p_def2, const Variant &p_def3, const Variant &p_def4, const Variant &p_def5) {
MethodBind *bind = create_method_bind(p_method); MethodBind *bind = create_method_bind(p_method);
const Variant *ptr[5] = { &p_def1, &p_def2, &p_def3, &p_def4, &p_def5 }; const Variant *ptr[5] = { &p_def1, &p_def2, &p_def3, &p_def4, &p_def5 };
@ -286,7 +272,6 @@ public:
template <class N, class M> template <class N, class M>
static MethodBind *bind_method(N p_method_name, M p_method, const Variant &p_def1, const Variant &p_def2, const Variant &p_def3, const Variant &p_def4, const Variant &p_def5, const Variant &p_def6) { static MethodBind *bind_method(N p_method_name, M p_method, const Variant &p_def1, const Variant &p_def2, const Variant &p_def3, const Variant &p_def4, const Variant &p_def5, const Variant &p_def6) {
MethodBind *bind = create_method_bind(p_method); MethodBind *bind = create_method_bind(p_method);
const Variant *ptr[6] = { &p_def1, &p_def2, &p_def3, &p_def4, &p_def5, &p_def6 }; const Variant *ptr[6] = { &p_def1, &p_def2, &p_def3, &p_def4, &p_def5, &p_def6 };
@ -295,7 +280,6 @@ public:
template <class N, class M> template <class N, class M>
static MethodBind *bind_method(N p_method_name, M p_method, const Variant &p_def1, const Variant &p_def2, const Variant &p_def3, const Variant &p_def4, const Variant &p_def5, const Variant &p_def6, const Variant &p_def7) { static MethodBind *bind_method(N p_method_name, M p_method, const Variant &p_def1, const Variant &p_def2, const Variant &p_def3, const Variant &p_def4, const Variant &p_def5, const Variant &p_def6, const Variant &p_def7) {
MethodBind *bind = create_method_bind(p_method); MethodBind *bind = create_method_bind(p_method);
const Variant *ptr[7] = { &p_def1, &p_def2, &p_def3, &p_def4, &p_def5, &p_def6, &p_def7 }; const Variant *ptr[7] = { &p_def1, &p_def2, &p_def3, &p_def4, &p_def5, &p_def6, &p_def7 };
@ -304,7 +288,6 @@ public:
template <class N, class M> template <class N, class M>
static MethodBind *bind_method(N p_method_name, M p_method, const Variant &p_def1, const Variant &p_def2, const Variant &p_def3, const Variant &p_def4, const Variant &p_def5, const Variant &p_def6, const Variant &p_def7, const Variant &p_def8) { static MethodBind *bind_method(N p_method_name, M p_method, const Variant &p_def1, const Variant &p_def2, const Variant &p_def3, const Variant &p_def4, const Variant &p_def5, const Variant &p_def6, const Variant &p_def7, const Variant &p_def8) {
MethodBind *bind = create_method_bind(p_method); MethodBind *bind = create_method_bind(p_method);
const Variant *ptr[8] = { &p_def1, &p_def2, &p_def3, &p_def4, &p_def5, &p_def6, &p_def7, &p_def8 }; const Variant *ptr[8] = { &p_def1, &p_def2, &p_def3, &p_def4, &p_def5, &p_def6, &p_def7, &p_def8 };
@ -313,7 +296,6 @@ public:
template <class M> template <class M>
static MethodBind *bind_vararg_method(uint32_t p_flags, StringName p_name, M p_method, const MethodInfo &p_info = MethodInfo(), const Vector<Variant> &p_default_args = Vector<Variant>(), bool p_return_nil_is_variant = true) { static MethodBind *bind_vararg_method(uint32_t p_flags, StringName p_name, M p_method, const MethodInfo &p_info = MethodInfo(), const Vector<Variant> &p_default_args = Vector<Variant>(), bool p_return_nil_is_variant = true) {
GLOBAL_LOCK_FUNCTION; GLOBAL_LOCK_FUNCTION;
MethodBind *bind = create_vararg_method_bind(p_method, p_info, p_return_nil_is_variant); MethodBind *bind = create_vararg_method_bind(p_method, p_info, p_return_nil_is_variant);

39
core/color.cpp
View file

@ -36,7 +36,6 @@
#include "core/print_string.h" #include "core/print_string.h"
uint32_t Color::to_argb32() const { uint32_t Color::to_argb32() const {
uint32_t c = (uint8_t)Math::round(a * 255); uint32_t c = (uint8_t)Math::round(a * 255);
c <<= 8; c <<= 8;
c |= (uint8_t)Math::round(r * 255); c |= (uint8_t)Math::round(r * 255);
@ -49,7 +48,6 @@ uint32_t Color::to_argb32() const {
} }
uint32_t Color::to_abgr32() const { uint32_t Color::to_abgr32() const {
uint32_t c = (uint8_t)Math::round(a * 255); uint32_t c = (uint8_t)Math::round(a * 255);
c <<= 8; c <<= 8;
c |= (uint8_t)Math::round(b * 255); c |= (uint8_t)Math::round(b * 255);
@ -62,7 +60,6 @@ uint32_t Color::to_abgr32() const {
} }
uint32_t Color::to_rgba32() const { uint32_t Color::to_rgba32() const {
uint32_t c = (uint8_t)Math::round(r * 255); uint32_t c = (uint8_t)Math::round(r * 255);
c <<= 8; c <<= 8;
c |= (uint8_t)Math::round(g * 255); c |= (uint8_t)Math::round(g * 255);
@ -75,7 +72,6 @@ uint32_t Color::to_rgba32() const {
} }
uint64_t Color::to_abgr64() const { uint64_t Color::to_abgr64() const {
uint64_t c = (uint16_t)Math::round(a * 65535); uint64_t c = (uint16_t)Math::round(a * 65535);
c <<= 16; c <<= 16;
c |= (uint16_t)Math::round(b * 65535); c |= (uint16_t)Math::round(b * 65535);
@ -88,7 +84,6 @@ uint64_t Color::to_abgr64() const {
} }
uint64_t Color::to_argb64() const { uint64_t Color::to_argb64() const {
uint64_t c = (uint16_t)Math::round(a * 65535); uint64_t c = (uint16_t)Math::round(a * 65535);
c <<= 16; c <<= 16;
c |= (uint16_t)Math::round(r * 65535); c |= (uint16_t)Math::round(r * 65535);
@ -101,7 +96,6 @@ uint64_t Color::to_argb64() const {
} }
uint64_t Color::to_rgba64() const { uint64_t Color::to_rgba64() const {
uint64_t c = (uint16_t)Math::round(r * 65535); uint64_t c = (uint16_t)Math::round(r * 65535);
c <<= 16; c <<= 16;
c |= (uint16_t)Math::round(g * 65535); c |= (uint16_t)Math::round(g * 65535);
@ -114,7 +108,6 @@ uint64_t Color::to_rgba64() const {
} }
float Color::get_h() const { float Color::get_h() const {
float min = MIN(r, g); float min = MIN(r, g);
min = MIN(min, b); min = MIN(min, b);
float max = MAX(r, g); float max = MAX(r, g);
@ -141,7 +134,6 @@ float Color::get_h() const {
} }
float Color::get_s() const { float Color::get_s() const {
float min = MIN(r, g); float min = MIN(r, g);
min = MIN(min, b); min = MIN(min, b);
float max = MAX(r, g); float max = MAX(r, g);
@ -153,14 +145,12 @@ float Color::get_s() const {
} }
float Color::get_v() const { float Color::get_v() const {
float max = MAX(r, g); float max = MAX(r, g);
max = MAX(max, b); max = MAX(max, b);
return max; return max;
} }
void Color::set_hsv(float p_h, float p_s, float p_v, float p_alpha) { void Color::set_hsv(float p_h, float p_s, float p_v, float p_alpha) {
int i; int i;
float f, p, q, t; float f, p, q, t;
a = p_alpha; a = p_alpha;
@ -215,25 +205,21 @@ void Color::set_hsv(float p_h, float p_s, float p_v, float p_alpha) {
} }
bool Color::is_equal_approx(const Color &p_color) const { bool Color::is_equal_approx(const Color &p_color) const {
return Math::is_equal_approx(r, p_color.r) && Math::is_equal_approx(g, p_color.g) && Math::is_equal_approx(b, p_color.b) && Math::is_equal_approx(a, p_color.a); return Math::is_equal_approx(r, p_color.r) && Math::is_equal_approx(g, p_color.g) && Math::is_equal_approx(b, p_color.b) && Math::is_equal_approx(a, p_color.a);
} }
void Color::invert() { void Color::invert() {
r = 1.0 - r; r = 1.0 - r;
g = 1.0 - g; g = 1.0 - g;
b = 1.0 - b; b = 1.0 - b;
} }
void Color::contrast() { void Color::contrast() {
r = Math::fmod(r + 0.5, 1.0); r = Math::fmod(r + 0.5, 1.0);
g = Math::fmod(g + 0.5, 1.0); g = Math::fmod(g + 0.5, 1.0);
b = Math::fmod(b + 0.5, 1.0); b = Math::fmod(b + 0.5, 1.0);
} }
Color Color::hex(uint32_t p_hex) { Color Color::hex(uint32_t p_hex) {
float a = (p_hex & 0xFF) / 255.0; float a = (p_hex & 0xFF) / 255.0;
p_hex >>= 8; p_hex >>= 8;
float b = (p_hex & 0xFF) / 255.0; float b = (p_hex & 0xFF) / 255.0;
@ -246,7 +232,6 @@ Color Color::hex(uint32_t p_hex) {
} }
Color Color::hex64(uint64_t p_hex) { Color Color::hex64(uint64_t p_hex) {
float a = (p_hex & 0xFFFF) / 65535.0; float a = (p_hex & 0xFFFF) / 65535.0;
p_hex >>= 16; p_hex >>= 16;
float b = (p_hex & 0xFFFF) / 65535.0; float b = (p_hex & 0xFFFF) / 65535.0;
@ -259,7 +244,6 @@ Color Color::hex64(uint64_t p_hex) {
} }
Color Color::from_rgbe9995(uint32_t p_rgbe) { Color Color::from_rgbe9995(uint32_t p_rgbe) {
float r = p_rgbe & 0x1ff; float r = p_rgbe & 0x1ff;
float g = (p_rgbe >> 9) & 0x1ff; float g = (p_rgbe >> 9) & 0x1ff;
float b = (p_rgbe >> 18) & 0x1ff; float b = (p_rgbe >> 18) & 0x1ff;
@ -274,11 +258,9 @@ Color Color::from_rgbe9995(uint32_t p_rgbe) {
} }
static float _parse_col(const String &p_str, int p_ofs) { static float _parse_col(const String &p_str, int p_ofs) {
int ig = 0; int ig = 0;
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
int c = p_str[i + p_ofs]; int c = p_str[i + p_ofs];
int v = 0; int v = 0;
@ -304,21 +286,18 @@ static float _parse_col(const String &p_str, int p_ofs) {
} }
Color Color::inverted() const { Color Color::inverted() const {
Color c = *this; Color c = *this;
c.invert(); c.invert();
return c; return c;
} }
Color Color::contrasted() const { Color Color::contrasted() const {
Color c = *this; Color c = *this;
c.contrast(); c.contrast();
return c; return c;
} }
Color Color::html(const String &p_color) { Color Color::html(const String &p_color) {
String color = p_color; String color = p_color;
if (color.length() == 0) if (color.length() == 0)
return Color(); return Color();
@ -362,7 +341,6 @@ Color Color::html(const String &p_color) {
} }
bool Color::html_is_valid(const String &p_color) { bool Color::html_is_valid(const String &p_color) {
String color = p_color; String color = p_color;
if (color.length() == 0) if (color.length() == 0)
@ -423,13 +401,11 @@ Color Color::named(const String &p_name) {
} }
String _to_hex(float p_val) { String _to_hex(float p_val) {
int v = Math::round(p_val * 255); int v = Math::round(p_val * 255);
v = CLAMP(v, 0, 255); v = CLAMP(v, 0, 255);
String ret; String ret;
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
CharType c[2] = { 0, 0 }; CharType c[2] = { 0, 0 };
int lv = v & 0xF; int lv = v & 0xF;
if (lv < 10) if (lv < 10)
@ -446,7 +422,6 @@ String _to_hex(float p_val) {
} }
String Color::to_html(bool p_alpha) const { String Color::to_html(bool p_alpha) const {
String txt; String txt;
txt += _to_hex(r); txt += _to_hex(r);
txt += _to_hex(g); txt += _to_hex(g);
@ -457,7 +432,6 @@ String Color::to_html(bool p_alpha) const {
} }
Color Color::from_hsv(float p_h, float p_s, float p_v, float p_a) const { Color Color::from_hsv(float p_h, float p_s, float p_v, float p_a) const {
p_h = Math::fmod(p_h * 360.0f, 360.0f); p_h = Math::fmod(p_h * 360.0f, 360.0f);
if (p_h < 0.0) if (p_h < 0.0)
p_h += 360.0f; p_h += 360.0f;
@ -510,12 +484,10 @@ Color Color::from_hsv(float p_h, float p_s, float p_v, float p_a) const {
} }
Color::operator String() const { Color::operator String() const {
return rtos(r) + ", " + rtos(g) + ", " + rtos(b) + ", " + rtos(a); return rtos(r) + ", " + rtos(g) + ", " + rtos(b) + ", " + rtos(a);
} }
Color Color::operator+(const Color &p_color) const { Color Color::operator+(const Color &p_color) const {
return Color( return Color(
r + p_color.r, r + p_color.r,
g + p_color.g, g + p_color.g,
@ -524,7 +496,6 @@ Color Color::operator+(const Color &p_color) const {
} }
Color Color::operator-(const Color &p_color) const { Color Color::operator-(const Color &p_color) const {
return Color( return Color(
r - p_color.r, r - p_color.r,
g - p_color.g, g - p_color.g,
@ -533,7 +504,6 @@ Color Color::operator-(const Color &p_color) const {
} }
void Color::operator-=(const Color &p_color) { void Color::operator-=(const Color &p_color) {
r = r - p_color.r; r = r - p_color.r;
g = g - p_color.g; g = g - p_color.g;
b = b - p_color.b; b = b - p_color.b;
@ -541,7 +511,6 @@ void Color::operator-=(const Color &p_color) {
} }
Color Color::operator*(const Color &p_color) const { Color Color::operator*(const Color &p_color) const {
return Color( return Color(
r * p_color.r, r * p_color.r,
g * p_color.g, g * p_color.g,
@ -550,7 +519,6 @@ Color Color::operator*(const Color &p_color) const {
} }
Color Color::operator*(const real_t &rvalue) const { Color Color::operator*(const real_t &rvalue) const {
return Color( return Color(
r * rvalue, r * rvalue,
g * rvalue, g * rvalue,
@ -559,7 +527,6 @@ Color Color::operator*(const real_t &rvalue) const {
} }
void Color::operator*=(const Color &p_color) { void Color::operator*=(const Color &p_color) {
r = r * p_color.r; r = r * p_color.r;
g = g * p_color.g; g = g * p_color.g;
b = b * p_color.b; b = b * p_color.b;
@ -567,7 +534,6 @@ void Color::operator*=(const Color &p_color) {
} }
void Color::operator*=(const real_t &rvalue) { void Color::operator*=(const real_t &rvalue) {
r = r * rvalue; r = r * rvalue;
g = g * rvalue; g = g * rvalue;
b = b * rvalue; b = b * rvalue;
@ -575,7 +541,6 @@ void Color::operator*=(const real_t &rvalue) {
} }
Color Color::operator/(const Color &p_color) const { Color Color::operator/(const Color &p_color) const {
return Color( return Color(
r / p_color.r, r / p_color.r,
g / p_color.g, g / p_color.g,
@ -584,7 +549,6 @@ Color Color::operator/(const Color &p_color) const {
} }
Color Color::operator/(const real_t &rvalue) const { Color Color::operator/(const real_t &rvalue) const {
return Color( return Color(
r / rvalue, r / rvalue,
g / rvalue, g / rvalue,
@ -593,7 +557,6 @@ Color Color::operator/(const real_t &rvalue) const {
} }
void Color::operator/=(const Color &p_color) { void Color::operator/=(const Color &p_color) {
r = r / p_color.r; r = r / p_color.r;
g = g / p_color.g; g = g / p_color.g;
b = b / p_color.b; b = b / p_color.b;
@ -601,7 +564,6 @@ void Color::operator/=(const Color &p_color) {
} }
void Color::operator/=(const real_t &rvalue) { void Color::operator/=(const real_t &rvalue) {
if (rvalue == 0) { if (rvalue == 0) {
r = 1.0; r = 1.0;
g = 1.0; g = 1.0;
@ -616,7 +578,6 @@ void Color::operator/=(const real_t &rvalue) {
}; };
Color Color::operator-() const { Color Color::operator-() const {
return Color( return Color(
1.0 - r, 1.0 - r,
1.0 - g, 1.0 - g,

10
core/color.h
View file

@ -35,9 +35,7 @@
#include "core/ustring.h" #include "core/ustring.h"
struct Color { struct Color {
union { union {
struct { struct {
float r; float r;
float g; float g;
@ -98,7 +96,6 @@ struct Color {
Color contrasted() const; Color contrasted() const;
_FORCE_INLINE_ Color lerp(const Color &p_b, float p_t) const { _FORCE_INLINE_ Color lerp(const Color &p_b, float p_t) const {
Color res = *this; Color res = *this;
res.r += (p_t * (p_b.r - r)); res.r += (p_t * (p_b.r - r));
@ -110,7 +107,6 @@ struct Color {
} }
_FORCE_INLINE_ Color darkened(float p_amount) const { _FORCE_INLINE_ Color darkened(float p_amount) const {
Color res = *this; Color res = *this;
res.r = res.r * (1.0f - p_amount); res.r = res.r * (1.0f - p_amount);
res.g = res.g * (1.0f - p_amount); res.g = res.g * (1.0f - p_amount);
@ -119,7 +115,6 @@ struct Color {
} }
_FORCE_INLINE_ Color lightened(float p_amount) const { _FORCE_INLINE_ Color lightened(float p_amount) const {
Color res = *this; Color res = *this;
res.r = res.r + (1.0f - res.r) * p_amount; res.r = res.r + (1.0f - res.r) * p_amount;
res.g = res.g + (1.0f - res.g) * p_amount; res.g = res.g + (1.0f - res.g) * p_amount;
@ -128,7 +123,6 @@ struct Color {
} }
_FORCE_INLINE_ uint32_t to_rgbe9995() const { _FORCE_INLINE_ uint32_t to_rgbe9995() const {
const float pow2to9 = 512.0f; const float pow2to9 = 512.0f;
const float B = 15.0f; const float B = 15.0f;
//const float Emax = 31.0f; //const float Emax = 31.0f;
@ -162,7 +156,6 @@ struct Color {
} }
_FORCE_INLINE_ Color blend(const Color &p_over) const { _FORCE_INLINE_ Color blend(const Color &p_over) const {
Color res; Color res;
float sa = 1.0 - p_over.a; float sa = 1.0 - p_over.a;
res.a = a * sa + p_over.a; res.a = a * sa + p_over.a;
@ -177,7 +170,6 @@ struct Color {
} }
_FORCE_INLINE_ Color to_linear() const { _FORCE_INLINE_ Color to_linear() const {
return Color( return Color(
r < 0.04045 ? r * (1.0 / 12.92) : Math::pow((r + 0.055) * (1.0 / (1 + 0.055)), 2.4), r < 0.04045 ? r * (1.0 / 12.92) : Math::pow((r + 0.055) * (1.0 / (1 + 0.055)), 2.4),
g < 0.04045 ? g * (1.0 / 12.92) : Math::pow((g + 0.055) * (1.0 / (1 + 0.055)), 2.4), g < 0.04045 ? g * (1.0 / 12.92) : Math::pow((g + 0.055) * (1.0 / (1 + 0.055)), 2.4),
@ -185,7 +177,6 @@ struct Color {
a); a);
} }
_FORCE_INLINE_ Color to_srgb() const { _FORCE_INLINE_ Color to_srgb() const {
return Color( return Color(
r < 0.0031308 ? 12.92 * r : (1.0 + 0.055) * Math::pow(r, 1.0f / 2.4f) - 0.055, r < 0.0031308 ? 12.92 * r : (1.0 + 0.055) * Math::pow(r, 1.0f / 2.4f) - 0.055,
g < 0.0031308 ? 12.92 * g : (1.0 + 0.055) * Math::pow(g, 1.0f / 2.4f) - 0.055, g < 0.0031308 ? 12.92 * g : (1.0 + 0.055) * Math::pow(g, 1.0f / 2.4f) - 0.055,
@ -228,7 +219,6 @@ struct Color {
}; };
bool Color::operator<(const Color &p_color) const { bool Color::operator<(const Color &p_color) const {
if (r == p_color.r) { if (r == p_color.r) {
if (g == p_color.g) { if (g == p_color.g) {
if (b == p_color.b) { if (b == p_color.b) {

6
core/command_queue_mt.cpp
View file

@ -33,30 +33,24 @@
#include "core/os/os.h" #include "core/os/os.h"
void CommandQueueMT::lock() { void CommandQueueMT::lock() {
mutex.lock(); mutex.lock();
} }
void CommandQueueMT::unlock() { void CommandQueueMT::unlock() {
mutex.unlock(); mutex.unlock();
} }
void CommandQueueMT::wait_for_flush() { void CommandQueueMT::wait_for_flush() {
// wait one millisecond for a flush to happen // wait one millisecond for a flush to happen
OS::get_singleton()->delay_usec(1000); OS::get_singleton()->delay_usec(1000);
} }
CommandQueueMT::SyncSemaphore *CommandQueueMT::_alloc_sync_sem() { CommandQueueMT::SyncSemaphore *CommandQueueMT::_alloc_sync_sem() {
int idx = -1; int idx = -1;
while (true) { while (true) {
lock(); lock();
for (int i = 0; i < SYNC_SEMAPHORES; i++) { for (int i = 0; i < SYNC_SEMAPHORES; i++) {
if (!sync_sems[i].in_use) { if (!sync_sems[i].in_use) {
sync_sems[i].in_use = true; sync_sems[i].in_use = true;
idx = i; idx = i;

9
core/command_queue_mt.h
View file

@ -297,22 +297,18 @@
#define MAX_CMD_PARAMS 15 #define MAX_CMD_PARAMS 15
class CommandQueueMT { class CommandQueueMT {
struct SyncSemaphore { struct SyncSemaphore {
Semaphore sem; Semaphore sem;
bool in_use = false; bool in_use = false;
}; };
struct CommandBase { struct CommandBase {
virtual void call() = 0; virtual void call() = 0;
virtual void post() {} virtual void post() {}
virtual ~CommandBase() {} virtual ~CommandBase() {}
}; };
struct SyncCommand : public CommandBase { struct SyncCommand : public CommandBase {
SyncSemaphore *sync_sem; SyncSemaphore *sync_sem;
virtual void post() { virtual void post() {
@ -349,7 +345,6 @@ class CommandQueueMT {
template <class T> template <class T>
T *allocate() { T *allocate() {
// alloc size is size+T+safeguard // alloc size is size+T+safeguard
uint32_t alloc_size = ((sizeof(T) + 8 - 1) & ~(8 - 1)) + 8; uint32_t alloc_size = ((sizeof(T) + 8 - 1) & ~(8 - 1)) + 8;
@ -358,7 +353,6 @@ class CommandQueueMT {
if (write_ptr < dealloc_ptr) { if (write_ptr < dealloc_ptr) {
// behind dealloc_ptr, check that there is room // behind dealloc_ptr, check that there is room
if ((dealloc_ptr - write_ptr) <= alloc_size) { if ((dealloc_ptr - write_ptr) <= alloc_size) {
// There is no more room, try to deallocate something // There is no more room, try to deallocate something
if (dealloc_one()) { if (dealloc_one()) {
goto tryagain; goto tryagain;
@ -405,12 +399,10 @@ class CommandQueueMT {
template <class T> template <class T>
T *allocate_and_lock() { T *allocate_and_lock() {
lock(); lock();
T *ret; T *ret;
while ((ret = allocate<T>()) == nullptr) { while ((ret = allocate<T>()) == nullptr) {
unlock(); unlock();
// sleep a little until fetch happened and some room is made // sleep a little until fetch happened and some room is made
wait_for_flush(); wait_for_flush();
@ -488,7 +480,6 @@ public:
} }
void flush_all() { void flush_all() {
//ERR_FAIL_COND(sync); //ERR_FAIL_COND(sync);
lock(); lock();
while (flush_one(false)) while (flush_one(false))

16
core/compressed_translation.cpp
View file

@ -37,7 +37,6 @@ extern "C" {
} }
struct _PHashTranslationCmp { struct _PHashTranslationCmp {
int orig_len; int orig_len;
CharString compressed; CharString compressed;
int offset; int offset;
@ -65,7 +64,6 @@ void PHashTranslation::generate(const Ref<Translation> &p_from) {
int total_string_size = 0; int total_string_size = 0;
for (List<StringName>::Element *E = keys.front(); E; E = E->next()) { for (List<StringName>::Element *E = keys.front(); E; E = E->next()) {
//hash string //hash string
CharString cs = E->get().operator String().utf8(); CharString cs = E->get().operator String().utf8();
uint32_t h = hash(0, cs.get_data()); uint32_t h = hash(0, cs.get_data());
@ -108,7 +106,6 @@ void PHashTranslation::generate(const Ref<Translation> &p_from) {
int bucket_table_size = 0; int bucket_table_size = 0;
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
const Vector<Pair<int, CharString>> &b = buckets[i]; const Vector<Pair<int, CharString>> &b = buckets[i];
Map<uint32_t, int> &t = table.write[i]; Map<uint32_t, int> &t = table.write[i];
@ -119,10 +116,8 @@ void PHashTranslation::generate(const Ref<Translation> &p_from) {
int item = 0; int item = 0;
while (item < b.size()) { while (item < b.size()) {
uint32_t slot = hash(d, b[item].second.get_data()); uint32_t slot = hash(d, b[item].second.get_data());
if (t.has(slot)) { if (t.has(slot)) {
item = 0; item = 0;
d++; d++;
t.clear(); t.clear();
@ -151,7 +146,6 @@ void PHashTranslation::generate(const Ref<Translation> &p_from) {
int collisions = 0; int collisions = 0;
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
const Map<uint32_t, int> &t = table[i]; const Map<uint32_t, int> &t = table[i];
if (t.size() == 0) { if (t.size() == 0) {
htw[i] = 0xFFFFFFFF; //nothing htw[i] = 0xFFFFFFFF; //nothing
@ -165,7 +159,6 @@ void PHashTranslation::generate(const Ref<Translation> &p_from) {
btw[btindex++] = hfunc_table[i]; btw[btindex++] = hfunc_table[i];
for (Map<uint32_t, int>::Element *E = t.front(); E; E = E->next()) { for (Map<uint32_t, int>::Element *E = t.front(); E; E = E->next()) {
btw[btindex++] = E->key(); btw[btindex++] = E->key();
btw[btindex++] = compressed[E->get()].offset; btw[btindex++] = compressed[E->get()].offset;
btw[btindex++] = compressed[E->get()].compressed.size(); btw[btindex++] = compressed[E->get()].compressed.size();
@ -187,7 +180,6 @@ void PHashTranslation::generate(const Ref<Translation> &p_from) {
} }
bool PHashTranslation::_set(const StringName &p_name, const Variant &p_value) { bool PHashTranslation::_set(const StringName &p_name, const Variant &p_value) {
String name = p_name.operator String(); String name = p_name.operator String();
if (name == "hash_table") { if (name == "hash_table") {
hash_table = p_value; hash_table = p_value;
@ -204,7 +196,6 @@ bool PHashTranslation::_set(const StringName &p_name, const Variant &p_value) {
} }
bool PHashTranslation::_get(const StringName &p_name, Variant &r_ret) const { bool PHashTranslation::_get(const StringName &p_name, Variant &r_ret) const {
String name = p_name.operator String(); String name = p_name.operator String();
if (name == "hash_table") if (name == "hash_table")
r_ret = hash_table; r_ret = hash_table;
@ -219,7 +210,6 @@ bool PHashTranslation::_get(const StringName &p_name, Variant &r_ret) const {
} }
StringName PHashTranslation::get_message(const StringName &p_src_text) const { StringName PHashTranslation::get_message(const StringName &p_src_text) const {
int htsize = hash_table.size(); int htsize = hash_table.size();
if (htsize == 0) if (htsize == 0)
@ -248,9 +238,7 @@ StringName PHashTranslation::get_message(const StringName &p_src_text) const {
int idx = -1; int idx = -1;
for (int i = 0; i < bucket.size; i++) { for (int i = 0; i < bucket.size; i++) {
if (bucket.elem[i].key == h) { if (bucket.elem[i].key == h) {
idx = i; idx = i;
break; break;
} }
@ -261,13 +249,11 @@ StringName PHashTranslation::get_message(const StringName &p_src_text) const {
} }
if (bucket.elem[idx].comp_size == bucket.elem[idx].uncomp_size) { if (bucket.elem[idx].comp_size == bucket.elem[idx].uncomp_size) {
String rstr; String rstr;
rstr.parse_utf8(&sptr[bucket.elem[idx].str_offset], bucket.elem[idx].uncomp_size); rstr.parse_utf8(&sptr[bucket.elem[idx].str_offset], bucket.elem[idx].uncomp_size);
return rstr; return rstr;
} else { } else {
CharString uncomp; CharString uncomp;
uncomp.resize(bucket.elem[idx].uncomp_size + 1); uncomp.resize(bucket.elem[idx].uncomp_size + 1);
smaz_decompress(&sptr[bucket.elem[idx].str_offset], bucket.elem[idx].comp_size, uncomp.ptrw(), bucket.elem[idx].uncomp_size); smaz_decompress(&sptr[bucket.elem[idx].str_offset], bucket.elem[idx].comp_size, uncomp.ptrw(), bucket.elem[idx].uncomp_size);
@ -278,13 +264,11 @@ StringName PHashTranslation::get_message(const StringName &p_src_text) const {
} }
void PHashTranslation::_get_property_list(List<PropertyInfo> *p_list) const { void PHashTranslation::_get_property_list(List<PropertyInfo> *p_list) const {
p_list->push_back(PropertyInfo(Variant::PACKED_INT32_ARRAY, "hash_table")); p_list->push_back(PropertyInfo(Variant::PACKED_INT32_ARRAY, "hash_table"));
p_list->push_back(PropertyInfo(Variant::PACKED_INT32_ARRAY, "bucket_table")); p_list->push_back(PropertyInfo(Variant::PACKED_INT32_ARRAY, "bucket_table"));
p_list->push_back(PropertyInfo(Variant::PACKED_BYTE_ARRAY, "strings")); p_list->push_back(PropertyInfo(Variant::PACKED_BYTE_ARRAY, "strings"));
p_list->push_back(PropertyInfo(Variant::OBJECT, "load_from", PROPERTY_HINT_RESOURCE_TYPE, "Translation", PROPERTY_USAGE_EDITOR)); p_list->push_back(PropertyInfo(Variant::OBJECT, "load_from", PROPERTY_HINT_RESOURCE_TYPE, "Translation", PROPERTY_USAGE_EDITOR));
} }
void PHashTranslation::_bind_methods() { void PHashTranslation::_bind_methods() {
ClassDB::bind_method(D_METHOD("generate", "from"), &PHashTranslation::generate); ClassDB::bind_method(D_METHOD("generate", "from"), &PHashTranslation::generate);
} }

5
core/compressed_translation.h
View file

@ -34,7 +34,6 @@
#include "core/translation.h" #include "core/translation.h"
class PHashTranslation : public Translation { class PHashTranslation : public Translation {
GDCLASS(PHashTranslation, Translation); GDCLASS(PHashTranslation, Translation);
//this translation uses a sort of modified perfect hash algorithm //this translation uses a sort of modified perfect hash algorithm
@ -48,12 +47,10 @@ class PHashTranslation : public Translation {
Vector<uint8_t> strings; Vector<uint8_t> strings;
struct Bucket { struct Bucket {
int size; int size;
uint32_t func; uint32_t func;
struct Elem { struct Elem {
uint32_t key; uint32_t key;
uint32_t str_offset; uint32_t str_offset;
uint32_t comp_size; uint32_t comp_size;
@ -64,11 +61,9 @@ class PHashTranslation : public Translation {
}; };
_FORCE_INLINE_ uint32_t hash(uint32_t d, const char *p_str) const { _FORCE_INLINE_ uint32_t hash(uint32_t d, const char *p_str) const {
if (d == 0) if (d == 0)
d = 0x1000193; d = 0x1000193;
while (*p_str) { while (*p_str) {
d = (d * 0x1000193) ^ uint32_t(*p_str); d = (d * 0x1000193) ^ uint32_t(*p_str);
p_str++; p_str++;
} }

2
core/container_type_validate.h
View file

@ -35,7 +35,6 @@
#include "core/variant.h" #include "core/variant.h"
struct ContainerTypeValidate { struct ContainerTypeValidate {
Variant::Type type = Variant::NIL; Variant::Type type = Variant::NIL;
StringName class_name; StringName class_name;
Ref<Script> script; Ref<Script> script;
@ -76,7 +75,6 @@ struct ContainerTypeValidate {
} }
_FORCE_INLINE_ bool validate(const Variant &p_variant, const char *p_operation = "use") { _FORCE_INLINE_ bool validate(const Variant &p_variant, const char *p_operation = "use") {
if (type == Variant::NIL) { if (type == Variant::NIL) {
return true; return true;
} }

1
core/core_string_names.h
View file

@ -34,7 +34,6 @@
#include "core/string_name.h" #include "core/string_name.h"
class CoreStringNames { class CoreStringNames {
friend void register_core_types(); friend void register_core_types();
friend void unregister_core_types(); friend void unregister_core_types();

16
core/cowdata.h
View file

@ -59,7 +59,6 @@ private:
// internal helpers // internal helpers
_FORCE_INLINE_ uint32_t *_get_refcount() const { _FORCE_INLINE_ uint32_t *_get_refcount() const {
if (!_ptr) if (!_ptr)
return nullptr; return nullptr;
@ -67,7 +66,6 @@ private:
} }
_FORCE_INLINE_ uint32_t *_get_size() const { _FORCE_INLINE_ uint32_t *_get_size() const {
if (!_ptr) if (!_ptr)
return nullptr; return nullptr;
@ -75,7 +73,6 @@ private:
} }
_FORCE_INLINE_ T *_get_data() const { _FORCE_INLINE_ T *_get_data() const {
if (!_ptr) if (!_ptr)
return nullptr; return nullptr;
return reinterpret_cast<T *>(_ptr); return reinterpret_cast<T *>(_ptr);
@ -135,21 +132,18 @@ public:
_FORCE_INLINE_ bool empty() const { return _ptr == nullptr; } _FORCE_INLINE_ bool empty() const { return _ptr == nullptr; }
_FORCE_INLINE_ void set(int p_index, const T &p_elem) { _FORCE_INLINE_ void set(int p_index, const T &p_elem) {
CRASH_BAD_INDEX(p_index, size()); CRASH_BAD_INDEX(p_index, size());
_copy_on_write(); _copy_on_write();
_get_data()[p_index] = p_elem; _get_data()[p_index] = p_elem;
} }
_FORCE_INLINE_ T &get_m(int p_index) { _FORCE_INLINE_ T &get_m(int p_index) {
CRASH_BAD_INDEX(p_index, size()); CRASH_BAD_INDEX(p_index, size());
_copy_on_write(); _copy_on_write();
return _get_data()[p_index]; return _get_data()[p_index];
} }
_FORCE_INLINE_ const T &get(int p_index) const { _FORCE_INLINE_ const T &get(int p_index) const {
CRASH_BAD_INDEX(p_index, size()); CRASH_BAD_INDEX(p_index, size());
return _get_data()[p_index]; return _get_data()[p_index];
@ -158,12 +152,10 @@ public:
Error resize(int p_size); Error resize(int p_size);
_FORCE_INLINE_ void remove(int p_index) { _FORCE_INLINE_ void remove(int p_index) {
ERR_FAIL_INDEX(p_index, size()); ERR_FAIL_INDEX(p_index, size());
T *p = ptrw(); T *p = ptrw();
int len = size(); int len = size();
for (int i = p_index; i < len - 1; i++) { for (int i = p_index; i < len - 1; i++) {
p[i] = p[i + 1]; p[i] = p[i + 1];
}; };
@ -171,7 +163,6 @@ public:
}; };
Error insert(int p_pos, const T &p_val) { Error insert(int p_pos, const T &p_val) {
ERR_FAIL_INDEX_V(p_pos, size() + 1, ERR_INVALID_PARAMETER); ERR_FAIL_INDEX_V(p_pos, size() + 1, ERR_INVALID_PARAMETER);
resize(size() + 1); resize(size() + 1);
for (int i = (size() - 1); i > p_pos; i--) for (int i = (size() - 1); i > p_pos; i--)
@ -190,7 +181,6 @@ public:
template <class T> template <class T>
void CowData<T>::_unref(void *p_data) { void CowData<T>::_unref(void *p_data) {
if (!p_data) if (!p_data)
return; return;
@ -216,7 +206,6 @@ void CowData<T>::_unref(void *p_data) {
template <class T> template <class T>
void CowData<T>::_copy_on_write() { void CowData<T>::_copy_on_write() {
if (!_ptr) if (!_ptr)
return; return;
@ -250,7 +239,6 @@ void CowData<T>::_copy_on_write() {
template <class T> template <class T>
Error CowData<T>::resize(int p_size) { Error CowData<T>::resize(int p_size) {
ERR_FAIL_COND_V(p_size < 0, ERR_INVALID_PARAMETER); ERR_FAIL_COND_V(p_size < 0, ERR_INVALID_PARAMETER);
int current_size = size(); int current_size = size();
@ -273,7 +261,6 @@ Error CowData<T>::resize(int p_size) {
ERR_FAIL_COND_V(!_get_alloc_size_checked(p_size, &alloc_size), ERR_OUT_OF_MEMORY); ERR_FAIL_COND_V(!_get_alloc_size_checked(p_size, &alloc_size), ERR_OUT_OF_MEMORY);
if (p_size > current_size) { if (p_size > current_size) {
if (alloc_size != current_alloc_size) { if (alloc_size != current_alloc_size) {
if (current_size == 0) { if (current_size == 0) {
// alloc from scratch // alloc from scratch
@ -304,7 +291,6 @@ Error CowData<T>::resize(int p_size) {
*_get_size() = p_size; *_get_size() = p_size;
} else if (p_size < current_size) { } else if (p_size < current_size) {
if (!__has_trivial_destructor(T)) { if (!__has_trivial_destructor(T)) {
// deinitialize no longer needed elements // deinitialize no longer needed elements
for (uint32_t i = p_size; i < *_get_size(); i++) { for (uint32_t i = p_size; i < *_get_size(); i++) {
@ -351,7 +337,6 @@ void CowData<T>::_ref(const CowData *p_from) {
template <class T> template <class T>
void CowData<T>::_ref(const CowData &p_from) { void CowData<T>::_ref(const CowData &p_from) {
if (_ptr == p_from._ptr) if (_ptr == p_from._ptr)
return; // self assign, do nothing. return; // self assign, do nothing.
@ -368,7 +353,6 @@ void CowData<T>::_ref(const CowData &p_from) {
template <class T> template <class T>
CowData<T>::~CowData() { CowData<T>::~CowData() {
_unref(_ptr); _unref(_ptr);
} }

8
core/crypto/crypto.cpp
View file

@ -71,7 +71,6 @@ Crypto *Crypto::create() {
} }
void Crypto::load_default_certificates(String p_path) { void Crypto::load_default_certificates(String p_path) {
if (_load_default_certificates) if (_load_default_certificates)
_load_default_certificates(p_path); _load_default_certificates(p_path);
} }
@ -97,7 +96,6 @@ Ref<X509Certificate> Crypto::generate_self_signed_certificate(Ref<CryptoKey> p_k
/// Resource loader/saver /// Resource loader/saver
RES ResourceFormatLoaderCrypto::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, bool p_no_cache) { RES ResourceFormatLoaderCrypto::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, bool p_no_cache) {
String el = p_path.get_extension().to_lower(); String el = p_path.get_extension().to_lower();
if (el == "crt") { if (el == "crt") {
X509Certificate *cert = X509Certificate::create(); X509Certificate *cert = X509Certificate::create();
@ -114,18 +112,15 @@ RES ResourceFormatLoaderCrypto::load(const String &p_path, const String &p_origi
} }
void ResourceFormatLoaderCrypto::get_recognized_extensions(List<String> *p_extensions) const { void ResourceFormatLoaderCrypto::get_recognized_extensions(List<String> *p_extensions) const {
p_extensions->push_back("crt"); p_extensions->push_back("crt");
p_extensions->push_back("key"); p_extensions->push_back("key");
} }
bool ResourceFormatLoaderCrypto::handles_type(const String &p_type) const { bool ResourceFormatLoaderCrypto::handles_type(const String &p_type) const {
return p_type == "X509Certificate" || p_type == "CryptoKey"; return p_type == "X509Certificate" || p_type == "CryptoKey";
} }
String ResourceFormatLoaderCrypto::get_resource_type(const String &p_path) const { String ResourceFormatLoaderCrypto::get_resource_type(const String &p_path) const {
String el = p_path.get_extension().to_lower(); String el = p_path.get_extension().to_lower();
if (el == "crt") if (el == "crt")
return "X509Certificate"; return "X509Certificate";
@ -135,7 +130,6 @@ String ResourceFormatLoaderCrypto::get_resource_type(const String &p_path) const
} }
Error ResourceFormatSaverCrypto::save(const String &p_path, const RES &p_resource, uint32_t p_flags) { Error ResourceFormatSaverCrypto::save(const String &p_path, const RES &p_resource, uint32_t p_flags) {
Error err; Error err;
Ref<X509Certificate> cert = p_resource; Ref<X509Certificate> cert = p_resource;
Ref<CryptoKey> key = p_resource; Ref<CryptoKey> key = p_resource;
@ -151,7 +145,6 @@ Error ResourceFormatSaverCrypto::save(const String &p_path, const RES &p_resourc
} }
void ResourceFormatSaverCrypto::get_recognized_extensions(const RES &p_resource, List<String> *p_extensions) const { void ResourceFormatSaverCrypto::get_recognized_extensions(const RES &p_resource, List<String> *p_extensions) const {
const X509Certificate *cert = Object::cast_to<X509Certificate>(*p_resource); const X509Certificate *cert = Object::cast_to<X509Certificate>(*p_resource);
const CryptoKey *key = Object::cast_to<CryptoKey>(*p_resource); const CryptoKey *key = Object::cast_to<CryptoKey>(*p_resource);
if (cert) { if (cert) {
@ -162,6 +155,5 @@ void ResourceFormatSaverCrypto::get_recognized_extensions(const RES &p_resource,
} }
} }
bool ResourceFormatSaverCrypto::recognize(const RES &p_resource) const { bool ResourceFormatSaverCrypto::recognize(const RES &p_resource) const {
return Object::cast_to<X509Certificate>(*p_resource) || Object::cast_to<CryptoKey>(*p_resource); return Object::cast_to<X509Certificate>(*p_resource) || Object::cast_to<CryptoKey>(*p_resource);
} }

5
core/crypto/crypto_core.h
View file

@ -34,10 +34,8 @@
#include "core/reference.h" #include "core/reference.h"
class CryptoCore { class CryptoCore {
public: public:
class MD5Context { class MD5Context {
private: private:
void *ctx; // To include, or not to include... void *ctx; // To include, or not to include...
@ -51,7 +49,6 @@ public:
}; };
class SHA1Context { class SHA1Context {
private: private:
void *ctx; // To include, or not to include... void *ctx; // To include, or not to include...
@ -65,7 +62,6 @@ public:
}; };
class SHA256Context { class SHA256Context {
private: private:
void *ctx; // To include, or not to include... void *ctx; // To include, or not to include...
@ -79,7 +75,6 @@ public:
}; };
class AESContext { class AESContext {
private: private:
void *ctx; // To include, or not to include... void *ctx; // To include, or not to include...

1
core/crypto/hashing_context.cpp
View file

@ -104,7 +104,6 @@ void HashingContext::_create_ctx(HashType p_type) {
} }
void HashingContext::_delete_ctx() { void HashingContext::_delete_ctx() {
switch (type) { switch (type) {
case HASH_MD5: case HASH_MD5:
memdelete((CryptoCore::MD5Context *)ctx); memdelete((CryptoCore::MD5Context *)ctx);

1
core/debugger/debugger_marshalls.h
View file

@ -35,7 +35,6 @@
#include "servers/rendering_server.h" #include "servers/rendering_server.h"
struct DebuggerMarshalls { struct DebuggerMarshalls {
// Memory usage // Memory usage
struct ResourceInfo { struct ResourceInfo {
String path; String path;

1
core/debugger/engine_debugger.cpp
View file

@ -162,7 +162,6 @@ void EngineDebugger::initialize(const String &p_uri, bool p_skip_breakpoints, Ve
singleton_script_debugger->set_skip_breakpoints(p_skip_breakpoints); singleton_script_debugger->set_skip_breakpoints(p_skip_breakpoints);
for (int i = 0; i < p_breakpoints.size(); i++) { for (int i = 0; i < p_breakpoints.size(); i++) {
String bp = p_breakpoints[i]; String bp = p_breakpoints[i];
int sp = bp.find_last(":"); int sp = bp.find_last(":");
ERR_CONTINUE_MSG(sp == -1, "Invalid breakpoint: '" + bp + "', expected file:line format."); ERR_CONTINUE_MSG(sp == -1, "Invalid breakpoint: '" + bp + "', expected file:line format.");

34
core/debugger/local_debugger.cpp
View file

@ -36,7 +36,6 @@
struct LocalDebugger::ScriptsProfiler { struct LocalDebugger::ScriptsProfiler {
struct ProfileInfoSort { struct ProfileInfoSort {
bool operator()(const ScriptLanguage::ProfilingInfo &A, const ScriptLanguage::ProfilingInfo &B) const { bool operator()(const ScriptLanguage::ProfilingInfo &A, const ScriptLanguage::ProfilingInfo &B) const {
return A.total_time > B.total_time; return A.total_time > B.total_time;
} }
@ -89,7 +88,6 @@ struct LocalDebugger::ScriptsProfiler {
// compute total script frame time // compute total script frame time
uint64_t script_time_us = 0; uint64_t script_time_us = 0;
for (int i = 0; i < ofs; i++) { for (int i = 0; i < ofs; i++) {
script_time_us += pinfo[i].self_time; script_time_us += pinfo[i].self_time;
} }
float script_time = USEC_TO_SEC(script_time_us); float script_time = USEC_TO_SEC(script_time_us);
@ -102,7 +100,6 @@ struct LocalDebugger::ScriptsProfiler {
} }
for (int i = 0; i < ofs; i++) { for (int i = 0; i < ofs; i++) {
print_line(itos(i) + ":" + pinfo[i].signature); print_line(itos(i) + ":" + pinfo[i].signature);
float tt = USEC_TO_SEC(pinfo[i].total_time); float tt = USEC_TO_SEC(pinfo[i].total_time);
float st = USEC_TO_SEC(pinfo[i].self_time); float st = USEC_TO_SEC(pinfo[i].self_time);
@ -116,7 +113,6 @@ struct LocalDebugger::ScriptsProfiler {
}; };
void LocalDebugger::debug(bool p_can_continue, bool p_is_error_breakpoint) { void LocalDebugger::debug(bool p_can_continue, bool p_is_error_breakpoint) {
ScriptLanguage *script_lang = script_debugger->get_break_language(); ScriptLanguage *script_lang = script_debugger->get_break_language();
if (!target_function.empty()) { if (!target_function.empty()) {
@ -135,7 +131,6 @@ void LocalDebugger::debug(bool p_can_continue, bool p_is_error_breakpoint) {
int current_frame = 0; int current_frame = 0;
int total_frames = script_lang->debug_get_stack_level_count(); int total_frames = script_lang->debug_get_stack_level_count();
while (true) { while (true) {
OS::get_singleton()->print("debug> "); OS::get_singleton()->print("debug> ");
String line = OS::get_singleton()->get_stdin_string().strip_edges(); String line = OS::get_singleton()->get_stdin_string().strip_edges();
@ -149,15 +144,12 @@ void LocalDebugger::debug(bool p_can_continue, bool p_is_error_breakpoint) {
} else if (line == "c" || line == "continue") } else if (line == "c" || line == "continue")
break; break;
else if (line == "bt" || line == "breakpoint") { else if (line == "bt" || line == "breakpoint") {
for (int i = 0; i < total_frames; i++) { for (int i = 0; i < total_frames; i++) {
String cfi = (current_frame == i) ? "*" : " "; //current frame indicator String cfi = (current_frame == i) ? "*" : " "; //current frame indicator
print_line(cfi + "Frame " + itos(i) + " - " + script_lang->debug_get_stack_level_source(i) + ":" + itos(script_lang->debug_get_stack_level_line(i)) + " in function '" + script_lang->debug_get_stack_level_function(i) + "'"); print_line(cfi + "Frame " + itos(i) + " - " + script_lang->debug_get_stack_level_source(i) + ":" + itos(script_lang->debug_get_stack_level_line(i)) + " in function '" + script_lang->debug_get_stack_level_function(i) + "'");
} }
} else if (line.begins_with("fr") || line.begins_with("frame")) { } else if (line.begins_with("fr") || line.begins_with("frame")) {
if (line.get_slice_count(" ") == 1) { if (line.get_slice_count(" ") == 1) {
print_line("*Frame " + itos(current_frame) + " - " + script_lang->debug_get_stack_level_source(current_frame) + ":" + itos(script_lang->debug_get_stack_level_line(current_frame)) + " in function '" + script_lang->debug_get_stack_level_function(current_frame) + "'"); print_line("*Frame " + itos(current_frame) + " - " + script_lang->debug_get_stack_level_source(current_frame) + ":" + itos(script_lang->debug_get_stack_level_line(current_frame)) + " in function '" + script_lang->debug_get_stack_level_function(current_frame) + "'");
} else { } else {
@ -171,9 +163,7 @@ void LocalDebugger::debug(bool p_can_continue, bool p_is_error_breakpoint) {
} }
} else if (line.begins_with("set")) { } else if (line.begins_with("set")) {
if (line.get_slice_count(" ") == 1) { if (line.get_slice_count(" ") == 1) {
for (Map<String, String>::Element *E = options.front(); E; E = E->next()) { for (Map<String, String>::Element *E = options.front(); E; E = E->next()) {
print_line("\t" + E->key() + "=" + E->value()); print_line("\t" + E->key() + "=" + E->value());
} }
@ -185,13 +175,11 @@ void LocalDebugger::debug(bool p_can_continue, bool p_is_error_breakpoint) {
if (value_pos < 0) { if (value_pos < 0) {
print_line("Error: Invalid set format. Use: set key=value"); print_line("Error: Invalid set format. Use: set key=value");
} else { } else {
String key = key_value.left(value_pos); String key = key_value.left(value_pos);
if (!options.has(key)) { if (!options.has(key)) {
print_line("Error: Unknown option " + key); print_line("Error: Unknown option " + key);
} else { } else {
// Allow explicit tab character // Allow explicit tab character
String value = key_value.right(value_pos + 1).replace("\\t", "\t"); String value = key_value.right(value_pos + 1).replace("\\t", "\t");
@ -201,49 +189,41 @@ void LocalDebugger::debug(bool p_can_continue, bool p_is_error_breakpoint) {
} }
} else if (line == "lv" || line == "locals") { } else if (line == "lv" || line == "locals") {
List<String> locals; List<String> locals;
List<Variant> values; List<Variant> values;
script_lang->debug_get_stack_level_locals(current_frame, &locals, &values); script_lang->debug_get_stack_level_locals(current_frame, &locals, &values);
print_variables(locals, values, variable_prefix); print_variables(locals, values, variable_prefix);
} else if (line == "gv" || line == "globals") { } else if (line == "gv" || line == "globals") {
List<String> globals; List<String> globals;
List<Variant> values; List<Variant> values;
script_lang->debug_get_globals(&globals, &values); script_lang->debug_get_globals(&globals, &values);
print_variables(globals, values, variable_prefix); print_variables(globals, values, variable_prefix);
} else if (line == "mv" || line == "members") { } else if (line == "mv" || line == "members") {
List<String> members; List<String> members;
List<Variant> values; List<Variant> values;
script_lang->debug_get_stack_level_members(current_frame, &members, &values); script_lang->debug_get_stack_level_members(current_frame, &members, &values);
print_variables(members, values, variable_prefix); print_variables(members, values, variable_prefix);
} else if (line.begins_with("p") || line.begins_with("print")) { } else if (line.begins_with("p") || line.begins_with("print")) {
if (line.get_slice_count(" ") <= 1) { if (line.get_slice_count(" ") <= 1) {
print_line("Usage: print <expre>"); print_line("Usage: print <expre>");
} else { } else {
String expr = line.get_slicec(' ', 2); String expr = line.get_slicec(' ', 2);
String res = script_lang->debug_parse_stack_level_expression(current_frame, expr); String res = script_lang->debug_parse_stack_level_expression(current_frame, expr);
print_line(res); print_line(res);
} }
} else if (line == "s" || line == "step") { } else if (line == "s" || line == "step") {
script_debugger->set_depth(-1); script_debugger->set_depth(-1);
script_debugger->set_lines_left(1); script_debugger->set_lines_left(1);
break; break;
} else if (line == "n" || line == "next") { } else if (line == "n" || line == "next") {
script_debugger->set_depth(0); script_debugger->set_depth(0);
script_debugger->set_lines_left(1); script_debugger->set_lines_left(1);
break; break;
} else if (line == "fin" || line == "finish") { } else if (line == "fin" || line == "finish") {
String current_function = script_lang->debug_get_stack_level_function(0); String current_function = script_lang->debug_get_stack_level_function(0);
for (int i = 0; i < total_frames; i++) { for (int i = 0; i < total_frames; i++) {
@ -259,9 +239,7 @@ void LocalDebugger::debug(bool p_can_continue, bool p_is_error_breakpoint) {
target_function = ""; target_function = "";
} else if (line.begins_with("br") || line.begins_with("break")) { } else if (line.begins_with("br") || line.begins_with("break")) {
if (line.get_slice_count(" ") <= 1) { if (line.get_slice_count(" ") <= 1) {
const Map<int, Set<StringName>> &breakpoints = script_debugger->get_breakpoints(); const Map<int, Set<StringName>> &breakpoints = script_debugger->get_breakpoints();
if (breakpoints.size() == 0) { if (breakpoints.size() == 0) {
print_line("No Breakpoints."); print_line("No Breakpoints.");
@ -274,7 +252,6 @@ void LocalDebugger::debug(bool p_can_continue, bool p_is_error_breakpoint) {
} }
} else { } else {
Pair<String, int> breakpoint = to_breakpoint(line); Pair<String, int> breakpoint = to_breakpoint(line);
String source = breakpoint.first; String source = breakpoint.first;
@ -289,7 +266,6 @@ void LocalDebugger::debug(bool p_can_continue, bool p_is_error_breakpoint) {
} }
} else if (line == "q" || line == "quit") { } else if (line == "q" || line == "quit") {
// Do not stop again on quit // Do not stop again on quit
script_debugger->clear_breakpoints(); script_debugger->clear_breakpoints();
script_debugger->set_depth(-1); script_debugger->set_depth(-1);
@ -298,11 +274,9 @@ void LocalDebugger::debug(bool p_can_continue, bool p_is_error_breakpoint) {
SceneTree::get_singleton()->quit(); SceneTree::get_singleton()->quit();
break; break;
} else if (line.begins_with("delete")) { } else if (line.begins_with("delete")) {
if (line.get_slice_count(" ") <= 1) { if (line.get_slice_count(" ") <= 1) {
script_debugger->clear_breakpoints(); script_debugger->clear_breakpoints();
} else { } else {
Pair<String, int> breakpoint = to_breakpoint(line); Pair<String, int> breakpoint = to_breakpoint(line);
String source = breakpoint.first; String source = breakpoint.first;
@ -317,7 +291,6 @@ void LocalDebugger::debug(bool p_can_continue, bool p_is_error_breakpoint) {
} }
} else if (line == "h" || line == "help") { } else if (line == "h" || line == "help") {
print_line("Built-In Debugger command list:\n"); print_line("Built-In Debugger command list:\n");
print_line("\tc,continue\t\t Continue execution."); print_line("\tc,continue\t\t Continue execution.");
print_line("\tbt,backtrace\t\t Show stack trace (frames)."); print_line("\tbt,backtrace\t\t Show stack trace (frames).");
@ -340,18 +313,15 @@ void LocalDebugger::debug(bool p_can_continue, bool p_is_error_breakpoint) {
} }
void LocalDebugger::print_variables(const List<String> &names, const List<Variant> &values, const String &variable_prefix) { void LocalDebugger::print_variables(const List<String> &names, const List<Variant> &values, const String &variable_prefix) {
String value; String value;
Vector<String> value_lines; Vector<String> value_lines;
const List<Variant>::Element *V = values.front(); const List<Variant>::Element *V = values.front();
for (const List<String>::Element *E = names.front(); E; E = E->next()) { for (const List<String>::Element *E = names.front(); E; E = E->next()) {
value = String(V->get()); value = String(V->get());
if (variable_prefix.empty()) { if (variable_prefix.empty()) {
print_line(E->get() + ": " + String(V->get())); print_line(E->get() + ": " + String(V->get()));
} else { } else {
print_line(E->get() + ":"); print_line(E->get() + ":");
value_lines = value.split("\n"); value_lines = value.split("\n");
for (int i = 0; i < value_lines.size(); ++i) { for (int i = 0; i < value_lines.size(); ++i) {
@ -364,7 +334,6 @@ void LocalDebugger::print_variables(const List<String> &names, const List<Varian
} }
Pair<String, int> LocalDebugger::to_breakpoint(const String &p_line) { Pair<String, int> LocalDebugger::to_breakpoint(const String &p_line) {
String breakpoint_part = p_line.get_slicec(' ', 1); String breakpoint_part = p_line.get_slicec(' ', 1);
Pair<String, int> breakpoint; Pair<String, int> breakpoint;
@ -381,18 +350,15 @@ Pair<String, int> LocalDebugger::to_breakpoint(const String &p_line) {
} }
void LocalDebugger::send_message(const String &p_message, const Array &p_args) { void LocalDebugger::send_message(const String &p_message, const Array &p_args) {
// This needs to be cleaned up entirely. // This needs to be cleaned up entirely.
// print_line("MESSAGE: '" + p_message + "' - " + String(Variant(p_args))); // print_line("MESSAGE: '" + p_message + "' - " + String(Variant(p_args)));
} }
void LocalDebugger::send_error(const String &p_func, const String &p_file, int p_line, const String &p_err, const String &p_descr, ErrorHandlerType p_type) { void LocalDebugger::send_error(const String &p_func, const String &p_file, int p_line, const String &p_err, const String &p_descr, ErrorHandlerType p_type) {
print_line("ERROR: '" + (p_descr.empty() ? p_err : p_descr) + "'"); print_line("ERROR: '" + (p_descr.empty() ? p_err : p_descr) + "'");
} }
LocalDebugger::LocalDebugger() { LocalDebugger::LocalDebugger() {
options["variable_prefix"] = ""; options["variable_prefix"] = "";
// Bind scripts profiler. // Bind scripts profiler.

1
core/debugger/local_debugger.h
View file

@ -36,7 +36,6 @@
#include "core/script_language.h" #include "core/script_language.h"
class LocalDebugger : public EngineDebugger { class LocalDebugger : public EngineDebugger {
private: private:
struct ScriptsProfiler; struct ScriptsProfiler;

16
core/debugger/remote_debugger.cpp
View file

@ -57,7 +57,6 @@ void RemoteDebugger::_bind_profiler(const String &p_name, T *p_prof) {
} }
struct RemoteDebugger::NetworkProfiler { struct RemoteDebugger::NetworkProfiler {
public: public:
typedef DebuggerMarshalls::MultiplayerNodeInfo NodeInfo; typedef DebuggerMarshalls::MultiplayerNodeInfo NodeInfo;
struct BandwidthFrame { struct BandwidthFrame {
@ -191,7 +190,6 @@ struct RemoteDebugger::ScriptsProfiler {
typedef DebuggerMarshalls::ScriptFunctionSignature FunctionSignature; typedef DebuggerMarshalls::ScriptFunctionSignature FunctionSignature;
typedef DebuggerMarshalls::ScriptFunctionInfo FunctionInfo; typedef DebuggerMarshalls::ScriptFunctionInfo FunctionInfo;
struct ProfileInfoSort { struct ProfileInfoSort {
bool operator()(ScriptLanguage::ProfilingInfo *A, ScriptLanguage::ProfilingInfo *B) const { bool operator()(ScriptLanguage::ProfilingInfo *A, ScriptLanguage::ProfilingInfo *B) const {
return A->total_time < B->total_time; return A->total_time < B->total_time;
} }
@ -270,7 +268,6 @@ struct RemoteDebugger::ScriptsProfiler {
}; };
struct RemoteDebugger::ServersProfiler { struct RemoteDebugger::ServersProfiler {
bool skip_profile_frame = false; bool skip_profile_frame = false;
typedef DebuggerMarshalls::ServerInfo ServerInfo; typedef DebuggerMarshalls::ServerInfo ServerInfo;
typedef DebuggerMarshalls::ServerFunctionInfo ServerFunctionInfo; typedef DebuggerMarshalls::ServerFunctionInfo ServerFunctionInfo;
@ -347,7 +344,6 @@ struct RemoteDebugger::ServersProfiler {
}; };
struct RemoteDebugger::VisualProfiler { struct RemoteDebugger::VisualProfiler {
typedef DebuggerMarshalls::ServerInfo ServerInfo; typedef DebuggerMarshalls::ServerInfo ServerInfo;
typedef DebuggerMarshalls::ServerFunctionInfo ServerFunctionInfo; typedef DebuggerMarshalls::ServerFunctionInfo ServerFunctionInfo;
@ -372,7 +368,6 @@ struct RemoteDebugger::VisualProfiler {
}; };
struct RemoteDebugger::PerformanceProfiler { struct RemoteDebugger::PerformanceProfiler {
Object *performance = nullptr; Object *performance = nullptr;
int last_perf_time = 0; int last_perf_time = 0;
@ -401,14 +396,12 @@ struct RemoteDebugger::PerformanceProfiler {
}; };
void RemoteDebugger::_send_resource_usage() { void RemoteDebugger::_send_resource_usage() {
DebuggerMarshalls::ResourceUsage usage; DebuggerMarshalls::ResourceUsage usage;
List<RS::TextureInfo> tinfo; List<RS::TextureInfo> tinfo;
RS::get_singleton()->texture_debug_usage(&tinfo); RS::get_singleton()->texture_debug_usage(&tinfo);
for (List<RS::TextureInfo>::Element *E = tinfo.front(); E; E = E->next()) { for (List<RS::TextureInfo>::Element *E = tinfo.front(); E; E = E->next()) {
DebuggerMarshalls::ResourceInfo info; DebuggerMarshalls::ResourceInfo info;
info.path = E->get().path; info.path = E->get().path;
info.vram = E->get().bytes; info.vram = E->get().bytes;
@ -436,7 +429,6 @@ Error RemoteDebugger::_put_msg(String p_message, Array p_data) {
} }
void RemoteDebugger::_err_handler(void *p_this, const char *p_func, const char *p_file, int p_line, const char *p_err, const char *p_descr, ErrorHandlerType p_type) { void RemoteDebugger::_err_handler(void *p_this, const char *p_func, const char *p_file, int p_line, const char *p_err, const char *p_descr, ErrorHandlerType p_type) {
if (p_type == ERR_HANDLER_SCRIPT) if (p_type == ERR_HANDLER_SCRIPT)
return; //ignore script errors, those go through debugger return; //ignore script errors, those go through debugger
@ -457,7 +449,6 @@ void RemoteDebugger::_err_handler(void *p_this, const char *p_func, const char *
} }
void RemoteDebugger::_print_handler(void *p_this, const String &p_string, bool p_error) { void RemoteDebugger::_print_handler(void *p_this, const String &p_string, bool p_error) {
RemoteDebugger *rd = (RemoteDebugger *)p_this; RemoteDebugger *rd = (RemoteDebugger *)p_this;
if (rd->flushing && Thread::get_caller_id() == rd->flush_thread) // Can't handle recursive prints during flush. if (rd->flushing && Thread::get_caller_id() == rd->flush_thread) // Can't handle recursive prints during flush.
@ -521,7 +512,6 @@ void RemoteDebugger::flush_output() {
} }
if (output_strings.size()) { if (output_strings.size()) {
// Join output strings so we generate less messages. // Join output strings so we generate less messages.
Vector<String> joined_log_strings; Vector<String> joined_log_strings;
Vector<String> strings; Vector<String> strings;
@ -574,7 +564,6 @@ void RemoteDebugger::flush_output() {
} }
void RemoteDebugger::send_message(const String &p_message, const Array &p_args) { void RemoteDebugger::send_message(const String &p_message, const Array &p_args) {
MutexLock lock(mutex); MutexLock lock(mutex);
if (is_peer_connected()) { if (is_peer_connected()) {
_put_msg(p_message, p_args); _put_msg(p_message, p_args);
@ -582,7 +571,6 @@ void RemoteDebugger::send_message(const String &p_message, const Array &p_args)
} }
void RemoteDebugger::send_error(const String &p_func, const String &p_file, int p_line, const String &p_err, const String &p_descr, ErrorHandlerType p_type) { void RemoteDebugger::send_error(const String &p_func, const String &p_file, int p_line, const String &p_err, const String &p_descr, ErrorHandlerType p_type) {
ErrorMessage oe; ErrorMessage oe;
oe.error = p_err; oe.error = p_err;
oe.error_descr = p_descr; oe.error_descr = p_descr;
@ -609,7 +597,6 @@ void RemoteDebugger::send_error(const String &p_func, const String &p_file, int
} }
if (is_peer_connected()) { if (is_peer_connected()) {
if (oe.warning) { if (oe.warning) {
if (warn_count > max_warnings_per_second) { if (warn_count > max_warnings_per_second) {
n_warnings_dropped++; n_warnings_dropped++;
@ -664,7 +651,6 @@ Error RemoteDebugger::_try_capture(const String &p_msg, const Array &p_data, boo
} }
void RemoteDebugger::debug(bool p_can_continue, bool p_is_error_breakpoint) { void RemoteDebugger::debug(bool p_can_continue, bool p_is_error_breakpoint) {
//this function is called when there is a debugger break (bug on script) //this function is called when there is a debugger break (bug on script)
//or when execution is paused from editor //or when execution is paused from editor
@ -698,7 +684,6 @@ void RemoteDebugger::debug(bool p_can_continue, bool p_is_error_breakpoint) {
peer->poll(); peer->poll();
if (peer->has_message()) { if (peer->has_message()) {
Array cmd = peer->get_message(); Array cmd = peer->get_message();
ERR_CONTINUE(cmd.size() != 2); ERR_CONTINUE(cmd.size() != 2);
@ -816,7 +801,6 @@ void RemoteDebugger::poll_events(bool p_is_idle) {
flush_output(); flush_output();
peer->poll(); peer->poll();
while (peer->has_message()) { while (peer->has_message()) {
Array arr = peer->get_message(); Array arr = peer->get_message();
ERR_CONTINUE(arr.size() != 2); ERR_CONTINUE(arr.size() != 2);

4
core/debugger/remote_debugger_peer.cpp
View file

@ -154,7 +154,6 @@ void RemoteDebuggerPeerTCP::_read_in() {
} }
Error RemoteDebuggerPeerTCP::connect_to_host(const String &p_host, uint16_t p_port) { Error RemoteDebuggerPeerTCP::connect_to_host(const String &p_host, uint16_t p_port) {
IP_Address ip; IP_Address ip;
if (p_host.is_valid_ip_address()) if (p_host.is_valid_ip_address())
ip = p_host; ip = p_host;
@ -169,12 +168,10 @@ Error RemoteDebuggerPeerTCP::connect_to_host(const String &p_host, uint16_t p_po
tcp_client->connect_to_host(ip, port); tcp_client->connect_to_host(ip, port);
for (int i = 0; i < tries; i++) { for (int i = 0; i < tries; i++) {
if (tcp_client->get_status() == StreamPeerTCP::STATUS_CONNECTED) { if (tcp_client->get_status() == StreamPeerTCP::STATUS_CONNECTED) {
print_verbose("Remote Debugger: Connected!"); print_verbose("Remote Debugger: Connected!");
break; break;
} else { } else {
const int ms = waits[i]; const int ms = waits[i];
OS::get_singleton()->delay_usec(ms * 1000); OS::get_singleton()->delay_usec(ms * 1000);
print_verbose("Remote Debugger: Connection failed with status: '" + String::num(tcp_client->get_status()) + "', retrying in " + String::num(ms) + " msec."); print_verbose("Remote Debugger: Connection failed with status: '" + String::num(tcp_client->get_status()) + "', retrying in " + String::num(ms) + " msec.");
@ -182,7 +179,6 @@ Error RemoteDebuggerPeerTCP::connect_to_host(const String &p_host, uint16_t p_po
}; };
if (tcp_client->get_status() != StreamPeerTCP::STATUS_CONNECTED) { if (tcp_client->get_status() != StreamPeerTCP::STATUS_CONNECTED) {
ERR_PRINT("Remote Debugger: Unable to connect. Status: " + String::num(tcp_client->get_status()) + "."); ERR_PRINT("Remote Debugger: Unable to connect. Status: " + String::num(tcp_client->get_status()) + ".");
return FAILED; return FAILED;
}; };

13
core/debugger/script_debugger.cpp
View file

@ -33,34 +33,28 @@
#include "core/debugger/engine_debugger.h" #include "core/debugger/engine_debugger.h"
void ScriptDebugger::set_lines_left(int p_left) { void ScriptDebugger::set_lines_left(int p_left) {
lines_left = p_left; lines_left = p_left;
} }
int ScriptDebugger::get_lines_left() const { int ScriptDebugger::get_lines_left() const {
return lines_left; return lines_left;
} }
void ScriptDebugger::set_depth(int p_depth) { void ScriptDebugger::set_depth(int p_depth) {
depth = p_depth; depth = p_depth;
} }
int ScriptDebugger::get_depth() const { int ScriptDebugger::get_depth() const {
return depth; return depth;
} }
void ScriptDebugger::insert_breakpoint(int p_line, const StringName &p_source) { void ScriptDebugger::insert_breakpoint(int p_line, const StringName &p_source) {
if (!breakpoints.has(p_line)) if (!breakpoints.has(p_line))
breakpoints[p_line] = Set<StringName>(); breakpoints[p_line] = Set<StringName>();
breakpoints[p_line].insert(p_source); breakpoints[p_line].insert(p_source);
} }
void ScriptDebugger::remove_breakpoint(int p_line, const StringName &p_source) { void ScriptDebugger::remove_breakpoint(int p_line, const StringName &p_source) {
if (!breakpoints.has(p_line)) if (!breakpoints.has(p_line))
return; return;
@ -69,33 +63,27 @@ void ScriptDebugger::remove_breakpoint(int p_line, const StringName &p_source) {
breakpoints.erase(p_line); breakpoints.erase(p_line);
} }
bool ScriptDebugger::is_breakpoint(int p_line, const StringName &p_source) const { bool ScriptDebugger::is_breakpoint(int p_line, const StringName &p_source) const {
if (!breakpoints.has(p_line)) if (!breakpoints.has(p_line))
return false; return false;
return breakpoints[p_line].has(p_source); return breakpoints[p_line].has(p_source);
} }
bool ScriptDebugger::is_breakpoint_line(int p_line) const { bool ScriptDebugger::is_breakpoint_line(int p_line) const {
return breakpoints.has(p_line); return breakpoints.has(p_line);
} }
String ScriptDebugger::breakpoint_find_source(const String &p_source) const { String ScriptDebugger::breakpoint_find_source(const String &p_source) const {
return p_source; return p_source;
} }
void ScriptDebugger::clear_breakpoints() { void ScriptDebugger::clear_breakpoints() {
breakpoints.clear(); breakpoints.clear();
} }
void ScriptDebugger::set_skip_breakpoints(bool p_skip_breakpoints) { void ScriptDebugger::set_skip_breakpoints(bool p_skip_breakpoints) {
skip_breakpoints = p_skip_breakpoints; skip_breakpoints = p_skip_breakpoints;
} }
bool ScriptDebugger::is_skipping_breakpoints() { bool ScriptDebugger::is_skipping_breakpoints() {
return skip_breakpoints; return skip_breakpoints;
} }
@ -118,6 +106,5 @@ Vector<ScriptLanguage::StackInfo> ScriptDebugger::get_error_stack_info() const {
} }
ScriptLanguage *ScriptDebugger::get_break_language() const { ScriptLanguage *ScriptDebugger::get_break_language() const {
return break_lang; return break_lang;
} }

1
core/debugger/script_debugger.h
View file

@ -38,7 +38,6 @@
#include "core/vector.h" #include "core/vector.h"
class ScriptDebugger { class ScriptDebugger {
typedef ScriptLanguage::StackInfo StackInfo; typedef ScriptLanguage::StackInfo StackInfo;
int lines_left = -1; int lines_left = -1;

26
core/dictionary.cpp
View file

@ -35,13 +35,11 @@
#include "core/variant.h" #include "core/variant.h"
struct DictionaryPrivate { struct DictionaryPrivate {
SafeRefCount refcount; SafeRefCount refcount;
OrderedHashMap<Variant, Variant, VariantHasher, VariantComparator> variant_map; OrderedHashMap<Variant, Variant, VariantHasher, VariantComparator> variant_map;
}; };
void Dictionary::get_key_list(List<Variant> *p_keys) const { void Dictionary::get_key_list(List<Variant> *p_keys) const {
if (_p->variant_map.empty()) if (_p->variant_map.empty())
return; return;
@ -51,7 +49,6 @@ void Dictionary::get_key_list(List<Variant> *p_keys) const {
} }
Variant Dictionary::get_key_at_index(int p_index) const { Variant Dictionary::get_key_at_index(int p_index) const {
int index = 0; int index = 0;
for (OrderedHashMap<Variant, Variant, VariantHasher, VariantComparator>::Element E = _p->variant_map.front(); E; E = E.next()) { for (OrderedHashMap<Variant, Variant, VariantHasher, VariantComparator>::Element E = _p->variant_map.front(); E; E = E.next()) {
if (index == p_index) { if (index == p_index) {
@ -64,7 +61,6 @@ Variant Dictionary::get_key_at_index(int p_index) const {
} }
Variant Dictionary::get_value_at_index(int p_index) const { Variant Dictionary::get_value_at_index(int p_index) const {
int index = 0; int index = 0;
for (OrderedHashMap<Variant, Variant, VariantHasher, VariantComparator>::Element E = _p->variant_map.front(); E; E = E.next()) { for (OrderedHashMap<Variant, Variant, VariantHasher, VariantComparator>::Element E = _p->variant_map.front(); E; E = E.next()) {
if (index == p_index) { if (index == p_index) {
@ -77,16 +73,13 @@ Variant Dictionary::get_value_at_index(int p_index) const {
} }
Variant &Dictionary::operator[](const Variant &p_key) { Variant &Dictionary::operator[](const Variant &p_key) {
return _p->variant_map[p_key]; return _p->variant_map[p_key];
} }
const Variant &Dictionary::operator[](const Variant &p_key) const { const Variant &Dictionary::operator[](const Variant &p_key) const {
return _p->variant_map[p_key]; return _p->variant_map[p_key];
} }
const Variant *Dictionary::getptr(const Variant &p_key) const { const Variant *Dictionary::getptr(const Variant &p_key) const {
OrderedHashMap<Variant, Variant, VariantHasher, VariantComparator>::ConstElement E = ((const OrderedHashMap<Variant, Variant, VariantHasher, VariantComparator> *)&_p->variant_map)->find(p_key); OrderedHashMap<Variant, Variant, VariantHasher, VariantComparator>::ConstElement E = ((const OrderedHashMap<Variant, Variant, VariantHasher, VariantComparator> *)&_p->variant_map)->find(p_key);
if (!E) if (!E)
@ -95,7 +88,6 @@ const Variant *Dictionary::getptr(const Variant &p_key) const {
} }
Variant *Dictionary::getptr(const Variant &p_key) { Variant *Dictionary::getptr(const Variant &p_key) {
OrderedHashMap<Variant, Variant, VariantHasher, VariantComparator>::Element E = _p->variant_map.find(p_key); OrderedHashMap<Variant, Variant, VariantHasher, VariantComparator>::Element E = _p->variant_map.find(p_key);
if (!E) if (!E)
@ -104,7 +96,6 @@ Variant *Dictionary::getptr(const Variant &p_key) {
} }
Variant Dictionary::get_valid(const Variant &p_key) const { Variant Dictionary::get_valid(const Variant &p_key) const {
OrderedHashMap<Variant, Variant, VariantHasher, VariantComparator>::ConstElement E = ((const OrderedHashMap<Variant, Variant, VariantHasher, VariantComparator> *)&_p->variant_map)->find(p_key); OrderedHashMap<Variant, Variant, VariantHasher, VariantComparator>::ConstElement E = ((const OrderedHashMap<Variant, Variant, VariantHasher, VariantComparator> *)&_p->variant_map)->find(p_key);
if (!E) if (!E)
@ -122,16 +113,13 @@ Variant Dictionary::get(const Variant &p_key, const Variant &p_default) const {
} }
int Dictionary::size() const { int Dictionary::size() const {
return _p->variant_map.size(); return _p->variant_map.size();
} }
bool Dictionary::empty() const { bool Dictionary::empty() const {
return !_p->variant_map.size(); return !_p->variant_map.size();
} }
bool Dictionary::has(const Variant &p_key) const { bool Dictionary::has(const Variant &p_key) const {
return _p->variant_map.has(p_key); return _p->variant_map.has(p_key);
} }
@ -145,22 +133,18 @@ bool Dictionary::has_all(const Array &p_keys) const {
} }
bool Dictionary::erase(const Variant &p_key) { bool Dictionary::erase(const Variant &p_key) {
return _p->variant_map.erase(p_key); return _p->variant_map.erase(p_key);
} }
bool Dictionary::operator==(const Dictionary &p_dictionary) const { bool Dictionary::operator==(const Dictionary &p_dictionary) const {
return _p == p_dictionary._p; return _p == p_dictionary._p;
} }
bool Dictionary::operator!=(const Dictionary &p_dictionary) const { bool Dictionary::operator!=(const Dictionary &p_dictionary) const {
return _p != p_dictionary._p; return _p != p_dictionary._p;
} }
void Dictionary::_ref(const Dictionary &p_from) const { void Dictionary::_ref(const Dictionary &p_from) const {
//make a copy first (thread safe) //make a copy first (thread safe)
if (!p_from._p->refcount.ref()) if (!p_from._p->refcount.ref())
return; // couldn't copy return; // couldn't copy
@ -176,12 +160,10 @@ void Dictionary::_ref(const Dictionary &p_from) const {
} }
void Dictionary::clear() { void Dictionary::clear() {
_p->variant_map.clear(); _p->variant_map.clear();
} }
void Dictionary::_unref() const { void Dictionary::_unref() const {
ERR_FAIL_COND(!_p); ERR_FAIL_COND(!_p);
if (_p->refcount.unref()) { if (_p->refcount.unref()) {
memdelete(_p); memdelete(_p);
@ -189,7 +171,6 @@ void Dictionary::_unref() const {
_p = nullptr; _p = nullptr;
} }
uint32_t Dictionary::hash() const { uint32_t Dictionary::hash() const {
uint32_t h = hash_djb2_one_32(Variant::DICTIONARY); uint32_t h = hash_djb2_one_32(Variant::DICTIONARY);
for (OrderedHashMap<Variant, Variant, VariantHasher, VariantComparator>::Element E = _p->variant_map.front(); E; E = E.next()) { for (OrderedHashMap<Variant, Variant, VariantHasher, VariantComparator>::Element E = _p->variant_map.front(); E; E = E.next()) {
@ -201,7 +182,6 @@ uint32_t Dictionary::hash() const {
} }
Array Dictionary::keys() const { Array Dictionary::keys() const {
Array varr; Array varr;
if (_p->variant_map.empty()) if (_p->variant_map.empty())
return varr; return varr;
@ -218,7 +198,6 @@ Array Dictionary::keys() const {
} }
Array Dictionary::values() const { Array Dictionary::values() const {
Array varr; Array varr;
if (_p->variant_map.empty()) if (_p->variant_map.empty())
return varr; return varr;
@ -235,7 +214,6 @@ Array Dictionary::values() const {
} }
const Variant *Dictionary::next(const Variant *p_key) const { const Variant *Dictionary::next(const Variant *p_key) const {
if (p_key == nullptr) { if (p_key == nullptr) {
// caller wants to get the first element // caller wants to get the first element
if (_p->variant_map.front()) if (_p->variant_map.front())
@ -250,7 +228,6 @@ const Variant *Dictionary::next(const Variant *p_key) const {
} }
Dictionary Dictionary::duplicate(bool p_deep) const { Dictionary Dictionary::duplicate(bool p_deep) const {
Dictionary n; Dictionary n;
for (OrderedHashMap<Variant, Variant, VariantHasher, VariantComparator>::Element E = _p->variant_map.front(); E; E = E.next()) { for (OrderedHashMap<Variant, Variant, VariantHasher, VariantComparator>::Element E = _p->variant_map.front(); E; E = E.next()) {
@ -261,7 +238,6 @@ Dictionary Dictionary::duplicate(bool p_deep) const {
} }
void Dictionary::operator=(const Dictionary &p_dictionary) { void Dictionary::operator=(const Dictionary &p_dictionary) {
_ref(p_dictionary); _ref(p_dictionary);
} }
@ -275,11 +251,9 @@ Dictionary::Dictionary(const Dictionary &p_from) {
} }
Dictionary::Dictionary() { Dictionary::Dictionary() {
_p = memnew(DictionaryPrivate); _p = memnew(DictionaryPrivate);
_p->refcount.init(); _p->refcount.init();
} }
Dictionary::~Dictionary() { Dictionary::~Dictionary() {
_unref(); _unref();
} }

1
core/dictionary.h
View file

@ -40,7 +40,6 @@ class Variant;
struct DictionaryPrivate; struct DictionaryPrivate;
class Dictionary { class Dictionary {
mutable DictionaryPrivate *_p; mutable DictionaryPrivate *_p;
void _ref(const Dictionary &p_from) const; void _ref(const Dictionary &p_from) const;

12
core/engine.cpp
View file

@ -37,12 +37,10 @@
#include "core/version_hash.gen.h" #include "core/version_hash.gen.h"
void Engine::set_iterations_per_second(int p_ips) { void Engine::set_iterations_per_second(int p_ips) {
ERR_FAIL_COND_MSG(p_ips <= 0, "Engine iterations per second must be greater than 0."); ERR_FAIL_COND_MSG(p_ips <= 0, "Engine iterations per second must be greater than 0.");
ips = p_ips; ips = p_ips;
} }
int Engine::get_iterations_per_second() const { int Engine::get_iterations_per_second() const {
return ips; return ips;
} }
@ -65,32 +63,26 @@ int Engine::get_target_fps() const {
} }
uint64_t Engine::get_frames_drawn() { uint64_t Engine::get_frames_drawn() {
return frames_drawn; return frames_drawn;
} }
void Engine::set_frame_delay(uint32_t p_msec) { void Engine::set_frame_delay(uint32_t p_msec) {
_frame_delay = p_msec; _frame_delay = p_msec;
} }
uint32_t Engine::get_frame_delay() const { uint32_t Engine::get_frame_delay() const {
return _frame_delay; return _frame_delay;
} }
void Engine::set_time_scale(float p_scale) { void Engine::set_time_scale(float p_scale) {
_time_scale = p_scale; _time_scale = p_scale;
} }
float Engine::get_time_scale() const { float Engine::get_time_scale() const {
return _time_scale; return _time_scale;
} }
Dictionary Engine::get_version_info() const { Dictionary Engine::get_version_info() const {
Dictionary dict; Dictionary dict;
dict["major"] = VERSION_MAJOR; dict["major"] = VERSION_MAJOR;
dict["minor"] = VERSION_MINOR; dict["minor"] = VERSION_MINOR;
@ -185,25 +177,21 @@ String Engine::get_license_text() const {
} }
void Engine::add_singleton(const Singleton &p_singleton) { void Engine::add_singleton(const Singleton &p_singleton) {
singletons.push_back(p_singleton); singletons.push_back(p_singleton);
singleton_ptrs[p_singleton.name] = p_singleton.ptr; singleton_ptrs[p_singleton.name] = p_singleton.ptr;
} }
Object *Engine::get_singleton_object(const String &p_name) const { Object *Engine::get_singleton_object(const String &p_name) const {
const Map<StringName, Object *>::Element *E = singleton_ptrs.find(p_name); const Map<StringName, Object *>::Element *E = singleton_ptrs.find(p_name);
ERR_FAIL_COND_V_MSG(!E, nullptr, "Failed to retrieve non-existent singleton '" + p_name + "'."); ERR_FAIL_COND_V_MSG(!E, nullptr, "Failed to retrieve non-existent singleton '" + p_name + "'.");
return E->get(); return E->get();
}; };
bool Engine::has_singleton(const String &p_name) const { bool Engine::has_singleton(const String &p_name) const {
return singleton_ptrs.has(p_name); return singleton_ptrs.has(p_name);
}; };
void Engine::get_singletons(List<Singleton> *p_singletons) { void Engine::get_singletons(List<Singleton> *p_singletons) {
for (List<Singleton>::Element *E = singletons.front(); E; E = E->next()) for (List<Singleton>::Element *E = singletons.front(); E; E = E->next())
p_singletons->push_back(E->get()); p_singletons->push_back(E->get());
} }

1
core/engine.h
View file

@ -37,7 +37,6 @@
#include "core/vector.h" #include "core/vector.h"
class Engine { class Engine {
public: public:
struct Singleton { struct Singleton {
StringName name; StringName name;

7
core/error_macros.cpp
View file

@ -37,7 +37,6 @@
static ErrorHandlerList *error_handler_list = nullptr; static ErrorHandlerList *error_handler_list = nullptr;
void add_error_handler(ErrorHandlerList *p_handler) { void add_error_handler(ErrorHandlerList *p_handler) {
_global_lock(); _global_lock();
p_handler->next = error_handler_list; p_handler->next = error_handler_list;
error_handler_list = p_handler; error_handler_list = p_handler;
@ -45,16 +44,13 @@ void add_error_handler(ErrorHandlerList *p_handler) {
} }
void remove_error_handler(ErrorHandlerList *p_handler) { void remove_error_handler(ErrorHandlerList *p_handler) {
_global_lock(); _global_lock();
ErrorHandlerList *prev = nullptr; ErrorHandlerList *prev = nullptr;
ErrorHandlerList *l = error_handler_list; ErrorHandlerList *l = error_handler_list;
while (l) { while (l) {
if (l == p_handler) { if (l == p_handler) {
if (prev) if (prev)
prev->next = l->next; prev->next = l->next;
else else
@ -77,13 +73,11 @@ void _err_print_error(const char *p_function, const char *p_file, int p_line, co
} }
void _err_print_error(const char *p_function, const char *p_file, int p_line, const char *p_error, const char *p_message, ErrorHandlerType p_type) { void _err_print_error(const char *p_function, const char *p_file, int p_line, const char *p_error, const char *p_message, ErrorHandlerType p_type) {
OS::get_singleton()->print_error(p_function, p_file, p_line, p_error, p_message, (Logger::ErrorType)p_type); OS::get_singleton()->print_error(p_function, p_file, p_line, p_error, p_message, (Logger::ErrorType)p_type);
_global_lock(); _global_lock();
ErrorHandlerList *l = error_handler_list; ErrorHandlerList *l = error_handler_list;
while (l) { while (l) {
l->errfunc(l->userdata, p_function, p_file, p_line, p_error, p_message, p_type); l->errfunc(l->userdata, p_function, p_file, p_line, p_error, p_message, p_type);
l = l->next; l = l->next;
} }
@ -104,7 +98,6 @@ void _err_print_error(const char *p_function, const char *p_file, int p_line, co
} }
void _err_print_index_error(const char *p_function, const char *p_file, int p_line, int64_t p_index, int64_t p_size, const char *p_index_str, const char *p_size_str, const char *p_message, bool fatal) { void _err_print_index_error(const char *p_function, const char *p_file, int p_line, int64_t p_index, int64_t p_size, const char *p_index_str, const char *p_size_str, const char *p_message, bool fatal) {
String fstr(fatal ? "FATAL: " : ""); String fstr(fatal ? "FATAL: " : "");
String err(fstr + "Index " + p_index_str + " = " + itos(p_index) + " is out of bounds (" + p_size_str + " = " + itos(p_size) + ")."); String err(fstr + "Index " + p_index_str + " = " + itos(p_index) + " is out of bounds (" + p_size_str + " = " + itos(p_size) + ").");
_err_print_error(p_function, p_file, p_line, err.utf8().get_data(), p_message); _err_print_error(p_function, p_file, p_line, err.utf8().get_data(), p_message);

1
core/error_macros.h
View file

@ -47,7 +47,6 @@ enum ErrorHandlerType {
typedef void (*ErrorHandlerFunc)(void *, const char *, const char *, int p_line, const char *, const char *, ErrorHandlerType p_type); typedef void (*ErrorHandlerFunc)(void *, const char *, const char *, int p_line, const char *, const char *, ErrorHandlerType p_type);
struct ErrorHandlerList { struct ErrorHandlerList {
ErrorHandlerFunc errfunc = nullptr; ErrorHandlerFunc errfunc = nullptr;
void *userdata = nullptr; void *userdata = nullptr;

5
core/func_ref.cpp
View file

@ -31,7 +31,6 @@
#include "func_ref.h" #include "func_ref.h"
Variant FuncRef::call_func(const Variant **p_args, int p_argcount, Callable::CallError &r_error) { Variant FuncRef::call_func(const Variant **p_args, int p_argcount, Callable::CallError &r_error) {
if (id.is_null()) { if (id.is_null()) {
r_error.error = Callable::CallError::CALL_ERROR_INSTANCE_IS_NULL; r_error.error = Callable::CallError::CALL_ERROR_INSTANCE_IS_NULL;
return Variant(); return Variant();
@ -47,7 +46,6 @@ Variant FuncRef::call_func(const Variant **p_args, int p_argcount, Callable::Cal
} }
Variant FuncRef::call_funcv(const Array &p_args) { Variant FuncRef::call_funcv(const Array &p_args) {
ERR_FAIL_COND_V(id.is_null(), Variant()); ERR_FAIL_COND_V(id.is_null(), Variant());
Object *obj = ObjectDB::get_instance(id); Object *obj = ObjectDB::get_instance(id);
@ -58,13 +56,11 @@ Variant FuncRef::call_funcv(const Array &p_args) {
} }
void FuncRef::set_instance(Object *p_obj) { void FuncRef::set_instance(Object *p_obj) {
ERR_FAIL_NULL(p_obj); ERR_FAIL_NULL(p_obj);
id = p_obj->get_instance_id(); id = p_obj->get_instance_id();
} }
void FuncRef::set_function(const StringName &p_func) { void FuncRef::set_function(const StringName &p_func) {
function = p_func; function = p_func;
} }
@ -80,7 +76,6 @@ bool FuncRef::is_valid() const {
} }
void FuncRef::_bind_methods() { void FuncRef::_bind_methods() {
{ {
MethodInfo mi; MethodInfo mi;
mi.name = "call_func"; mi.name = "call_func";

1
core/func_ref.h
View file

@ -34,7 +34,6 @@
#include "core/reference.h" #include "core/reference.h"
class FuncRef : public Reference { class FuncRef : public Reference {
GDCLASS(FuncRef, Reference); GDCLASS(FuncRef, Reference);
ObjectID id; ObjectID id;
StringName function; StringName function;

7
core/global_constants.cpp
View file

@ -36,7 +36,6 @@
#include "core/variant.h" #include "core/variant.h"
struct _GlobalConstant { struct _GlobalConstant {
#ifdef DEBUG_METHODS_ENABLED #ifdef DEBUG_METHODS_ENABLED
StringName enum_name; StringName enum_name;
#endif #endif
@ -638,33 +637,27 @@ void register_global_constants() {
} }
void unregister_global_constants() { void unregister_global_constants() {
_global_constants.clear(); _global_constants.clear();
} }
int GlobalConstants::get_global_constant_count() { int GlobalConstants::get_global_constant_count() {
return _global_constants.size(); return _global_constants.size();
} }
#ifdef DEBUG_METHODS_ENABLED #ifdef DEBUG_METHODS_ENABLED
StringName GlobalConstants::get_global_constant_enum(int p_idx) { StringName GlobalConstants::get_global_constant_enum(int p_idx) {
return _global_constants[p_idx].enum_name; return _global_constants[p_idx].enum_name;
} }
#else #else
StringName GlobalConstants::get_global_constant_enum(int p_idx) { StringName GlobalConstants::get_global_constant_enum(int p_idx) {
return StringName(); return StringName();
} }
#endif #endif
const char *GlobalConstants::get_global_constant_name(int p_idx) { const char *GlobalConstants::get_global_constant_name(int p_idx) {
return _global_constants[p_idx].name; return _global_constants[p_idx].name;
} }
int GlobalConstants::get_global_constant_value(int p_idx) { int GlobalConstants::get_global_constant_value(int p_idx) {
return _global_constants[p_idx].value; return _global_constants[p_idx].value;
} }

46
core/hash_map.h
View file

@ -59,7 +59,6 @@ template <class TKey, class TData, class Hasher = HashMapHasherDefault, class Co
class HashMap { class HashMap {
public: public:
struct Pair { struct Pair {
TKey key; TKey key;
TData data; TData data;
@ -99,7 +98,6 @@ private:
uint32_t elements = 0; uint32_t elements = 0;
void make_hash_table() { void make_hash_table() {
ERR_FAIL_COND(hash_table); ERR_FAIL_COND(hash_table);
hash_table = memnew_arr(Element *, (1 << MIN_HASH_TABLE_POWER)); hash_table = memnew_arr(Element *, (1 << MIN_HASH_TABLE_POWER));
@ -111,7 +109,6 @@ private:
} }
void erase_hash_table() { void erase_hash_table() {
ERR_FAIL_COND_MSG(elements, "Cannot erase hash table if there are still elements inside."); ERR_FAIL_COND_MSG(elements, "Cannot erase hash table if there are still elements inside.");
memdelete_arr(hash_table); memdelete_arr(hash_table);
@ -121,7 +118,6 @@ private:
} }
void check_hash_table() { void check_hash_table() {
int new_hash_table_power = -1; int new_hash_table_power = -1;
if ((int)elements > ((1 << hash_table_power) * RELATIONSHIP)) { if ((int)elements > ((1 << hash_table_power) * RELATIONSHIP)) {
@ -129,17 +125,14 @@ private:
new_hash_table_power = hash_table_power + 1; new_hash_table_power = hash_table_power + 1;
while ((int)elements > ((1 << new_hash_table_power) * RELATIONSHIP)) { while ((int)elements > ((1 << new_hash_table_power) * RELATIONSHIP)) {
new_hash_table_power++; new_hash_table_power++;
} }
} else if ((hash_table_power > (int)MIN_HASH_TABLE_POWER) && ((int)elements < ((1 << (hash_table_power - 1)) * RELATIONSHIP))) { } else if ((hash_table_power > (int)MIN_HASH_TABLE_POWER) && ((int)elements < ((1 << (hash_table_power - 1)) * RELATIONSHIP))) {
/* rehash down */ /* rehash down */
new_hash_table_power = hash_table_power - 1; new_hash_table_power = hash_table_power - 1;
while ((int)elements < ((1 << (new_hash_table_power - 1)) * RELATIONSHIP)) { while ((int)elements < ((1 << (new_hash_table_power - 1)) * RELATIONSHIP)) {
new_hash_table_power--; new_hash_table_power--;
} }
@ -154,15 +147,12 @@ private:
ERR_FAIL_COND_MSG(!new_hash_table, "Out of memory."); ERR_FAIL_COND_MSG(!new_hash_table, "Out of memory.");
for (int i = 0; i < (1 << new_hash_table_power); i++) { for (int i = 0; i < (1 << new_hash_table_power); i++) {
new_hash_table[i] = nullptr; new_hash_table[i] = nullptr;
} }
if (hash_table) { if (hash_table) {
for (int i = 0; i < (1 << hash_table_power); i++) { for (int i = 0; i < (1 << hash_table_power); i++) {
while (hash_table[i]) { while (hash_table[i]) {
Element *se = hash_table[i]; Element *se = hash_table[i];
hash_table[i] = se->next; hash_table[i] = se->next;
int new_pos = se->hash & ((1 << new_hash_table_power) - 1); int new_pos = se->hash & ((1 << new_hash_table_power) - 1);
@ -179,17 +169,14 @@ private:
/* I want to have only one function.. */ /* I want to have only one function.. */
_FORCE_INLINE_ const Element *get_element(const TKey &p_key) const { _FORCE_INLINE_ const Element *get_element(const TKey &p_key) const {
uint32_t hash = Hasher::hash(p_key); uint32_t hash = Hasher::hash(p_key);
uint32_t index = hash & ((1 << hash_table_power) - 1); uint32_t index = hash & ((1 << hash_table_power) - 1);
Element *e = hash_table[index]; Element *e = hash_table[index];
while (e) { while (e) {
/* checking hash first avoids comparing key, which may take longer */ /* checking hash first avoids comparing key, which may take longer */
if (e->hash == hash && Comparator::compare(e->pair.key, p_key)) { if (e->hash == hash && Comparator::compare(e->pair.key, p_key)) {
/* the pair exists in this hashtable, so just update data */ /* the pair exists in this hashtable, so just update data */
return e; return e;
} }
@ -201,7 +188,6 @@ private:
} }
Element *create_element(const TKey &p_key) { Element *create_element(const TKey &p_key) {
/* if element doesn't exist, create it */ /* if element doesn't exist, create it */
Element *e = memnew(Element); Element *e = memnew(Element);
ERR_FAIL_COND_V_MSG(!e, nullptr, "Out of memory."); ERR_FAIL_COND_V_MSG(!e, nullptr, "Out of memory.");
@ -219,7 +205,6 @@ private:
} }
void copy_from(const HashMap &p_t) { void copy_from(const HashMap &p_t) {
if (&p_t == this) if (&p_t == this)
return; /* much less bother with that */ return; /* much less bother with that */
@ -233,13 +218,11 @@ private:
elements = p_t.elements; elements = p_t.elements;
for (int i = 0; i < (1 << p_t.hash_table_power); i++) { for (int i = 0; i < (1 << p_t.hash_table_power); i++) {
hash_table[i] = nullptr; hash_table[i] = nullptr;
const Element *e = p_t.hash_table[i]; const Element *e = p_t.hash_table[i];
while (e) { while (e) {
Element *le = memnew(Element); /* local element */ Element *le = memnew(Element); /* local element */
*le = *e; /* copy data */ *le = *e; /* copy data */
@ -259,7 +242,6 @@ public:
} }
Element *set(const Pair &p_pair) { Element *set(const Pair &p_pair) {
Element *e = nullptr; Element *e = nullptr;
if (!hash_table) if (!hash_table)
make_hash_table(); // if no table, make one make_hash_table(); // if no table, make one
@ -269,7 +251,6 @@ public:
/* if we made it up to here, the pair doesn't exist, create and assign */ /* if we made it up to here, the pair doesn't exist, create and assign */
if (!e) { if (!e) {
e = create_element(p_pair.key); e = create_element(p_pair.key);
if (!e) if (!e)
return nullptr; return nullptr;
@ -281,7 +262,6 @@ public:
} }
bool has(const TKey &p_key) const { bool has(const TKey &p_key) const {
return getptr(p_key) != nullptr; return getptr(p_key) != nullptr;
} }
@ -292,14 +272,12 @@ public:
*/ */
const TData &get(const TKey &p_key) const { const TData &get(const TKey &p_key) const {
const TData *res = getptr(p_key); const TData *res = getptr(p_key);
ERR_FAIL_COND_V(!res, *res); ERR_FAIL_COND_V(!res, *res);
return *res; return *res;
} }
TData &get(const TKey &p_key) { TData &get(const TKey &p_key) {
TData *res = getptr(p_key); TData *res = getptr(p_key);
ERR_FAIL_COND_V(!res, *res); ERR_FAIL_COND_V(!res, *res);
return *res; return *res;
@ -311,7 +289,6 @@ public:
*/ */
_FORCE_INLINE_ TData *getptr(const TKey &p_key) { _FORCE_INLINE_ TData *getptr(const TKey &p_key) {
if (unlikely(!hash_table)) if (unlikely(!hash_table))
return nullptr; return nullptr;
@ -324,7 +301,6 @@ public:
} }
_FORCE_INLINE_ const TData *getptr(const TKey &p_key) const { _FORCE_INLINE_ const TData *getptr(const TKey &p_key) const {
if (unlikely(!hash_table)) if (unlikely(!hash_table))
return nullptr; return nullptr;
@ -343,7 +319,6 @@ public:
template <class C> template <class C>
_FORCE_INLINE_ TData *custom_getptr(C p_custom_key, uint32_t p_custom_hash) { _FORCE_INLINE_ TData *custom_getptr(C p_custom_key, uint32_t p_custom_hash) {
if (unlikely(!hash_table)) if (unlikely(!hash_table))
return nullptr; return nullptr;
@ -353,10 +328,8 @@ public:
Element *e = hash_table[index]; Element *e = hash_table[index];
while (e) { while (e) {
/* checking hash first avoids comparing key, which may take longer */ /* checking hash first avoids comparing key, which may take longer */
if (e->hash == hash && Comparator::compare(e->pair.key, p_custom_key)) { if (e->hash == hash && Comparator::compare(e->pair.key, p_custom_key)) {
/* the pair exists in this hashtable, so just update data */ /* the pair exists in this hashtable, so just update data */
return &e->pair.data; return &e->pair.data;
} }
@ -369,7 +342,6 @@ public:
template <class C> template <class C>
_FORCE_INLINE_ const TData *custom_getptr(C p_custom_key, uint32_t p_custom_hash) const { _FORCE_INLINE_ const TData *custom_getptr(C p_custom_key, uint32_t p_custom_hash) const {
if (unlikely(!hash_table)) if (unlikely(!hash_table))
return nullptr; return nullptr;
@ -379,10 +351,8 @@ public:
const Element *e = hash_table[index]; const Element *e = hash_table[index];
while (e) { while (e) {
/* checking hash first avoids comparing key, which may take longer */ /* checking hash first avoids comparing key, which may take longer */
if (e->hash == hash && Comparator::compare(e->pair.key, p_custom_key)) { if (e->hash == hash && Comparator::compare(e->pair.key, p_custom_key)) {
/* the pair exists in this hashtable, so just update data */ /* the pair exists in this hashtable, so just update data */
return &e->pair.data; return &e->pair.data;
} }
@ -398,7 +368,6 @@ public:
*/ */
bool erase(const TKey &p_key) { bool erase(const TKey &p_key) {
if (unlikely(!hash_table)) if (unlikely(!hash_table))
return false; return false;
@ -408,12 +377,9 @@ public:
Element *e = hash_table[index]; Element *e = hash_table[index];
Element *p = nullptr; Element *p = nullptr;
while (e) { while (e) {
/* checking hash first avoids comparing key, which may take longer */ /* checking hash first avoids comparing key, which may take longer */
if (e->hash == hash && Comparator::compare(e->pair.key, p_key)) { if (e->hash == hash && Comparator::compare(e->pair.key, p_key)) {
if (p) { if (p) {
p->next = e->next; p->next = e->next;
} else { } else {
//begin of list //begin of list
@ -451,7 +417,6 @@ public:
/* if we made it up to here, the pair doesn't exist, create */ /* if we made it up to here, the pair doesn't exist, create */
if (!e) { if (!e) {
e = create_element(p_key); e = create_element(p_key);
CRASH_COND(!e); CRASH_COND(!e);
check_hash_table(); // perform mantenience routine check_hash_table(); // perform mantenience routine
@ -476,14 +441,12 @@ public:
* *
*/ */
const TKey *next(const TKey *p_key) const { const TKey *next(const TKey *p_key) const {
if (unlikely(!hash_table)) if (unlikely(!hash_table))
return nullptr; return nullptr;
if (!p_key) { /* get the first key */ if (!p_key) { /* get the first key */
for (int i = 0; i < (1 << hash_table_power); i++) { for (int i = 0; i < (1 << hash_table_power); i++) {
if (hash_table[i]) { if (hash_table[i]) {
return &hash_table[i]->pair.key; return &hash_table[i]->pair.key;
} }
@ -501,7 +464,6 @@ public:
uint32_t index = e->hash & ((1 << hash_table_power) - 1); uint32_t index = e->hash & ((1 << hash_table_power) - 1);
index++; index++;
for (int i = index; i < (1 << hash_table_power); i++) { for (int i = index; i < (1 << hash_table_power); i++) {
if (hash_table[i]) { if (hash_table[i]) {
return &hash_table[i]->pair.key; return &hash_table[i]->pair.key;
} }
@ -515,23 +477,18 @@ public:
} }
inline unsigned int size() const { inline unsigned int size() const {
return elements; return elements;
} }
inline bool empty() const { inline bool empty() const {
return elements == 0; return elements == 0;
} }
void clear() { void clear() {
/* clean up */ /* clean up */
if (hash_table) { if (hash_table) {
for (int i = 0; i < (1 << hash_table_power); i++) { for (int i = 0; i < (1 << hash_table_power); i++) {
while (hash_table[i]) { while (hash_table[i]) {
Element *e = hash_table[i]; Element *e = hash_table[i];
hash_table[i] = e->next; hash_table[i] = e->next;
memdelete(e); memdelete(e);
@ -547,7 +504,6 @@ public:
} }
void operator=(const HashMap &p_table) { void operator=(const HashMap &p_table) {
copy_from(p_table); copy_from(p_table);
} }
@ -555,7 +511,6 @@ public:
if (unlikely(!hash_table)) if (unlikely(!hash_table))
return; return;
for (int i = 0; i < (1 << hash_table_power); i++) { for (int i = 0; i < (1 << hash_table_power); i++) {
Element *e = hash_table[i]; Element *e = hash_table[i];
while (e) { while (e) {
*p_pairs = &e->pair; *p_pairs = &e->pair;
@ -569,7 +524,6 @@ public:
if (unlikely(!hash_table)) if (unlikely(!hash_table))
return; return;
for (int i = 0; i < (1 << hash_table_power); i++) { for (int i = 0; i < (1 << hash_table_power); i++) {
Element *e = hash_table[i]; Element *e = hash_table[i];
while (e) { while (e) {
p_keys->push_back(e->pair.key); p_keys->push_back(e->pair.key);

7
core/hashfuncs.h
View file

@ -49,7 +49,6 @@
* @return 32-bits hashcode * @return 32-bits hashcode
*/ */
static inline uint32_t hash_djb2(const char *p_cstr) { static inline uint32_t hash_djb2(const char *p_cstr) {
const unsigned char *chr = (const unsigned char *)p_cstr; const unsigned char *chr = (const unsigned char *)p_cstr;
uint32_t hash = 5381; uint32_t hash = 5381;
uint32_t c; uint32_t c;
@ -61,7 +60,6 @@ static inline uint32_t hash_djb2(const char *p_cstr) {
} }
static inline uint32_t hash_djb2_buffer(const uint8_t *p_buff, int p_len, uint32_t p_prev = 5381) { static inline uint32_t hash_djb2_buffer(const uint8_t *p_buff, int p_len, uint32_t p_prev = 5381) {
uint32_t hash = p_prev; uint32_t hash = p_prev;
for (int i = 0; i < p_len; i++) for (int i = 0; i < p_len; i++)
@ -71,7 +69,6 @@ static inline uint32_t hash_djb2_buffer(const uint8_t *p_buff, int p_len, uint32
} }
static inline uint32_t hash_djb2_one_32(uint32_t p_in, uint32_t p_prev = 5381) { static inline uint32_t hash_djb2_one_32(uint32_t p_in, uint32_t p_prev = 5381) {
return ((p_prev << 5) + p_prev) + p_in; return ((p_prev << 5) + p_prev) + p_in;
} }
@ -105,7 +102,6 @@ static inline uint32_t hash_djb2_one_float(double p_in, uint32_t p_prev = 5381)
template <class T> template <class T>
static inline uint32_t make_uint32_t(T p_in) { static inline uint32_t make_uint32_t(T p_in) {
union { union {
T t; T t;
uint32_t _u32; uint32_t _u32;
@ -116,13 +112,11 @@ static inline uint32_t make_uint32_t(T p_in) {
} }
static inline uint64_t hash_djb2_one_64(uint64_t p_in, uint64_t p_prev = 5381) { static inline uint64_t hash_djb2_one_64(uint64_t p_in, uint64_t p_prev = 5381) {
return ((p_prev << 5) + p_prev) + p_in; return ((p_prev << 5) + p_prev) + p_in;
} }
template <class T> template <class T>
static inline uint64_t make_uint64_t(T p_in) { static inline uint64_t make_uint64_t(T p_in) {
union { union {
T t; T t;
uint64_t _u64; uint64_t _u64;
@ -134,7 +128,6 @@ static inline uint64_t make_uint64_t(T p_in) {
} }
struct HashMapHasherDefault { struct HashMapHasherDefault {
static _FORCE_INLINE_ uint32_t hash(const String &p_string) { return p_string.hash(); } static _FORCE_INLINE_ uint32_t hash(const String &p_string) { return p_string.hash(); }
static _FORCE_INLINE_ uint32_t hash(const char *p_cstr) { return hash_djb2(p_cstr); } static _FORCE_INLINE_ uint32_t hash(const char *p_cstr) { return hash_djb2(p_cstr); }
static _FORCE_INLINE_ uint32_t hash(const uint64_t p_int) { return hash_one_uint64(p_int); } static _FORCE_INLINE_ uint32_t hash(const uint64_t p_int) { return hash_one_uint64(p_int); }

209
core/image.cpp
View file

File diff suppressed because it is too large Load diff

77
core/input/input.cpp
View file

@ -129,7 +129,6 @@ Input::CursorShape (*Input::get_current_cursor_shape_func)() = nullptr;
void (*Input::set_custom_mouse_cursor_func)(const RES &, Input::CursorShape, const Vector2 &) = nullptr; void (*Input::set_custom_mouse_cursor_func)(const RES &, Input::CursorShape, const Vector2 &) = nullptr;
Input *Input::get_singleton() { Input *Input::get_singleton() {
return singleton; return singleton;
} }
@ -139,12 +138,10 @@ void Input::set_mouse_mode(MouseMode p_mode) {
} }
Input::MouseMode Input::get_mouse_mode() const { Input::MouseMode Input::get_mouse_mode() const {
return get_mouse_mode_func(); return get_mouse_mode_func();
} }
void Input::_bind_methods() { void Input::_bind_methods() {
ClassDB::bind_method(D_METHOD("is_key_pressed", "keycode"), &Input::is_key_pressed); ClassDB::bind_method(D_METHOD("is_key_pressed", "keycode"), &Input::is_key_pressed);
ClassDB::bind_method(D_METHOD("is_mouse_button_pressed", "button"), &Input::is_mouse_button_pressed); ClassDB::bind_method(D_METHOD("is_mouse_button_pressed", "button"), &Input::is_mouse_button_pressed);
ClassDB::bind_method(D_METHOD("is_joy_button_pressed", "device", "button"), &Input::is_joy_button_pressed); ClassDB::bind_method(D_METHOD("is_joy_button_pressed", "device", "button"), &Input::is_joy_button_pressed);
@ -219,7 +216,6 @@ void Input::get_argument_options(const StringName &p_function, int p_idx, List<S
String pf = p_function; String pf = p_function;
if (p_idx == 0 && (pf == "is_action_pressed" || pf == "action_press" || pf == "action_release" || pf == "is_action_just_pressed" || pf == "is_action_just_released" || pf == "get_action_strength")) { if (p_idx == 0 && (pf == "is_action_pressed" || pf == "action_press" || pf == "action_release" || pf == "is_action_just_pressed" || pf == "is_action_just_released" || pf == "get_action_strength")) {
List<PropertyInfo> pinfo; List<PropertyInfo> pinfo;
ProjectSettings::get_singleton()->get_property_list(&pinfo); ProjectSettings::get_singleton()->get_property_list(&pinfo);
@ -237,7 +233,6 @@ void Input::get_argument_options(const StringName &p_function, int p_idx, List<S
} }
void Input::SpeedTrack::update(const Vector2 &p_delta_p) { void Input::SpeedTrack::update(const Vector2 &p_delta_p) {
uint64_t tick = OS::get_singleton()->get_ticks_usec(); uint64_t tick = OS::get_singleton()->get_ticks_usec();
uint32_t tdiff = tick - last_tick; uint32_t tdiff = tick - last_tick;
float delta_t = tdiff / 1000000.0; float delta_t = tdiff / 1000000.0;
@ -250,7 +245,6 @@ void Input::SpeedTrack::update(const Vector2 &p_delta_p) {
accum_t = max_ref_frame * 10; accum_t = max_ref_frame * 10;
while (accum_t >= min_ref_frame) { while (accum_t >= min_ref_frame) {
float slice_t = min_ref_frame / accum_t; float slice_t = min_ref_frame / accum_t;
Vector2 slice = accum * slice_t; Vector2 slice = accum * slice_t;
accum = accum - slice; accum = accum - slice;
@ -267,42 +261,35 @@ void Input::SpeedTrack::reset() {
} }
Input::SpeedTrack::SpeedTrack() { Input::SpeedTrack::SpeedTrack() {
min_ref_frame = 0.1; min_ref_frame = 0.1;
max_ref_frame = 0.3; max_ref_frame = 0.3;
reset(); reset();
} }
bool Input::is_key_pressed(int p_keycode) const { bool Input::is_key_pressed(int p_keycode) const {
_THREAD_SAFE_METHOD_ _THREAD_SAFE_METHOD_
return keys_pressed.has(p_keycode); return keys_pressed.has(p_keycode);
} }
bool Input::is_mouse_button_pressed(int p_button) const { bool Input::is_mouse_button_pressed(int p_button) const {
_THREAD_SAFE_METHOD_ _THREAD_SAFE_METHOD_
return (mouse_button_mask & (1 << (p_button - 1))) != 0; return (mouse_button_mask & (1 << (p_button - 1))) != 0;
} }
static int _combine_device(int p_value, int p_device) { static int _combine_device(int p_value, int p_device) {
return p_value | (p_device << 20); return p_value | (p_device << 20);
} }
bool Input::is_joy_button_pressed(int p_device, int p_button) const { bool Input::is_joy_button_pressed(int p_device, int p_button) const {
_THREAD_SAFE_METHOD_ _THREAD_SAFE_METHOD_
return joy_buttons_pressed.has(_combine_device(p_button, p_device)); return joy_buttons_pressed.has(_combine_device(p_button, p_device));
} }
bool Input::is_action_pressed(const StringName &p_action) const { bool Input::is_action_pressed(const StringName &p_action) const {
return action_state.has(p_action) && action_state[p_action].pressed; return action_state.has(p_action) && action_state[p_action].pressed;
} }
bool Input::is_action_just_pressed(const StringName &p_action) const { bool Input::is_action_just_pressed(const StringName &p_action) const {
const Map<StringName, Action>::Element *E = action_state.find(p_action); const Map<StringName, Action>::Element *E = action_state.find(p_action);
if (!E) if (!E)
return false; return false;
@ -315,7 +302,6 @@ bool Input::is_action_just_pressed(const StringName &p_action) const {
} }
bool Input::is_action_just_released(const StringName &p_action) const { bool Input::is_action_just_released(const StringName &p_action) const {
const Map<StringName, Action>::Element *E = action_state.find(p_action); const Map<StringName, Action>::Element *E = action_state.find(p_action);
if (!E) if (!E)
return false; return false;
@ -336,7 +322,6 @@ float Input::get_action_strength(const StringName &p_action) const {
} }
float Input::get_joy_axis(int p_device, int p_axis) const { float Input::get_joy_axis(int p_device, int p_axis) const {
_THREAD_SAFE_METHOD_ _THREAD_SAFE_METHOD_
int c = _combine_device(p_axis, p_device); int c = _combine_device(p_axis, p_device);
if (_joy_axis.has(c)) { if (_joy_axis.has(c)) {
@ -347,7 +332,6 @@ float Input::get_joy_axis(int p_device, int p_axis) const {
} }
String Input::get_joy_name(int p_idx) { String Input::get_joy_name(int p_idx) {
_THREAD_SAFE_METHOD_ _THREAD_SAFE_METHOD_
return joy_names[p_idx].name; return joy_names[p_idx].name;
}; };
@ -377,7 +361,6 @@ float Input::get_joy_vibration_duration(int p_device) {
} }
static String _hex_str(uint8_t p_byte) { static String _hex_str(uint8_t p_byte) {
static const char *dict = "0123456789abcdef"; static const char *dict = "0123456789abcdef";
char ret[3]; char ret[3];
ret[2] = 0; ret[2] = 0;
@ -389,14 +372,12 @@ static String _hex_str(uint8_t p_byte) {
}; };
void Input::joy_connection_changed(int p_idx, bool p_connected, String p_name, String p_guid) { void Input::joy_connection_changed(int p_idx, bool p_connected, String p_name, String p_guid) {
_THREAD_SAFE_METHOD_ _THREAD_SAFE_METHOD_
Joypad js; Joypad js;
js.name = p_connected ? p_name : ""; js.name = p_connected ? p_name : "";
js.uid = p_connected ? p_guid : ""; js.uid = p_connected ? p_guid : "";
if (p_connected) { if (p_connected) {
String uidname = p_guid; String uidname = p_guid;
if (p_guid == "") { if (p_guid == "") {
int uidlen = MIN(p_name.length(), 16); int uidlen = MIN(p_name.length(), 16);
@ -430,36 +411,30 @@ void Input::joy_connection_changed(int p_idx, bool p_connected, String p_name, S
}; };
Vector3 Input::get_gravity() const { Vector3 Input::get_gravity() const {
_THREAD_SAFE_METHOD_ _THREAD_SAFE_METHOD_
return gravity; return gravity;
} }
Vector3 Input::get_accelerometer() const { Vector3 Input::get_accelerometer() const {
_THREAD_SAFE_METHOD_ _THREAD_SAFE_METHOD_
return accelerometer; return accelerometer;
} }
Vector3 Input::get_magnetometer() const { Vector3 Input::get_magnetometer() const {
_THREAD_SAFE_METHOD_ _THREAD_SAFE_METHOD_
return magnetometer; return magnetometer;
} }
Vector3 Input::get_gyroscope() const { Vector3 Input::get_gyroscope() const {
_THREAD_SAFE_METHOD_ _THREAD_SAFE_METHOD_
return gyroscope; return gyroscope;
} }
void Input::parse_input_event(const Ref<InputEvent> &p_event) { void Input::parse_input_event(const Ref<InputEvent> &p_event) {
_parse_input_event_impl(p_event, false); _parse_input_event_impl(p_event, false);
} }
void Input::_parse_input_event_impl(const Ref<InputEvent> &p_event, bool p_is_emulated) { void Input::_parse_input_event_impl(const Ref<InputEvent> &p_event, bool p_is_emulated) {
// Notes on mouse-touch emulation: // Notes on mouse-touch emulation:
// - Emulated mouse events are parsed, that is, re-routed to this method, so they make the same effects // - Emulated mouse events are parsed, that is, re-routed to this method, so they make the same effects
// as true mouse events. The only difference is the situation is flagged as emulated so they are not // as true mouse events. The only difference is the situation is flagged as emulated so they are not
@ -480,7 +455,6 @@ void Input::_parse_input_event_impl(const Ref<InputEvent> &p_event, bool p_is_em
Ref<InputEventMouseButton> mb = p_event; Ref<InputEventMouseButton> mb = p_event;
if (mb.is_valid()) { if (mb.is_valid()) {
if (mb->is_pressed()) { if (mb->is_pressed()) {
mouse_button_mask |= (1 << (mb->get_button_index() - 1)); mouse_button_mask |= (1 << (mb->get_button_index() - 1));
} else { } else {
@ -504,7 +478,6 @@ void Input::_parse_input_event_impl(const Ref<InputEvent> &p_event, bool p_is_em
Ref<InputEventMouseMotion> mm = p_event; Ref<InputEventMouseMotion> mm = p_event;
if (mm.is_valid()) { if (mm.is_valid()) {
Point2 pos = mm->get_global_position(); Point2 pos = mm->get_global_position();
if (mouse_pos != pos) { if (mouse_pos != pos) {
set_mouse_position(pos); set_mouse_position(pos);
@ -525,7 +498,6 @@ void Input::_parse_input_event_impl(const Ref<InputEvent> &p_event, bool p_is_em
Ref<InputEventScreenTouch> st = p_event; Ref<InputEventScreenTouch> st = p_event;
if (st.is_valid()) { if (st.is_valid()) {
if (st->is_pressed()) { if (st->is_pressed()) {
SpeedTrack &track = touch_speed_track[st->get_index()]; SpeedTrack &track = touch_speed_track[st->get_index()];
track.reset(); track.reset();
@ -536,7 +508,6 @@ void Input::_parse_input_event_impl(const Ref<InputEvent> &p_event, bool p_is_em
} }
if (emulate_mouse_from_touch) { if (emulate_mouse_from_touch) {
bool translate = false; bool translate = false;
if (st->is_pressed()) { if (st->is_pressed()) {
if (mouse_from_touch_index == -1) { if (mouse_from_touch_index == -1) {
@ -573,13 +544,11 @@ void Input::_parse_input_event_impl(const Ref<InputEvent> &p_event, bool p_is_em
Ref<InputEventScreenDrag> sd = p_event; Ref<InputEventScreenDrag> sd = p_event;
if (sd.is_valid()) { if (sd.is_valid()) {
SpeedTrack &track = touch_speed_track[sd->get_index()]; SpeedTrack &track = touch_speed_track[sd->get_index()];
track.update(sd->get_relative()); track.update(sd->get_relative());
sd->set_speed(track.speed); sd->set_speed(track.speed);
if (emulate_mouse_from_touch && sd->get_index() == mouse_from_touch_index) { if (emulate_mouse_from_touch && sd->get_index() == mouse_from_touch_index) {
Ref<InputEventMouseMotion> motion_event; Ref<InputEventMouseMotion> motion_event;
motion_event.instance(); motion_event.instance();
@ -597,7 +566,6 @@ void Input::_parse_input_event_impl(const Ref<InputEvent> &p_event, bool p_is_em
Ref<InputEventJoypadButton> jb = p_event; Ref<InputEventJoypadButton> jb = p_event;
if (jb.is_valid()) { if (jb.is_valid()) {
int c = _combine_device(jb->get_button_index(), jb->get_device()); int c = _combine_device(jb->get_button_index(), jb->get_device());
if (jb->is_pressed()) if (jb->is_pressed())
@ -615,7 +583,6 @@ void Input::_parse_input_event_impl(const Ref<InputEvent> &p_event, bool p_is_em
Ref<InputEventGesture> ge = p_event; Ref<InputEventGesture> ge = p_event;
if (ge.is_valid()) { if (ge.is_valid()) {
if (event_dispatch_function) { if (event_dispatch_function) {
event_dispatch_function(ge); event_dispatch_function(ge);
} }
@ -623,7 +590,6 @@ void Input::_parse_input_event_impl(const Ref<InputEvent> &p_event, bool p_is_em
for (const Map<StringName, InputMap::Action>::Element *E = InputMap::get_singleton()->get_action_map().front(); E; E = E->next()) { for (const Map<StringName, InputMap::Action>::Element *E = InputMap::get_singleton()->get_action_map().front(); E; E = E->next()) {
if (InputMap::get_singleton()->event_is_action(p_event, E->key())) { if (InputMap::get_singleton()->event_is_action(p_event, E->key())) {
// Save the action's state // Save the action's state
if (!p_event->is_echo() && is_action_pressed(E->key()) != p_event->is_action_pressed(E->key())) { if (!p_event->is_echo() && is_action_pressed(E->key()) != p_event->is_action_pressed(E->key())) {
Action action; Action action;
@ -642,7 +608,6 @@ void Input::_parse_input_event_impl(const Ref<InputEvent> &p_event, bool p_is_em
} }
void Input::set_joy_axis(int p_device, int p_axis, float p_value) { void Input::set_joy_axis(int p_device, int p_axis, float p_value) {
_THREAD_SAFE_METHOD_ _THREAD_SAFE_METHOD_
int c = _combine_device(p_axis, p_device); int c = _combine_device(p_axis, p_device);
_joy_axis[c] = p_value; _joy_axis[c] = p_value;
@ -676,50 +641,42 @@ void Input::vibrate_handheld(int p_duration_ms) {
} }
void Input::set_gravity(const Vector3 &p_gravity) { void Input::set_gravity(const Vector3 &p_gravity) {
_THREAD_SAFE_METHOD_ _THREAD_SAFE_METHOD_
gravity = p_gravity; gravity = p_gravity;
} }
void Input::set_accelerometer(const Vector3 &p_accel) { void Input::set_accelerometer(const Vector3 &p_accel) {
_THREAD_SAFE_METHOD_ _THREAD_SAFE_METHOD_
accelerometer = p_accel; accelerometer = p_accel;
} }
void Input::set_magnetometer(const Vector3 &p_magnetometer) { void Input::set_magnetometer(const Vector3 &p_magnetometer) {
_THREAD_SAFE_METHOD_ _THREAD_SAFE_METHOD_
magnetometer = p_magnetometer; magnetometer = p_magnetometer;
} }
void Input::set_gyroscope(const Vector3 &p_gyroscope) { void Input::set_gyroscope(const Vector3 &p_gyroscope) {
_THREAD_SAFE_METHOD_ _THREAD_SAFE_METHOD_
gyroscope = p_gyroscope; gyroscope = p_gyroscope;
} }
void Input::set_mouse_position(const Point2 &p_posf) { void Input::set_mouse_position(const Point2 &p_posf) {
mouse_speed_track.update(p_posf - mouse_pos); mouse_speed_track.update(p_posf - mouse_pos);
mouse_pos = p_posf; mouse_pos = p_posf;
} }
Point2 Input::get_mouse_position() const { Point2 Input::get_mouse_position() const {
return mouse_pos; return mouse_pos;
} }
Point2 Input::get_last_mouse_speed() const { Point2 Input::get_last_mouse_speed() const {
return mouse_speed_track.speed; return mouse_speed_track.speed;
} }
int Input::get_mouse_button_mask() const { int Input::get_mouse_button_mask() const {
return mouse_button_mask; // do not trust OS implementation, should remove it - OS::get_singleton()->get_mouse_button_state(); return mouse_button_mask; // do not trust OS implementation, should remove it - OS::get_singleton()->get_mouse_button_state();
} }
@ -728,7 +685,6 @@ void Input::warp_mouse_position(const Vector2 &p_to) {
} }
Point2i Input::warp_mouse_motion(const Ref<InputEventMouseMotion> &p_motion, const Rect2 &p_rect) { Point2i Input::warp_mouse_motion(const Ref<InputEventMouseMotion> &p_motion, const Rect2 &p_rect) {
// The relative distance reported for the next event after a warp is in the boundaries of the // The relative distance reported for the next event after a warp is in the boundaries of the
// size of the rect on that axis, but it may be greater, in which case there's not problem as fmod() // size of the rect on that axis, but it may be greater, in which case there's not problem as fmod()
// will warp it, but if the pointer has moved in the opposite direction between the pointer relocation // will warp it, but if the pointer has moved in the opposite direction between the pointer relocation
@ -757,7 +713,6 @@ void Input::iteration(float p_step) {
} }
void Input::action_press(const StringName &p_action, float p_strength) { void Input::action_press(const StringName &p_action, float p_strength) {
Action action; Action action;
action.physics_frame = Engine::get_singleton()->get_physics_frames(); action.physics_frame = Engine::get_singleton()->get_physics_frames();
@ -769,7 +724,6 @@ void Input::action_press(const StringName &p_action, float p_strength) {
} }
void Input::action_release(const StringName &p_action) { void Input::action_release(const StringName &p_action) {
Action action; Action action;
action.physics_frame = Engine::get_singleton()->get_physics_frames(); action.physics_frame = Engine::get_singleton()->get_physics_frames();
@ -781,19 +735,16 @@ void Input::action_release(const StringName &p_action) {
} }
void Input::set_emulate_touch_from_mouse(bool p_emulate) { void Input::set_emulate_touch_from_mouse(bool p_emulate) {
emulate_touch_from_mouse = p_emulate; emulate_touch_from_mouse = p_emulate;
} }
bool Input::is_emulating_touch_from_mouse() const { bool Input::is_emulating_touch_from_mouse() const {
return emulate_touch_from_mouse; return emulate_touch_from_mouse;
} }
// Calling this whenever the game window is focused helps unstucking the "touch mouse" // Calling this whenever the game window is focused helps unstucking the "touch mouse"
// if the OS or its abstraction class hasn't properly reported that touch pointers raised // if the OS or its abstraction class hasn't properly reported that touch pointers raised
void Input::ensure_touch_mouse_raised() { void Input::ensure_touch_mouse_raised() {
if (mouse_from_touch_index != -1) { if (mouse_from_touch_index != -1) {
mouse_from_touch_index = -1; mouse_from_touch_index = -1;
@ -812,22 +763,18 @@ void Input::ensure_touch_mouse_raised() {
} }
void Input::set_emulate_mouse_from_touch(bool p_emulate) { void Input::set_emulate_mouse_from_touch(bool p_emulate) {
emulate_mouse_from_touch = p_emulate; emulate_mouse_from_touch = p_emulate;
} }
bool Input::is_emulating_mouse_from_touch() const { bool Input::is_emulating_mouse_from_touch() const {
return emulate_mouse_from_touch; return emulate_mouse_from_touch;
} }
Input::CursorShape Input::get_default_cursor_shape() const { Input::CursorShape Input::get_default_cursor_shape() const {
return default_shape; return default_shape;
} }
void Input::set_default_cursor_shape(CursorShape p_shape) { void Input::set_default_cursor_shape(CursorShape p_shape) {
if (default_shape == p_shape) if (default_shape == p_shape)
return; return;
@ -842,7 +789,6 @@ void Input::set_default_cursor_shape(CursorShape p_shape) {
} }
Input::CursorShape Input::get_current_cursor_shape() const { Input::CursorShape Input::get_current_cursor_shape() const {
return get_current_cursor_shape_func(); return get_current_cursor_shape_func();
} }
@ -867,7 +813,6 @@ void Input::accumulate_input_event(const Ref<InputEvent> &p_event) {
accumulated_events.push_back(p_event); accumulated_events.push_back(p_event);
} }
void Input::flush_accumulated_events() { void Input::flush_accumulated_events() {
while (accumulated_events.front()) { while (accumulated_events.front()) {
parse_input_event(accumulated_events.front()->get()); parse_input_event(accumulated_events.front()->get());
accumulated_events.pop_front(); accumulated_events.pop_front();
@ -875,12 +820,10 @@ void Input::flush_accumulated_events() {
} }
void Input::set_use_accumulated_input(bool p_enable) { void Input::set_use_accumulated_input(bool p_enable) {
use_accumulated_input = p_enable; use_accumulated_input = p_enable;
} }
void Input::release_pressed_events() { void Input::release_pressed_events() {
flush_accumulated_events(); // this is needed to release actions strengths flush_accumulated_events(); // this is needed to release actions strengths
keys_pressed.clear(); keys_pressed.clear();
@ -898,7 +841,6 @@ void Input::set_event_dispatch_function(EventDispatchFunc p_function) {
} }
void Input::joy_button(int p_device, int p_button, bool p_pressed) { void Input::joy_button(int p_device, int p_button, bool p_pressed) {
_THREAD_SAFE_METHOD_; _THREAD_SAFE_METHOD_;
Joypad &joy = joy_names[p_device]; Joypad &joy = joy_names[p_device];
//printf("got button %i, mapping is %i\n", p_button, joy.mapping); //printf("got button %i, mapping is %i\n", p_button, joy.mapping);
@ -925,7 +867,6 @@ void Input::joy_button(int p_device, int p_button, bool p_pressed) {
} }
void Input::joy_axis(int p_device, int p_axis, const JoyAxis &p_value) { void Input::joy_axis(int p_device, int p_axis, const JoyAxis &p_value) {
_THREAD_SAFE_METHOD_; _THREAD_SAFE_METHOD_;
ERR_FAIL_INDEX(p_axis, JOY_AXIS_MAX); ERR_FAIL_INDEX(p_axis, JOY_AXIS_MAX);
@ -937,13 +878,10 @@ void Input::joy_axis(int p_device, int p_axis, const JoyAxis &p_value) {
} }
if (p_value.value > joy.last_axis[p_axis]) { if (p_value.value > joy.last_axis[p_axis]) {
if (p_value.value < joy.last_axis[p_axis] + joy.filter) { if (p_value.value < joy.last_axis[p_axis] + joy.filter) {
return; return;
} }
} else if (p_value.value > joy.last_axis[p_axis] - joy.filter) { } else if (p_value.value > joy.last_axis[p_axis] - joy.filter) {
return; return;
} }
@ -972,7 +910,6 @@ void Input::joy_axis(int p_device, int p_axis, const JoyAxis &p_value) {
JoyEvent map = _get_mapped_axis_event(map_db[joy.mapping], p_axis, p_value); JoyEvent map = _get_mapped_axis_event(map_db[joy.mapping], p_axis, p_value);
if (map.type == TYPE_BUTTON) { if (map.type == TYPE_BUTTON) {
if (map.index == JOY_BUTTON_DPAD_UP || map.index == JOY_BUTTON_DPAD_DOWN) { if (map.index == JOY_BUTTON_DPAD_UP || map.index == JOY_BUTTON_DPAD_DOWN) {
bool pressed = p_value.value != 0.0f; bool pressed = p_value.value != 0.0f;
int button = p_value.value < 0 ? JOY_BUTTON_DPAD_UP : JOY_BUTTON_DPAD_DOWN; int button = p_value.value < 0 ? JOY_BUTTON_DPAD_UP : JOY_BUTTON_DPAD_DOWN;
@ -1023,7 +960,6 @@ void Input::joy_axis(int p_device, int p_axis, const JoyAxis &p_value) {
} }
if (map.type == TYPE_AXIS) { if (map.type == TYPE_AXIS) {
_axis_event(p_device, map.index, map.value); _axis_event(p_device, map.index, map.value);
return; return;
} }
@ -1031,7 +967,6 @@ void Input::joy_axis(int p_device, int p_axis, const JoyAxis &p_value) {
} }
void Input::joy_hat(int p_device, int p_val) { void Input::joy_hat(int p_device, int p_val) {
_THREAD_SAFE_METHOD_; _THREAD_SAFE_METHOD_;
const Joypad &joy = joy_names[p_device]; const Joypad &joy = joy_names[p_device];
@ -1077,7 +1012,6 @@ void Input::joy_hat(int p_device, int p_val) {
} }
void Input::_button_event(int p_device, int p_index, bool p_pressed) { void Input::_button_event(int p_device, int p_index, bool p_pressed) {
Ref<InputEventJoypadButton> ievent; Ref<InputEventJoypadButton> ievent;
ievent.instance(); ievent.instance();
ievent->set_device(p_device); ievent->set_device(p_device);
@ -1088,7 +1022,6 @@ void Input::_button_event(int p_device, int p_index, bool p_pressed) {
} }
void Input::_axis_event(int p_device, int p_axis, float p_value) { void Input::_axis_event(int p_device, int p_axis, float p_value) {
Ref<InputEventJoypadMotion> ievent; Ref<InputEventJoypadMotion> ievent;
ievent.instance(); ievent.instance();
ievent->set_device(p_device); ievent->set_device(p_device);
@ -1099,7 +1032,6 @@ void Input::_axis_event(int p_device, int p_axis, float p_value) {
}; };
Input::JoyEvent Input::_get_mapped_button_event(const JoyDeviceMapping &mapping, int p_button) { Input::JoyEvent Input::_get_mapped_button_event(const JoyDeviceMapping &mapping, int p_button) {
JoyEvent event; JoyEvent event;
event.type = TYPE_MAX; event.type = TYPE_MAX;
@ -1123,7 +1055,6 @@ Input::JoyEvent Input::_get_mapped_button_event(const JoyDeviceMapping &mapping,
} }
Input::JoyEvent Input::_get_mapped_axis_event(const JoyDeviceMapping &mapping, int p_axis, const JoyAxis &p_value) { Input::JoyEvent Input::_get_mapped_axis_event(const JoyDeviceMapping &mapping, int p_axis, const JoyAxis &p_value) {
JoyEvent event; JoyEvent event;
event.type = TYPE_MAX; event.type = TYPE_MAX;
@ -1180,11 +1111,9 @@ Input::JoyEvent Input::_get_mapped_axis_event(const JoyDeviceMapping &mapping, i
} }
void Input::_get_mapped_hat_events(const JoyDeviceMapping &mapping, int p_hat, JoyEvent r_events[]) { void Input::_get_mapped_hat_events(const JoyDeviceMapping &mapping, int p_hat, JoyEvent r_events[]) {
for (int i = 0; i < mapping.bindings.size(); i++) { for (int i = 0; i < mapping.bindings.size(); i++) {
const JoyBinding binding = mapping.bindings[i]; const JoyBinding binding = mapping.bindings[i];
if (binding.inputType == TYPE_HAT && binding.input.hat.hat == p_hat) { if (binding.inputType == TYPE_HAT && binding.input.hat.hat == p_hat) {
int index; int index;
switch (binding.input.hat.hat_mask) { switch (binding.input.hat.hat_mask) {
case HAT_MASK_UP: case HAT_MASK_UP:
@ -1220,7 +1149,6 @@ void Input::_get_mapped_hat_events(const JoyDeviceMapping &mapping, int p_hat, J
} }
JoyButtonList Input::_get_output_button(String output) { JoyButtonList Input::_get_output_button(String output) {
for (int i = 0; _joy_buttons[i]; i++) { for (int i = 0; _joy_buttons[i]; i++) {
if (output == _joy_buttons[i]) if (output == _joy_buttons[i])
return JoyButtonList(i); return JoyButtonList(i);
@ -1229,7 +1157,6 @@ JoyButtonList Input::_get_output_button(String output) {
} }
JoyAxisList Input::_get_output_axis(String output) { JoyAxisList Input::_get_output_axis(String output) {
for (int i = 0; _joy_axes[i]; i++) { for (int i = 0; _joy_axes[i]; i++) {
if (output == _joy_axes[i]) if (output == _joy_axes[i])
return JoyAxisList(i); return JoyAxisList(i);
@ -1238,7 +1165,6 @@ JoyAxisList Input::_get_output_axis(String output) {
} }
void Input::parse_mapping(String p_mapping) { void Input::parse_mapping(String p_mapping) {
_THREAD_SAFE_METHOD_; _THREAD_SAFE_METHOD_;
JoyDeviceMapping mapping; JoyDeviceMapping mapping;
@ -1255,7 +1181,6 @@ void Input::parse_mapping(String p_mapping) {
int idx = 1; int idx = 1;
while (++idx < entry.size()) { while (++idx < entry.size()) {
if (entry[idx] == "") if (entry[idx] == "")
continue; continue;
@ -1361,7 +1286,6 @@ void Input::remove_joy_mapping(String p_guid) {
} }
void Input::set_fallback_mapping(String p_guid) { void Input::set_fallback_mapping(String p_guid) {
for (int i = 0; i < map_db.size(); i++) { for (int i = 0; i < map_db.size(); i++) {
if (map_db[i].uid == p_guid) { if (map_db[i].uid == p_guid) {
fallback_mapping = i; fallback_mapping = i;
@ -1431,7 +1355,6 @@ int Input::get_joy_axis_index_from_string(String p_axis) {
} }
Input::Input() { Input::Input() {
singleton = this; singleton = this;
// Parse default mappings. // Parse default mappings.

1
core/input/input.h
View file

@ -128,7 +128,6 @@ private:
int mouse_from_touch_index = -1; int mouse_from_touch_index = -1;
struct SpeedTrack { struct SpeedTrack {
uint64_t last_tick; uint64_t last_tick;
Vector2 speed; Vector2 speed;
Vector2 accum; Vector2 accum;

140
core/input/input_event.cpp
View file

@ -45,26 +45,22 @@ int InputEvent::get_device() const {
} }
bool InputEvent::is_action(const StringName &p_action) const { bool InputEvent::is_action(const StringName &p_action) const {
return InputMap::get_singleton()->event_is_action(Ref<InputEvent>((InputEvent *)this), p_action); return InputMap::get_singleton()->event_is_action(Ref<InputEvent>((InputEvent *)this), p_action);
} }
bool InputEvent::is_action_pressed(const StringName &p_action, bool p_allow_echo) const { bool InputEvent::is_action_pressed(const StringName &p_action, bool p_allow_echo) const {
bool pressed; bool pressed;
bool valid = InputMap::get_singleton()->event_get_action_status(Ref<InputEvent>((InputEvent *)this), p_action, &pressed); bool valid = InputMap::get_singleton()->event_get_action_status(Ref<InputEvent>((InputEvent *)this), p_action, &pressed);
return valid && pressed && (p_allow_echo || !is_echo()); return valid && pressed && (p_allow_echo || !is_echo());
} }
bool InputEvent::is_action_released(const StringName &p_action) const { bool InputEvent::is_action_released(const StringName &p_action) const {
bool pressed; bool pressed;
bool valid = InputMap::get_singleton()->event_get_action_status(Ref<InputEvent>((InputEvent *)this), p_action, &pressed); bool valid = InputMap::get_singleton()->event_get_action_status(Ref<InputEvent>((InputEvent *)this), p_action, &pressed);
return valid && !pressed; return valid && !pressed;
} }
float InputEvent::get_action_strength(const StringName &p_action) const { float InputEvent::get_action_strength(const StringName &p_action) const {
bool pressed; bool pressed;
float strength; float strength;
bool valid = InputMap::get_singleton()->event_get_action_status(Ref<InputEvent>((InputEvent *)this), p_action, &pressed, &strength); bool valid = InputMap::get_singleton()->event_get_action_status(Ref<InputEvent>((InputEvent *)this), p_action, &pressed, &strength);
@ -72,42 +68,34 @@ float InputEvent::get_action_strength(const StringName &p_action) const {
} }
bool InputEvent::is_pressed() const { bool InputEvent::is_pressed() const {
return false; return false;
} }
bool InputEvent::is_echo() const { bool InputEvent::is_echo() const {
return false; return false;
} }
Ref<InputEvent> InputEvent::xformed_by(const Transform2D &p_xform, const Vector2 &p_local_ofs) const { Ref<InputEvent> InputEvent::xformed_by(const Transform2D &p_xform, const Vector2 &p_local_ofs) const {
return Ref<InputEvent>((InputEvent *)this); return Ref<InputEvent>((InputEvent *)this);
} }
String InputEvent::as_text() const { String InputEvent::as_text() const {
return String(); return String();
} }
bool InputEvent::action_match(const Ref<InputEvent> &p_event, bool *p_pressed, float *p_strength, float p_deadzone) const { bool InputEvent::action_match(const Ref<InputEvent> &p_event, bool *p_pressed, float *p_strength, float p_deadzone) const {
return false; return false;
} }
bool InputEvent::shortcut_match(const Ref<InputEvent> &p_event) const { bool InputEvent::shortcut_match(const Ref<InputEvent> &p_event) const {
return false; return false;
} }
bool InputEvent::is_action_type() const { bool InputEvent::is_action_type() const {
return false; return false;
} }
void InputEvent::_bind_methods() { void InputEvent::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_device", "device"), &InputEvent::set_device); ClassDB::bind_method(D_METHOD("set_device", "device"), &InputEvent::set_device);
ClassDB::bind_method(D_METHOD("get_device"), &InputEvent::get_device); ClassDB::bind_method(D_METHOD("get_device"), &InputEvent::get_device);
@ -135,7 +123,6 @@ void InputEvent::_bind_methods() {
/////////////////////////////////// ///////////////////////////////////
void InputEventFromWindow::_bind_methods() { void InputEventFromWindow::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_window_id", "id"), &InputEventFromWindow::set_window_id); ClassDB::bind_method(D_METHOD("set_window_id", "id"), &InputEventFromWindow::set_window_id);
ClassDB::bind_method(D_METHOD("get_window_id"), &InputEventFromWindow::get_window_id); ClassDB::bind_method(D_METHOD("get_window_id"), &InputEventFromWindow::get_window_id);
ADD_PROPERTY(PropertyInfo(Variant::INT, "window_id"), "set_window_id", "get_window_id"); ADD_PROPERTY(PropertyInfo(Variant::INT, "window_id"), "set_window_id", "get_window_id");
@ -151,53 +138,42 @@ int64_t InputEventFromWindow::get_window_id() const {
/////////////////////////////////// ///////////////////////////////////
void InputEventWithModifiers::set_shift(bool p_enabled) { void InputEventWithModifiers::set_shift(bool p_enabled) {
shift = p_enabled; shift = p_enabled;
} }
bool InputEventWithModifiers::get_shift() const { bool InputEventWithModifiers::get_shift() const {
return shift; return shift;
} }
void InputEventWithModifiers::set_alt(bool p_enabled) { void InputEventWithModifiers::set_alt(bool p_enabled) {
alt = p_enabled; alt = p_enabled;
} }
bool InputEventWithModifiers::get_alt() const { bool InputEventWithModifiers::get_alt() const {
return alt; return alt;
} }
void InputEventWithModifiers::set_control(bool p_enabled) { void InputEventWithModifiers::set_control(bool p_enabled) {
control = p_enabled; control = p_enabled;
} }
bool InputEventWithModifiers::get_control() const { bool InputEventWithModifiers::get_control() const {
return control; return control;
} }
void InputEventWithModifiers::set_metakey(bool p_enabled) { void InputEventWithModifiers::set_metakey(bool p_enabled) {
meta = p_enabled; meta = p_enabled;
} }
bool InputEventWithModifiers::get_metakey() const { bool InputEventWithModifiers::get_metakey() const {
return meta; return meta;
} }
void InputEventWithModifiers::set_command(bool p_enabled) { void InputEventWithModifiers::set_command(bool p_enabled) {
command = p_enabled; command = p_enabled;
} }
bool InputEventWithModifiers::get_command() const { bool InputEventWithModifiers::get_command() const {
return command; return command;
} }
void InputEventWithModifiers::set_modifiers_from_event(const InputEventWithModifiers *event) { void InputEventWithModifiers::set_modifiers_from_event(const InputEventWithModifiers *event) {
set_alt(event->get_alt()); set_alt(event->get_alt());
set_shift(event->get_shift()); set_shift(event->get_shift());
set_control(event->get_control()); set_control(event->get_control());
@ -205,7 +181,6 @@ void InputEventWithModifiers::set_modifiers_from_event(const InputEventWithModif
} }
void InputEventWithModifiers::_bind_methods() { void InputEventWithModifiers::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_alt", "enable"), &InputEventWithModifiers::set_alt); ClassDB::bind_method(D_METHOD("set_alt", "enable"), &InputEventWithModifiers::set_alt);
ClassDB::bind_method(D_METHOD("get_alt"), &InputEventWithModifiers::get_alt); ClassDB::bind_method(D_METHOD("get_alt"), &InputEventWithModifiers::get_alt);
@ -231,57 +206,46 @@ void InputEventWithModifiers::_bind_methods() {
/////////////////////////////////// ///////////////////////////////////
void InputEventKey::set_pressed(bool p_pressed) { void InputEventKey::set_pressed(bool p_pressed) {
pressed = p_pressed; pressed = p_pressed;
} }
bool InputEventKey::is_pressed() const { bool InputEventKey::is_pressed() const {
return pressed; return pressed;
} }
void InputEventKey::set_keycode(uint32_t p_keycode) { void InputEventKey::set_keycode(uint32_t p_keycode) {
keycode = p_keycode; keycode = p_keycode;
} }
uint32_t InputEventKey::get_keycode() const { uint32_t InputEventKey::get_keycode() const {
return keycode; return keycode;
} }
void InputEventKey::set_physical_keycode(uint32_t p_keycode) { void InputEventKey::set_physical_keycode(uint32_t p_keycode) {
physical_keycode = p_keycode; physical_keycode = p_keycode;
} }
uint32_t InputEventKey::get_physical_keycode() const { uint32_t InputEventKey::get_physical_keycode() const {
return physical_keycode; return physical_keycode;
} }
void InputEventKey::set_unicode(uint32_t p_unicode) { void InputEventKey::set_unicode(uint32_t p_unicode) {
unicode = p_unicode; unicode = p_unicode;
} }
uint32_t InputEventKey::get_unicode() const { uint32_t InputEventKey::get_unicode() const {
return unicode; return unicode;
} }
void InputEventKey::set_echo(bool p_enable) { void InputEventKey::set_echo(bool p_enable) {
echo = p_enable; echo = p_enable;
} }
bool InputEventKey::is_echo() const { bool InputEventKey::is_echo() const {
return echo; return echo;
} }
uint32_t InputEventKey::get_keycode_with_modifiers() const { uint32_t InputEventKey::get_keycode_with_modifiers() const {
uint32_t sc = keycode; uint32_t sc = keycode;
if (get_control()) if (get_control())
sc |= KEY_MASK_CTRL; sc |= KEY_MASK_CTRL;
@ -296,7 +260,6 @@ uint32_t InputEventKey::get_keycode_with_modifiers() const {
} }
uint32_t InputEventKey::get_physical_keycode_with_modifiers() const { uint32_t InputEventKey::get_physical_keycode_with_modifiers() const {
uint32_t sc = physical_keycode; uint32_t sc = physical_keycode;
if (get_control()) if (get_control())
sc |= KEY_MASK_CTRL; sc |= KEY_MASK_CTRL;
@ -311,7 +274,6 @@ uint32_t InputEventKey::get_physical_keycode_with_modifiers() const {
} }
String InputEventKey::as_text() const { String InputEventKey::as_text() const {
String kc = keycode_get_string(keycode); String kc = keycode_get_string(keycode);
if (kc == String()) if (kc == String())
return kc; return kc;
@ -332,7 +294,6 @@ String InputEventKey::as_text() const {
} }
bool InputEventKey::action_match(const Ref<InputEvent> &p_event, bool *p_pressed, float *p_strength, float p_deadzone) const { bool InputEventKey::action_match(const Ref<InputEvent> &p_event, bool *p_pressed, float *p_strength, float p_deadzone) const {
Ref<InputEventKey> key = p_event; Ref<InputEventKey> key = p_event;
if (key.is_null()) if (key.is_null())
return false; return false;
@ -359,7 +320,6 @@ bool InputEventKey::action_match(const Ref<InputEvent> &p_event, bool *p_pressed
} }
bool InputEventKey::shortcut_match(const Ref<InputEvent> &p_event) const { bool InputEventKey::shortcut_match(const Ref<InputEvent> &p_event) const {
Ref<InputEventKey> key = p_event; Ref<InputEventKey> key = p_event;
if (key.is_null()) if (key.is_null())
return false; return false;
@ -371,7 +331,6 @@ bool InputEventKey::shortcut_match(const Ref<InputEvent> &p_event) const {
} }
void InputEventKey::_bind_methods() { void InputEventKey::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_pressed", "pressed"), &InputEventKey::set_pressed); ClassDB::bind_method(D_METHOD("set_pressed", "pressed"), &InputEventKey::set_pressed);
ClassDB::bind_method(D_METHOD("set_keycode", "keycode"), &InputEventKey::set_keycode); ClassDB::bind_method(D_METHOD("set_keycode", "keycode"), &InputEventKey::set_keycode);
@ -398,34 +357,27 @@ void InputEventKey::_bind_methods() {
/////////////////////////////////// ///////////////////////////////////
void InputEventMouse::set_button_mask(int p_mask) { void InputEventMouse::set_button_mask(int p_mask) {
button_mask = p_mask; button_mask = p_mask;
} }
int InputEventMouse::get_button_mask() const { int InputEventMouse::get_button_mask() const {
return button_mask; return button_mask;
} }
void InputEventMouse::set_position(const Vector2 &p_pos) { void InputEventMouse::set_position(const Vector2 &p_pos) {
pos = p_pos; pos = p_pos;
} }
Vector2 InputEventMouse::get_position() const { Vector2 InputEventMouse::get_position() const {
return pos; return pos;
} }
void InputEventMouse::set_global_position(const Vector2 &p_global_pos) { void InputEventMouse::set_global_position(const Vector2 &p_global_pos) {
global_pos = p_global_pos; global_pos = p_global_pos;
} }
Vector2 InputEventMouse::get_global_position() const { Vector2 InputEventMouse::get_global_position() const {
return global_pos; return global_pos;
} }
void InputEventMouse::_bind_methods() { void InputEventMouse::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_button_mask", "button_mask"), &InputEventMouse::set_button_mask); ClassDB::bind_method(D_METHOD("set_button_mask", "button_mask"), &InputEventMouse::set_button_mask);
ClassDB::bind_method(D_METHOD("get_button_mask"), &InputEventMouse::get_button_mask); ClassDB::bind_method(D_METHOD("get_button_mask"), &InputEventMouse::get_button_mask);
@ -443,44 +395,35 @@ void InputEventMouse::_bind_methods() {
/////////////////////////////////// ///////////////////////////////////
void InputEventMouseButton::set_factor(float p_factor) { void InputEventMouseButton::set_factor(float p_factor) {
factor = p_factor; factor = p_factor;
} }
float InputEventMouseButton::get_factor() const { float InputEventMouseButton::get_factor() const {
return factor; return factor;
} }
void InputEventMouseButton::set_button_index(int p_index) { void InputEventMouseButton::set_button_index(int p_index) {
button_index = p_index; button_index = p_index;
} }
int InputEventMouseButton::get_button_index() const { int InputEventMouseButton::get_button_index() const {
return button_index; return button_index;
} }
void InputEventMouseButton::set_pressed(bool p_pressed) { void InputEventMouseButton::set_pressed(bool p_pressed) {
pressed = p_pressed; pressed = p_pressed;
} }
bool InputEventMouseButton::is_pressed() const { bool InputEventMouseButton::is_pressed() const {
return pressed; return pressed;
} }
void InputEventMouseButton::set_doubleclick(bool p_doubleclick) { void InputEventMouseButton::set_doubleclick(bool p_doubleclick) {
doubleclick = p_doubleclick; doubleclick = p_doubleclick;
} }
bool InputEventMouseButton::is_doubleclick() const { bool InputEventMouseButton::is_doubleclick() const {
return doubleclick; return doubleclick;
} }
Ref<InputEvent> InputEventMouseButton::xformed_by(const Transform2D &p_xform, const Vector2 &p_local_ofs) const { Ref<InputEvent> InputEventMouseButton::xformed_by(const Transform2D &p_xform, const Vector2 &p_local_ofs) const {
Vector2 g = get_global_position(); Vector2 g = get_global_position();
Vector2 l = p_xform.xform(get_position() + p_local_ofs); Vector2 l = p_xform.xform(get_position() + p_local_ofs);
@ -504,7 +447,6 @@ Ref<InputEvent> InputEventMouseButton::xformed_by(const Transform2D &p_xform, co
} }
bool InputEventMouseButton::action_match(const Ref<InputEvent> &p_event, bool *p_pressed, float *p_strength, float p_deadzone) const { bool InputEventMouseButton::action_match(const Ref<InputEvent> &p_event, bool *p_pressed, float *p_strength, float p_deadzone) const {
Ref<InputEventMouseButton> mb = p_event; Ref<InputEventMouseButton> mb = p_event;
if (mb.is_null()) if (mb.is_null())
return false; return false;
@ -521,7 +463,6 @@ bool InputEventMouseButton::action_match(const Ref<InputEvent> &p_event, bool *p
} }
String InputEventMouseButton::as_text() const { String InputEventMouseButton::as_text() const {
String button_index_string = ""; String button_index_string = "";
switch (get_button_index()) { switch (get_button_index()) {
case BUTTON_LEFT: case BUTTON_LEFT:
@ -559,7 +500,6 @@ String InputEventMouseButton::as_text() const {
} }
void InputEventMouseButton::_bind_methods() { void InputEventMouseButton::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_factor", "factor"), &InputEventMouseButton::set_factor); ClassDB::bind_method(D_METHOD("set_factor", "factor"), &InputEventMouseButton::set_factor);
ClassDB::bind_method(D_METHOD("get_factor"), &InputEventMouseButton::get_factor); ClassDB::bind_method(D_METHOD("get_factor"), &InputEventMouseButton::get_factor);
@ -581,47 +521,38 @@ void InputEventMouseButton::_bind_methods() {
/////////////////////////////////// ///////////////////////////////////
void InputEventMouseMotion::set_tilt(const Vector2 &p_tilt) { void InputEventMouseMotion::set_tilt(const Vector2 &p_tilt) {
tilt = p_tilt; tilt = p_tilt;
} }
Vector2 InputEventMouseMotion::get_tilt() const { Vector2 InputEventMouseMotion::get_tilt() const {
return tilt; return tilt;
} }
void InputEventMouseMotion::set_pressure(float p_pressure) { void InputEventMouseMotion::set_pressure(float p_pressure) {
pressure = p_pressure; pressure = p_pressure;
} }
float InputEventMouseMotion::get_pressure() const { float InputEventMouseMotion::get_pressure() const {
return pressure; return pressure;
} }
void InputEventMouseMotion::set_relative(const Vector2 &p_relative) { void InputEventMouseMotion::set_relative(const Vector2 &p_relative) {
relative = p_relative; relative = p_relative;
} }
Vector2 InputEventMouseMotion::get_relative() const { Vector2 InputEventMouseMotion::get_relative() const {
return relative; return relative;
} }
void InputEventMouseMotion::set_speed(const Vector2 &p_speed) { void InputEventMouseMotion::set_speed(const Vector2 &p_speed) {
speed = p_speed; speed = p_speed;
} }
Vector2 InputEventMouseMotion::get_speed() const { Vector2 InputEventMouseMotion::get_speed() const {
return speed; return speed;
} }
Ref<InputEvent> InputEventMouseMotion::xformed_by(const Transform2D &p_xform, const Vector2 &p_local_ofs) const { Ref<InputEvent> InputEventMouseMotion::xformed_by(const Transform2D &p_xform, const Vector2 &p_local_ofs) const {
Vector2 g = get_global_position(); Vector2 g = get_global_position();
Vector2 l = p_xform.xform(get_position() + p_local_ofs); Vector2 l = p_xform.xform(get_position() + p_local_ofs);
Vector2 r = p_xform.basis_xform(get_relative()); Vector2 r = p_xform.basis_xform(get_relative());
@ -648,7 +579,6 @@ Ref<InputEvent> InputEventMouseMotion::xformed_by(const Transform2D &p_xform, co
} }
String InputEventMouseMotion::as_text() const { String InputEventMouseMotion::as_text() const {
String button_mask_string = ""; String button_mask_string = "";
switch (get_button_mask()) { switch (get_button_mask()) {
case BUTTON_MASK_LEFT: case BUTTON_MASK_LEFT:
@ -674,7 +604,6 @@ String InputEventMouseMotion::as_text() const {
} }
bool InputEventMouseMotion::accumulate(const Ref<InputEvent> &p_event) { bool InputEventMouseMotion::accumulate(const Ref<InputEvent> &p_event) {
Ref<InputEventMouseMotion> motion = p_event; Ref<InputEventMouseMotion> motion = p_event;
if (motion.is_null()) if (motion.is_null())
return false; return false;
@ -716,7 +645,6 @@ bool InputEventMouseMotion::accumulate(const Ref<InputEvent> &p_event) {
} }
void InputEventMouseMotion::_bind_methods() { void InputEventMouseMotion::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_tilt", "tilt"), &InputEventMouseMotion::set_tilt); ClassDB::bind_method(D_METHOD("set_tilt", "tilt"), &InputEventMouseMotion::set_tilt);
ClassDB::bind_method(D_METHOD("get_tilt"), &InputEventMouseMotion::get_tilt); ClassDB::bind_method(D_METHOD("get_tilt"), &InputEventMouseMotion::get_tilt);
@ -738,32 +666,26 @@ void InputEventMouseMotion::_bind_methods() {
/////////////////////////////////// ///////////////////////////////////
void InputEventJoypadMotion::set_axis(int p_axis) { void InputEventJoypadMotion::set_axis(int p_axis) {
axis = p_axis; axis = p_axis;
} }
int InputEventJoypadMotion::get_axis() const { int InputEventJoypadMotion::get_axis() const {
return axis; return axis;
} }
void InputEventJoypadMotion::set_axis_value(float p_value) { void InputEventJoypadMotion::set_axis_value(float p_value) {
axis_value = p_value; axis_value = p_value;
} }
float InputEventJoypadMotion::get_axis_value() const { float InputEventJoypadMotion::get_axis_value() const {
return axis_value; return axis_value;
} }
bool InputEventJoypadMotion::is_pressed() const { bool InputEventJoypadMotion::is_pressed() const {
return Math::abs(axis_value) >= 0.5f; return Math::abs(axis_value) >= 0.5f;
} }
bool InputEventJoypadMotion::action_match(const Ref<InputEvent> &p_event, bool *p_pressed, float *p_strength, float p_deadzone) const { bool InputEventJoypadMotion::action_match(const Ref<InputEvent> &p_event, bool *p_pressed, float *p_strength, float p_deadzone) const {
Ref<InputEventJoypadMotion> jm = p_event; Ref<InputEventJoypadMotion> jm = p_event;
if (jm.is_null()) if (jm.is_null())
return false; return false;
@ -790,12 +712,10 @@ bool InputEventJoypadMotion::action_match(const Ref<InputEvent> &p_event, bool *
} }
String InputEventJoypadMotion::as_text() const { String InputEventJoypadMotion::as_text() const {
return "InputEventJoypadMotion : axis=" + itos(axis) + ", axis_value=" + String(Variant(axis_value)); return "InputEventJoypadMotion : axis=" + itos(axis) + ", axis_value=" + String(Variant(axis_value));
} }
void InputEventJoypadMotion::_bind_methods() { void InputEventJoypadMotion::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_axis", "axis"), &InputEventJoypadMotion::set_axis); ClassDB::bind_method(D_METHOD("set_axis", "axis"), &InputEventJoypadMotion::set_axis);
ClassDB::bind_method(D_METHOD("get_axis"), &InputEventJoypadMotion::get_axis); ClassDB::bind_method(D_METHOD("get_axis"), &InputEventJoypadMotion::get_axis);
@ -809,35 +729,28 @@ void InputEventJoypadMotion::_bind_methods() {
/////////////////////////////////// ///////////////////////////////////
void InputEventJoypadButton::set_button_index(int p_index) { void InputEventJoypadButton::set_button_index(int p_index) {
button_index = p_index; button_index = p_index;
} }
int InputEventJoypadButton::get_button_index() const { int InputEventJoypadButton::get_button_index() const {
return button_index; return button_index;
} }
void InputEventJoypadButton::set_pressed(bool p_pressed) { void InputEventJoypadButton::set_pressed(bool p_pressed) {
pressed = p_pressed; pressed = p_pressed;
} }
bool InputEventJoypadButton::is_pressed() const { bool InputEventJoypadButton::is_pressed() const {
return pressed; return pressed;
} }
void InputEventJoypadButton::set_pressure(float p_pressure) { void InputEventJoypadButton::set_pressure(float p_pressure) {
pressure = p_pressure; pressure = p_pressure;
} }
float InputEventJoypadButton::get_pressure() const { float InputEventJoypadButton::get_pressure() const {
return pressure; return pressure;
} }
bool InputEventJoypadButton::action_match(const Ref<InputEvent> &p_event, bool *p_pressed, float *p_strength, float p_deadzone) const { bool InputEventJoypadButton::action_match(const Ref<InputEvent> &p_event, bool *p_pressed, float *p_strength, float p_deadzone) const {
Ref<InputEventJoypadButton> jb = p_event; Ref<InputEventJoypadButton> jb = p_event;
if (jb.is_null()) if (jb.is_null())
return false; return false;
@ -854,7 +767,6 @@ bool InputEventJoypadButton::action_match(const Ref<InputEvent> &p_event, bool *
} }
bool InputEventJoypadButton::shortcut_match(const Ref<InputEvent> &p_event) const { bool InputEventJoypadButton::shortcut_match(const Ref<InputEvent> &p_event) const {
Ref<InputEventJoypadButton> button = p_event; Ref<InputEventJoypadButton> button = p_event;
if (button.is_null()) if (button.is_null())
return false; return false;
@ -863,12 +775,10 @@ bool InputEventJoypadButton::shortcut_match(const Ref<InputEvent> &p_event) cons
} }
String InputEventJoypadButton::as_text() const { String InputEventJoypadButton::as_text() const {
return "InputEventJoypadButton : button_index=" + itos(button_index) + ", pressed=" + (pressed ? "true" : "false") + ", pressure=" + String(Variant(pressure)); return "InputEventJoypadButton : button_index=" + itos(button_index) + ", pressed=" + (pressed ? "true" : "false") + ", pressure=" + String(Variant(pressure));
} }
void InputEventJoypadButton::_bind_methods() { void InputEventJoypadButton::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_button_index", "button_index"), &InputEventJoypadButton::set_button_index); ClassDB::bind_method(D_METHOD("set_button_index", "button_index"), &InputEventJoypadButton::set_button_index);
ClassDB::bind_method(D_METHOD("get_button_index"), &InputEventJoypadButton::get_button_index); ClassDB::bind_method(D_METHOD("get_button_index"), &InputEventJoypadButton::get_button_index);
@ -886,34 +796,27 @@ void InputEventJoypadButton::_bind_methods() {
/////////////////////////////////// ///////////////////////////////////
void InputEventScreenTouch::set_index(int p_index) { void InputEventScreenTouch::set_index(int p_index) {
index = p_index; index = p_index;
} }
int InputEventScreenTouch::get_index() const { int InputEventScreenTouch::get_index() const {
return index; return index;
} }
void InputEventScreenTouch::set_position(const Vector2 &p_pos) { void InputEventScreenTouch::set_position(const Vector2 &p_pos) {
pos = p_pos; pos = p_pos;
} }
Vector2 InputEventScreenTouch::get_position() const { Vector2 InputEventScreenTouch::get_position() const {
return pos; return pos;
} }
void InputEventScreenTouch::set_pressed(bool p_pressed) { void InputEventScreenTouch::set_pressed(bool p_pressed) {
pressed = p_pressed; pressed = p_pressed;
} }
bool InputEventScreenTouch::is_pressed() const { bool InputEventScreenTouch::is_pressed() const {
return pressed; return pressed;
} }
Ref<InputEvent> InputEventScreenTouch::xformed_by(const Transform2D &p_xform, const Vector2 &p_local_ofs) const { Ref<InputEvent> InputEventScreenTouch::xformed_by(const Transform2D &p_xform, const Vector2 &p_local_ofs) const {
Ref<InputEventScreenTouch> st; Ref<InputEventScreenTouch> st;
st.instance(); st.instance();
st->set_device(get_device()); st->set_device(get_device());
@ -926,12 +829,10 @@ Ref<InputEvent> InputEventScreenTouch::xformed_by(const Transform2D &p_xform, co
} }
String InputEventScreenTouch::as_text() const { String InputEventScreenTouch::as_text() const {
return "InputEventScreenTouch : index=" + itos(index) + ", pressed=" + (pressed ? "true" : "false") + ", position=(" + String(get_position()) + ")"; return "InputEventScreenTouch : index=" + itos(index) + ", pressed=" + (pressed ? "true" : "false") + ", position=(" + String(get_position()) + ")";
} }
void InputEventScreenTouch::_bind_methods() { void InputEventScreenTouch::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_index", "index"), &InputEventScreenTouch::set_index); ClassDB::bind_method(D_METHOD("set_index", "index"), &InputEventScreenTouch::set_index);
ClassDB::bind_method(D_METHOD("get_index"), &InputEventScreenTouch::get_index); ClassDB::bind_method(D_METHOD("get_index"), &InputEventScreenTouch::get_index);
@ -949,44 +850,35 @@ void InputEventScreenTouch::_bind_methods() {
/////////////////////////////////// ///////////////////////////////////
void InputEventScreenDrag::set_index(int p_index) { void InputEventScreenDrag::set_index(int p_index) {
index = p_index; index = p_index;
} }
int InputEventScreenDrag::get_index() const { int InputEventScreenDrag::get_index() const {
return index; return index;
} }
void InputEventScreenDrag::set_position(const Vector2 &p_pos) { void InputEventScreenDrag::set_position(const Vector2 &p_pos) {
pos = p_pos; pos = p_pos;
} }
Vector2 InputEventScreenDrag::get_position() const { Vector2 InputEventScreenDrag::get_position() const {
return pos; return pos;
} }
void InputEventScreenDrag::set_relative(const Vector2 &p_relative) { void InputEventScreenDrag::set_relative(const Vector2 &p_relative) {
relative = p_relative; relative = p_relative;
} }
Vector2 InputEventScreenDrag::get_relative() const { Vector2 InputEventScreenDrag::get_relative() const {
return relative; return relative;
} }
void InputEventScreenDrag::set_speed(const Vector2 &p_speed) { void InputEventScreenDrag::set_speed(const Vector2 &p_speed) {
speed = p_speed; speed = p_speed;
} }
Vector2 InputEventScreenDrag::get_speed() const { Vector2 InputEventScreenDrag::get_speed() const {
return speed; return speed;
} }
Ref<InputEvent> InputEventScreenDrag::xformed_by(const Transform2D &p_xform, const Vector2 &p_local_ofs) const { Ref<InputEvent> InputEventScreenDrag::xformed_by(const Transform2D &p_xform, const Vector2 &p_local_ofs) const {
Ref<InputEventScreenDrag> sd; Ref<InputEventScreenDrag> sd;
sd.instance(); sd.instance();
@ -1003,12 +895,10 @@ Ref<InputEvent> InputEventScreenDrag::xformed_by(const Transform2D &p_xform, con
} }
String InputEventScreenDrag::as_text() const { String InputEventScreenDrag::as_text() const {
return "InputEventScreenDrag : index=" + itos(index) + ", position=(" + String(get_position()) + "), relative=(" + String(get_relative()) + "), speed=(" + String(get_speed()) + ")"; return "InputEventScreenDrag : index=" + itos(index) + ", position=(" + String(get_position()) + "), relative=(" + String(get_relative()) + "), speed=(" + String(get_speed()) + ")";
} }
void InputEventScreenDrag::_bind_methods() { void InputEventScreenDrag::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_index", "index"), &InputEventScreenDrag::set_index); ClassDB::bind_method(D_METHOD("set_index", "index"), &InputEventScreenDrag::set_index);
ClassDB::bind_method(D_METHOD("get_index"), &InputEventScreenDrag::get_index); ClassDB::bind_method(D_METHOD("get_index"), &InputEventScreenDrag::get_index);
@ -1030,20 +920,16 @@ void InputEventScreenDrag::_bind_methods() {
/////////////////////////////////// ///////////////////////////////////
void InputEventAction::set_action(const StringName &p_action) { void InputEventAction::set_action(const StringName &p_action) {
action = p_action; action = p_action;
} }
StringName InputEventAction::get_action() const { StringName InputEventAction::get_action() const {
return action; return action;
} }
void InputEventAction::set_pressed(bool p_pressed) { void InputEventAction::set_pressed(bool p_pressed) {
pressed = p_pressed; pressed = p_pressed;
} }
bool InputEventAction::is_pressed() const { bool InputEventAction::is_pressed() const {
return pressed; return pressed;
} }
@ -1063,12 +949,10 @@ bool InputEventAction::shortcut_match(const Ref<InputEvent> &p_event) const {
} }
bool InputEventAction::is_action(const StringName &p_action) const { bool InputEventAction::is_action(const StringName &p_action) const {
return action == p_action; return action == p_action;
} }
bool InputEventAction::action_match(const Ref<InputEvent> &p_event, bool *p_pressed, float *p_strength, float p_deadzone) const { bool InputEventAction::action_match(const Ref<InputEvent> &p_event, bool *p_pressed, float *p_strength, float p_deadzone) const {
Ref<InputEventAction> act = p_event; Ref<InputEventAction> act = p_event;
if (act.is_null()) if (act.is_null())
return false; return false;
@ -1084,12 +968,10 @@ bool InputEventAction::action_match(const Ref<InputEvent> &p_event, bool *p_pres
} }
String InputEventAction::as_text() const { String InputEventAction::as_text() const {
return "InputEventAction : action=" + action + ", pressed=(" + (pressed ? "true" : "false"); return "InputEventAction : action=" + action + ", pressed=(" + (pressed ? "true" : "false");
} }
void InputEventAction::_bind_methods() { void InputEventAction::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_action", "action"), &InputEventAction::set_action); ClassDB::bind_method(D_METHOD("set_action", "action"), &InputEventAction::set_action);
ClassDB::bind_method(D_METHOD("get_action"), &InputEventAction::get_action); ClassDB::bind_method(D_METHOD("get_action"), &InputEventAction::get_action);
@ -1109,12 +991,10 @@ void InputEventAction::_bind_methods() {
/////////////////////////////////// ///////////////////////////////////
void InputEventGesture::set_position(const Vector2 &p_pos) { void InputEventGesture::set_position(const Vector2 &p_pos) {
pos = p_pos; pos = p_pos;
} }
void InputEventGesture::_bind_methods() { void InputEventGesture::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_position", "position"), &InputEventGesture::set_position); ClassDB::bind_method(D_METHOD("set_position", "position"), &InputEventGesture::set_position);
ClassDB::bind_method(D_METHOD("get_position"), &InputEventGesture::get_position); ClassDB::bind_method(D_METHOD("get_position"), &InputEventGesture::get_position);
@ -1122,24 +1002,20 @@ void InputEventGesture::_bind_methods() {
} }
Vector2 InputEventGesture::get_position() const { Vector2 InputEventGesture::get_position() const {
return pos; return pos;
} }
/////////////////////////////////// ///////////////////////////////////
void InputEventMagnifyGesture::set_factor(real_t p_factor) { void InputEventMagnifyGesture::set_factor(real_t p_factor) {
factor = p_factor; factor = p_factor;
} }
real_t InputEventMagnifyGesture::get_factor() const { real_t InputEventMagnifyGesture::get_factor() const {
return factor; return factor;
} }
Ref<InputEvent> InputEventMagnifyGesture::xformed_by(const Transform2D &p_xform, const Vector2 &p_local_ofs) const { Ref<InputEvent> InputEventMagnifyGesture::xformed_by(const Transform2D &p_xform, const Vector2 &p_local_ofs) const {
Ref<InputEventMagnifyGesture> ev; Ref<InputEventMagnifyGesture> ev;
ev.instance(); ev.instance();
@ -1155,12 +1031,10 @@ Ref<InputEvent> InputEventMagnifyGesture::xformed_by(const Transform2D &p_xform,
} }
String InputEventMagnifyGesture::as_text() const { String InputEventMagnifyGesture::as_text() const {
return "InputEventMagnifyGesture : factor=" + rtos(get_factor()) + ", position=(" + String(get_position()) + ")"; return "InputEventMagnifyGesture : factor=" + rtos(get_factor()) + ", position=(" + String(get_position()) + ")";
} }
void InputEventMagnifyGesture::_bind_methods() { void InputEventMagnifyGesture::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_factor", "factor"), &InputEventMagnifyGesture::set_factor); ClassDB::bind_method(D_METHOD("set_factor", "factor"), &InputEventMagnifyGesture::set_factor);
ClassDB::bind_method(D_METHOD("get_factor"), &InputEventMagnifyGesture::get_factor); ClassDB::bind_method(D_METHOD("get_factor"), &InputEventMagnifyGesture::get_factor);
@ -1170,7 +1044,6 @@ void InputEventMagnifyGesture::_bind_methods() {
/////////////////////////////////// ///////////////////////////////////
void InputEventPanGesture::set_delta(const Vector2 &p_delta) { void InputEventPanGesture::set_delta(const Vector2 &p_delta) {
delta = p_delta; delta = p_delta;
} }
@ -1179,7 +1052,6 @@ Vector2 InputEventPanGesture::get_delta() const {
} }
Ref<InputEvent> InputEventPanGesture::xformed_by(const Transform2D &p_xform, const Vector2 &p_local_ofs) const { Ref<InputEvent> InputEventPanGesture::xformed_by(const Transform2D &p_xform, const Vector2 &p_local_ofs) const {
Ref<InputEventPanGesture> ev; Ref<InputEventPanGesture> ev;
ev.instance(); ev.instance();
@ -1195,12 +1067,10 @@ Ref<InputEvent> InputEventPanGesture::xformed_by(const Transform2D &p_xform, con
} }
String InputEventPanGesture::as_text() const { String InputEventPanGesture::as_text() const {
return "InputEventPanGesture : delta=(" + String(get_delta()) + "), position=(" + String(get_position()) + ")"; return "InputEventPanGesture : delta=(" + String(get_delta()) + "), position=(" + String(get_position()) + ")";
} }
void InputEventPanGesture::_bind_methods() { void InputEventPanGesture::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_delta", "delta"), &InputEventPanGesture::set_delta); ClassDB::bind_method(D_METHOD("set_delta", "delta"), &InputEventPanGesture::set_delta);
ClassDB::bind_method(D_METHOD("get_delta"), &InputEventPanGesture::get_delta); ClassDB::bind_method(D_METHOD("get_delta"), &InputEventPanGesture::get_delta);
@ -1210,7 +1080,6 @@ void InputEventPanGesture::_bind_methods() {
/////////////////////////////////// ///////////////////////////////////
void InputEventMIDI::set_channel(const int p_channel) { void InputEventMIDI::set_channel(const int p_channel) {
channel = p_channel; channel = p_channel;
} }
@ -1219,7 +1088,6 @@ int InputEventMIDI::get_channel() const {
} }
void InputEventMIDI::set_message(const int p_message) { void InputEventMIDI::set_message(const int p_message) {
message = p_message; message = p_message;
} }
@ -1228,7 +1096,6 @@ int InputEventMIDI::get_message() const {
} }
void InputEventMIDI::set_pitch(const int p_pitch) { void InputEventMIDI::set_pitch(const int p_pitch) {
pitch = p_pitch; pitch = p_pitch;
} }
@ -1237,7 +1104,6 @@ int InputEventMIDI::get_pitch() const {
} }
void InputEventMIDI::set_velocity(const int p_velocity) { void InputEventMIDI::set_velocity(const int p_velocity) {
velocity = p_velocity; velocity = p_velocity;
} }
@ -1246,7 +1112,6 @@ int InputEventMIDI::get_velocity() const {
} }
void InputEventMIDI::set_instrument(const int p_instrument) { void InputEventMIDI::set_instrument(const int p_instrument) {
instrument = p_instrument; instrument = p_instrument;
} }
@ -1255,7 +1120,6 @@ int InputEventMIDI::get_instrument() const {
} }
void InputEventMIDI::set_pressure(const int p_pressure) { void InputEventMIDI::set_pressure(const int p_pressure) {
pressure = p_pressure; pressure = p_pressure;
} }
@ -1264,7 +1128,6 @@ int InputEventMIDI::get_pressure() const {
} }
void InputEventMIDI::set_controller_number(const int p_controller_number) { void InputEventMIDI::set_controller_number(const int p_controller_number) {
controller_number = p_controller_number; controller_number = p_controller_number;
} }
@ -1273,7 +1136,6 @@ int InputEventMIDI::get_controller_number() const {
} }
void InputEventMIDI::set_controller_value(const int p_controller_value) { void InputEventMIDI::set_controller_value(const int p_controller_value) {
controller_value = p_controller_value; controller_value = p_controller_value;
} }
@ -1282,12 +1144,10 @@ int InputEventMIDI::get_controller_value() const {
} }
String InputEventMIDI::as_text() const { String InputEventMIDI::as_text() const {
return "InputEventMIDI : channel=(" + itos(get_channel()) + "), message=(" + itos(get_message()) + ")"; return "InputEventMIDI : channel=(" + itos(get_channel()) + "), message=(" + itos(get_message()) + ")";
} }
void InputEventMIDI::_bind_methods() { void InputEventMIDI::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_channel", "channel"), &InputEventMIDI::set_channel); ClassDB::bind_method(D_METHOD("set_channel", "channel"), &InputEventMIDI::set_channel);
ClassDB::bind_method(D_METHOD("get_channel"), &InputEventMIDI::get_channel); ClassDB::bind_method(D_METHOD("get_channel"), &InputEventMIDI::get_channel);
ClassDB::bind_method(D_METHOD("set_message", "message"), &InputEventMIDI::set_message); ClassDB::bind_method(D_METHOD("set_message", "message"), &InputEventMIDI::set_message);

11
core/input/input_event.h
View file

@ -192,7 +192,6 @@ public:
}; };
class InputEventFromWindow : public InputEvent { class InputEventFromWindow : public InputEvent {
GDCLASS(InputEventFromWindow, InputEvent); GDCLASS(InputEventFromWindow, InputEvent);
int64_t window_id = 0; int64_t window_id = 0;
@ -252,7 +251,6 @@ public:
}; };
class InputEventKey : public InputEventWithModifiers { class InputEventKey : public InputEventWithModifiers {
GDCLASS(InputEventKey, InputEventWithModifiers); GDCLASS(InputEventKey, InputEventWithModifiers);
bool pressed = false; /// otherwise release bool pressed = false; /// otherwise release
@ -296,7 +294,6 @@ public:
}; };
class InputEventMouse : public InputEventWithModifiers { class InputEventMouse : public InputEventWithModifiers {
GDCLASS(InputEventMouse, InputEventWithModifiers); GDCLASS(InputEventMouse, InputEventWithModifiers);
int button_mask = 0; int button_mask = 0;
@ -321,7 +318,6 @@ public:
}; };
class InputEventMouseButton : public InputEventMouse { class InputEventMouseButton : public InputEventMouse {
GDCLASS(InputEventMouseButton, InputEventMouse); GDCLASS(InputEventMouseButton, InputEventMouse);
float factor = 1; float factor = 1;
@ -355,7 +351,6 @@ public:
}; };
class InputEventMouseMotion : public InputEventMouse { class InputEventMouseMotion : public InputEventMouse {
GDCLASS(InputEventMouseMotion, InputEventMouse); GDCLASS(InputEventMouseMotion, InputEventMouse);
Vector2 tilt; Vector2 tilt;
@ -388,7 +383,6 @@ public:
}; };
class InputEventJoypadMotion : public InputEvent { class InputEventJoypadMotion : public InputEvent {
GDCLASS(InputEventJoypadMotion, InputEvent); GDCLASS(InputEventJoypadMotion, InputEvent);
int axis = 0; ///< Joypad axis int axis = 0; ///< Joypad axis
float axis_value = 0; ///< -1 to 1 float axis_value = 0; ///< -1 to 1
@ -467,7 +461,6 @@ public:
}; };
class InputEventScreenDrag : public InputEventFromWindow { class InputEventScreenDrag : public InputEventFromWindow {
GDCLASS(InputEventScreenDrag, InputEventFromWindow); GDCLASS(InputEventScreenDrag, InputEventFromWindow);
int index = 0; int index = 0;
Vector2 pos; Vector2 pos;
@ -497,7 +490,6 @@ public:
}; };
class InputEventAction : public InputEvent { class InputEventAction : public InputEvent {
GDCLASS(InputEventAction, InputEvent); GDCLASS(InputEventAction, InputEvent);
StringName action; StringName action;
@ -529,7 +521,6 @@ public:
}; };
class InputEventGesture : public InputEventWithModifiers { class InputEventGesture : public InputEventWithModifiers {
GDCLASS(InputEventGesture, InputEventWithModifiers); GDCLASS(InputEventGesture, InputEventWithModifiers);
Vector2 pos; Vector2 pos;
@ -543,7 +534,6 @@ public:
}; };
class InputEventMagnifyGesture : public InputEventGesture { class InputEventMagnifyGesture : public InputEventGesture {
GDCLASS(InputEventMagnifyGesture, InputEventGesture); GDCLASS(InputEventMagnifyGesture, InputEventGesture);
real_t factor = 1.0; real_t factor = 1.0;
@ -561,7 +551,6 @@ public:
}; };
class InputEventPanGesture : public InputEventGesture { class InputEventPanGesture : public InputEventGesture {
GDCLASS(InputEventPanGesture, InputEventGesture); GDCLASS(InputEventPanGesture, InputEventGesture);
Vector2 delta; Vector2 delta;

20
core/input/input_map.cpp
View file

@ -38,7 +38,6 @@ InputMap *InputMap::singleton = nullptr;
int InputMap::ALL_DEVICES = -1; int InputMap::ALL_DEVICES = -1;
void InputMap::_bind_methods() { void InputMap::_bind_methods() {
ClassDB::bind_method(D_METHOD("has_action", "action"), &InputMap::has_action); ClassDB::bind_method(D_METHOD("has_action", "action"), &InputMap::has_action);
ClassDB::bind_method(D_METHOD("get_actions"), &InputMap::_get_actions); ClassDB::bind_method(D_METHOD("get_actions"), &InputMap::_get_actions);
ClassDB::bind_method(D_METHOD("add_action", "action", "deadzone"), &InputMap::add_action, DEFVAL(0.5f)); ClassDB::bind_method(D_METHOD("add_action", "action", "deadzone"), &InputMap::add_action, DEFVAL(0.5f));
@ -55,7 +54,6 @@ void InputMap::_bind_methods() {
} }
void InputMap::add_action(const StringName &p_action, float p_deadzone) { void InputMap::add_action(const StringName &p_action, float p_deadzone) {
ERR_FAIL_COND_MSG(input_map.has(p_action), "InputMap already has action '" + String(p_action) + "'."); ERR_FAIL_COND_MSG(input_map.has(p_action), "InputMap already has action '" + String(p_action) + "'.");
input_map[p_action] = Action(); input_map[p_action] = Action();
static int last_id = 1; static int last_id = 1;
@ -65,20 +63,17 @@ void InputMap::add_action(const StringName &p_action, float p_deadzone) {
} }
void InputMap::erase_action(const StringName &p_action) { void InputMap::erase_action(const StringName &p_action) {
ERR_FAIL_COND_MSG(!input_map.has(p_action), "Request for nonexistent InputMap action '" + String(p_action) + "'."); ERR_FAIL_COND_MSG(!input_map.has(p_action), "Request for nonexistent InputMap action '" + String(p_action) + "'.");
input_map.erase(p_action); input_map.erase(p_action);
} }
Array InputMap::_get_actions() { Array InputMap::_get_actions() {
Array ret; Array ret;
List<StringName> actions = get_actions(); List<StringName> actions = get_actions();
if (actions.empty()) if (actions.empty())
return ret; return ret;
for (const List<StringName>::Element *E = actions.front(); E; E = E->next()) { for (const List<StringName>::Element *E = actions.front(); E; E = E->next()) {
ret.push_back(E->get()); ret.push_back(E->get());
} }
@ -86,7 +81,6 @@ Array InputMap::_get_actions() {
} }
List<StringName> InputMap::get_actions() const { List<StringName> InputMap::get_actions() const {
List<StringName> actions = List<StringName>(); List<StringName> actions = List<StringName>();
if (input_map.empty()) { if (input_map.empty()) {
return actions; return actions;
@ -100,9 +94,7 @@ List<StringName> InputMap::get_actions() const {
} }
List<Ref<InputEvent>>::Element *InputMap::_find_event(Action &p_action, const Ref<InputEvent> &p_event, bool *p_pressed, float *p_strength) const { List<Ref<InputEvent>>::Element *InputMap::_find_event(Action &p_action, const Ref<InputEvent> &p_event, bool *p_pressed, float *p_strength) const {
for (List<Ref<InputEvent>>::Element *E = p_action.inputs.front(); E; E = E->next()) { for (List<Ref<InputEvent>>::Element *E = p_action.inputs.front(); E; E = E->next()) {
const Ref<InputEvent> e = E->get(); const Ref<InputEvent> e = E->get();
//if (e.type != Ref<InputEvent>::KEY && e.device != p_event.device) -- unsure about the KEY comparison, why is this here? //if (e.type != Ref<InputEvent>::KEY && e.device != p_event.device) -- unsure about the KEY comparison, why is this here?
@ -120,19 +112,16 @@ List<Ref<InputEvent>>::Element *InputMap::_find_event(Action &p_action, const Re
} }
bool InputMap::has_action(const StringName &p_action) const { bool InputMap::has_action(const StringName &p_action) const {
return input_map.has(p_action); return input_map.has(p_action);
} }
void InputMap::action_set_deadzone(const StringName &p_action, float p_deadzone) { void InputMap::action_set_deadzone(const StringName &p_action, float p_deadzone) {
ERR_FAIL_COND_MSG(!input_map.has(p_action), "Request for nonexistent InputMap action '" + String(p_action) + "'."); ERR_FAIL_COND_MSG(!input_map.has(p_action), "Request for nonexistent InputMap action '" + String(p_action) + "'.");
input_map[p_action].deadzone = p_deadzone; input_map[p_action].deadzone = p_deadzone;
} }
void InputMap::action_add_event(const StringName &p_action, const Ref<InputEvent> &p_event) { void InputMap::action_add_event(const StringName &p_action, const Ref<InputEvent> &p_event) {
ERR_FAIL_COND_MSG(p_event.is_null(), "It's not a reference to a valid InputEvent object."); ERR_FAIL_COND_MSG(p_event.is_null(), "It's not a reference to a valid InputEvent object.");
ERR_FAIL_COND_MSG(!input_map.has(p_action), "Request for nonexistent InputMap action '" + String(p_action) + "'."); ERR_FAIL_COND_MSG(!input_map.has(p_action), "Request for nonexistent InputMap action '" + String(p_action) + "'.");
if (_find_event(input_map[p_action], p_event)) if (_find_event(input_map[p_action], p_event))
@ -142,13 +131,11 @@ void InputMap::action_add_event(const StringName &p_action, const Ref<InputEvent
} }
bool InputMap::action_has_event(const StringName &p_action, const Ref<InputEvent> &p_event) { bool InputMap::action_has_event(const StringName &p_action, const Ref<InputEvent> &p_event) {
ERR_FAIL_COND_V_MSG(!input_map.has(p_action), false, "Request for nonexistent InputMap action '" + String(p_action) + "'."); ERR_FAIL_COND_V_MSG(!input_map.has(p_action), false, "Request for nonexistent InputMap action '" + String(p_action) + "'.");
return (_find_event(input_map[p_action], p_event) != nullptr); return (_find_event(input_map[p_action], p_event) != nullptr);
} }
void InputMap::action_erase_event(const StringName &p_action, const Ref<InputEvent> &p_event) { void InputMap::action_erase_event(const StringName &p_action, const Ref<InputEvent> &p_event) {
ERR_FAIL_COND_MSG(!input_map.has(p_action), "Request for nonexistent InputMap action '" + String(p_action) + "'."); ERR_FAIL_COND_MSG(!input_map.has(p_action), "Request for nonexistent InputMap action '" + String(p_action) + "'.");
List<Ref<InputEvent>>::Element *E = _find_event(input_map[p_action], p_event); List<Ref<InputEvent>>::Element *E = _find_event(input_map[p_action], p_event);
@ -157,19 +144,16 @@ void InputMap::action_erase_event(const StringName &p_action, const Ref<InputEve
} }
void InputMap::action_erase_events(const StringName &p_action) { void InputMap::action_erase_events(const StringName &p_action) {
ERR_FAIL_COND_MSG(!input_map.has(p_action), "Request for nonexistent InputMap action '" + String(p_action) + "'."); ERR_FAIL_COND_MSG(!input_map.has(p_action), "Request for nonexistent InputMap action '" + String(p_action) + "'.");
input_map[p_action].inputs.clear(); input_map[p_action].inputs.clear();
} }
Array InputMap::_get_action_list(const StringName &p_action) { Array InputMap::_get_action_list(const StringName &p_action) {
Array ret; Array ret;
const List<Ref<InputEvent>> *al = get_action_list(p_action); const List<Ref<InputEvent>> *al = get_action_list(p_action);
if (al) { if (al) {
for (const List<Ref<InputEvent>>::Element *E = al->front(); E; E = E->next()) { for (const List<Ref<InputEvent>>::Element *E = al->front(); E; E = E->next()) {
ret.push_back(E->get()); ret.push_back(E->get());
} }
} }
@ -178,7 +162,6 @@ Array InputMap::_get_action_list(const StringName &p_action) {
} }
const List<Ref<InputEvent>> *InputMap::get_action_list(const StringName &p_action) { const List<Ref<InputEvent>> *InputMap::get_action_list(const StringName &p_action) {
const Map<StringName, Action>::Element *E = input_map.find(p_action); const Map<StringName, Action>::Element *E = input_map.find(p_action);
if (!E) if (!E)
return nullptr; return nullptr;
@ -222,7 +205,6 @@ const Map<StringName, InputMap::Action> &InputMap::get_action_map() const {
} }
void InputMap::load_from_globals() { void InputMap::load_from_globals() {
input_map.clear(); input_map.clear();
List<PropertyInfo> pinfo; List<PropertyInfo> pinfo;
@ -251,7 +233,6 @@ void InputMap::load_from_globals() {
} }
void InputMap::load_default() { void InputMap::load_default() {
Ref<InputEventKey> key; Ref<InputEventKey> key;
add_action("ui_accept"); add_action("ui_accept");
@ -332,7 +313,6 @@ void InputMap::load_default() {
} }
InputMap::InputMap() { InputMap::InputMap() {
ERR_FAIL_COND_MSG(singleton, "Singleton in InputMap already exist."); ERR_FAIL_COND_MSG(singleton, "Singleton in InputMap already exist.");
singleton = this; singleton = this;
} }

1
core/input/input_map.h
View file

@ -35,7 +35,6 @@
#include "core/object.h" #include "core/object.h"
class InputMap : public Object { class InputMap : public Object {
GDCLASS(InputMap, Object); GDCLASS(InputMap, Object);
public: public:

10
core/io/compression.cpp
View file

@ -40,10 +40,8 @@
#include <zstd.h> #include <zstd.h>
int Compression::compress(uint8_t *p_dst, const uint8_t *p_src, int p_src_size, Mode p_mode) { int Compression::compress(uint8_t *p_dst, const uint8_t *p_src, int p_src_size, Mode p_mode) {
switch (p_mode) { switch (p_mode) {
case MODE_FASTLZ: { case MODE_FASTLZ: {
if (p_src_size < 16) { if (p_src_size < 16) {
uint8_t src[16]; uint8_t src[16];
zeromem(&src[p_src_size], 16 - p_src_size); zeromem(&src[p_src_size], 16 - p_src_size);
@ -56,7 +54,6 @@ int Compression::compress(uint8_t *p_dst, const uint8_t *p_src, int p_src_size,
} break; } break;
case MODE_DEFLATE: case MODE_DEFLATE:
case MODE_GZIP: { case MODE_GZIP: {
int window_bits = p_mode == MODE_DEFLATE ? 15 : 15 + 16; int window_bits = p_mode == MODE_DEFLATE ? 15 : 15 + 16;
z_stream strm; z_stream strm;
@ -97,10 +94,8 @@ int Compression::compress(uint8_t *p_dst, const uint8_t *p_src, int p_src_size,
} }
int Compression::get_max_compressed_buffer_size(int p_src_size, Mode p_mode) { int Compression::get_max_compressed_buffer_size(int p_src_size, Mode p_mode) {
switch (p_mode) { switch (p_mode) {
case MODE_FASTLZ: { case MODE_FASTLZ: {
int ss = p_src_size + p_src_size * 6 / 100; int ss = p_src_size + p_src_size * 6 / 100;
if (ss < 66) if (ss < 66)
ss = 66; ss = 66;
@ -109,7 +104,6 @@ int Compression::get_max_compressed_buffer_size(int p_src_size, Mode p_mode) {
} break; } break;
case MODE_DEFLATE: case MODE_DEFLATE:
case MODE_GZIP: { case MODE_GZIP: {
int window_bits = p_mode == MODE_DEFLATE ? 15 : 15 + 16; int window_bits = p_mode == MODE_DEFLATE ? 15 : 15 + 16;
z_stream strm; z_stream strm;
@ -124,7 +118,6 @@ int Compression::get_max_compressed_buffer_size(int p_src_size, Mode p_mode) {
return aout; return aout;
} break; } break;
case MODE_ZSTD: { case MODE_ZSTD: {
return ZSTD_compressBound(p_src_size); return ZSTD_compressBound(p_src_size);
} break; } break;
} }
@ -133,10 +126,8 @@ int Compression::get_max_compressed_buffer_size(int p_src_size, Mode p_mode) {
} }
int Compression::decompress(uint8_t *p_dst, int p_dst_max_size, const uint8_t *p_src, int p_src_size, Mode p_mode) { int Compression::decompress(uint8_t *p_dst, int p_dst_max_size, const uint8_t *p_src, int p_src_size, Mode p_mode) {
switch (p_mode) { switch (p_mode) {
case MODE_FASTLZ: { case MODE_FASTLZ: {
int ret_size = 0; int ret_size = 0;
if (p_dst_max_size < 16) { if (p_dst_max_size < 16) {
@ -150,7 +141,6 @@ int Compression::decompress(uint8_t *p_dst, int p_dst_max_size, const uint8_t *p
} break; } break;
case MODE_DEFLATE: case MODE_DEFLATE:
case MODE_GZIP: { case MODE_GZIP: {
int window_bits = p_mode == MODE_DEFLATE ? 15 : 15 + 16; int window_bits = p_mode == MODE_DEFLATE ? 15 : 15 + 16;
z_stream strm; z_stream strm;

1
core/io/compression.h
View file

@ -34,7 +34,6 @@
#include "core/typedefs.h" #include "core/typedefs.h"
class Compression { class Compression {
public: public:
static int zlib_level; static int zlib_level;
static int gzip_level; static int gzip_level;

26
core/io/config_file.cpp
View file

@ -35,14 +35,12 @@
#include "core/variant_parser.h" #include "core/variant_parser.h"
PackedStringArray ConfigFile::_get_sections() const { PackedStringArray ConfigFile::_get_sections() const {
List<String> s; List<String> s;
get_sections(&s); get_sections(&s);
PackedStringArray arr; PackedStringArray arr;
arr.resize(s.size()); arr.resize(s.size());
int idx = 0; int idx = 0;
for (const List<String>::Element *E = s.front(); E; E = E->next()) { for (const List<String>::Element *E = s.front(); E; E = E->next()) {
arr.set(idx++, E->get()); arr.set(idx++, E->get());
} }
@ -50,14 +48,12 @@ PackedStringArray ConfigFile::_get_sections() const {
} }
PackedStringArray ConfigFile::_get_section_keys(const String &p_section) const { PackedStringArray ConfigFile::_get_section_keys(const String &p_section) const {
List<String> s; List<String> s;
get_section_keys(p_section, &s); get_section_keys(p_section, &s);
PackedStringArray arr; PackedStringArray arr;
arr.resize(s.size()); arr.resize(s.size());
int idx = 0; int idx = 0;
for (const List<String>::Element *E = s.front(); E; E = E->next()) { for (const List<String>::Element *E = s.front(); E; E = E->next()) {
arr.set(idx++, E->get()); arr.set(idx++, E->get());
} }
@ -65,7 +61,6 @@ PackedStringArray ConfigFile::_get_section_keys(const String &p_section) const {
} }
void ConfigFile::set_value(const String &p_section, const String &p_key, const Variant &p_value) { void ConfigFile::set_value(const String &p_section, const String &p_key, const Variant &p_value) {
if (p_value.get_type() == Variant::NIL) { if (p_value.get_type() == Variant::NIL) {
//erase //erase
if (!values.has(p_section)) if (!values.has(p_section))
@ -84,7 +79,6 @@ void ConfigFile::set_value(const String &p_section, const String &p_key, const V
} }
} }
Variant ConfigFile::get_value(const String &p_section, const String &p_key, Variant p_default) const { Variant ConfigFile::get_value(const String &p_section, const String &p_key, Variant p_default) const {
if (!values.has(p_section) || !values[p_section].has(p_key)) { if (!values.has(p_section) || !values[p_section].has(p_key)) {
ERR_FAIL_COND_V_MSG(p_default.get_type() == Variant::NIL, Variant(), ERR_FAIL_COND_V_MSG(p_default.get_type() == Variant::NIL, Variant(),
vformat("Couldn't find the given section \"%s\" and key \"%s\", and no default was given.", p_section, p_key)); vformat("Couldn't find the given section \"%s\" and key \"%s\", and no default was given.", p_section, p_key));
@ -95,24 +89,20 @@ Variant ConfigFile::get_value(const String &p_section, const String &p_key, Vari
} }
bool ConfigFile::has_section(const String &p_section) const { bool ConfigFile::has_section(const String &p_section) const {
return values.has(p_section); return values.has(p_section);
} }
bool ConfigFile::has_section_key(const String &p_section, const String &p_key) const { bool ConfigFile::has_section_key(const String &p_section, const String &p_key) const {
if (!values.has(p_section)) if (!values.has(p_section))
return false; return false;
return values[p_section].has(p_key); return values[p_section].has(p_key);
} }
void ConfigFile::get_sections(List<String> *r_sections) const { void ConfigFile::get_sections(List<String> *r_sections) const {
for (OrderedHashMap<String, OrderedHashMap<String, Variant>>::ConstElement E = values.front(); E; E = E.next()) { for (OrderedHashMap<String, OrderedHashMap<String, Variant>>::ConstElement E = values.front(); E; E = E.next()) {
r_sections->push_back(E.key()); r_sections->push_back(E.key());
} }
} }
void ConfigFile::get_section_keys(const String &p_section, List<String> *r_keys) const { void ConfigFile::get_section_keys(const String &p_section, List<String> *r_keys) const {
ERR_FAIL_COND_MSG(!values.has(p_section), vformat("Cannot get keys from nonexistent section \"%s\".", p_section)); ERR_FAIL_COND_MSG(!values.has(p_section), vformat("Cannot get keys from nonexistent section \"%s\".", p_section));
for (OrderedHashMap<String, Variant>::ConstElement E = values[p_section].front(); E; E = E.next()) { for (OrderedHashMap<String, Variant>::ConstElement E = values[p_section].front(); E; E = E.next()) {
@ -121,13 +111,11 @@ void ConfigFile::get_section_keys(const String &p_section, List<String> *r_keys)
} }
void ConfigFile::erase_section(const String &p_section) { void ConfigFile::erase_section(const String &p_section) {
ERR_FAIL_COND_MSG(!values.has(p_section), vformat("Cannot erase nonexistent section \"%s\".", p_section)); ERR_FAIL_COND_MSG(!values.has(p_section), vformat("Cannot erase nonexistent section \"%s\".", p_section));
values.erase(p_section); values.erase(p_section);
} }
void ConfigFile::erase_section_key(const String &p_section, const String &p_key) { void ConfigFile::erase_section_key(const String &p_section, const String &p_key) {
ERR_FAIL_COND_MSG(!values.has(p_section), vformat("Cannot erase key \"%s\" from nonexistent section \"%s\".", p_key, p_section)); ERR_FAIL_COND_MSG(!values.has(p_section), vformat("Cannot erase key \"%s\" from nonexistent section \"%s\".", p_key, p_section));
ERR_FAIL_COND_MSG(!values[p_section].has(p_key), vformat("Cannot erase nonexistent key \"%s\" from section \"%s\".", p_key, p_section)); ERR_FAIL_COND_MSG(!values[p_section].has(p_key), vformat("Cannot erase nonexistent key \"%s\" from section \"%s\".", p_key, p_section));
@ -135,7 +123,6 @@ void ConfigFile::erase_section_key(const String &p_section, const String &p_key)
} }
Error ConfigFile::save(const String &p_path) { Error ConfigFile::save(const String &p_path) {
Error err; Error err;
FileAccess *file = FileAccess::open(p_path, FileAccess::WRITE, &err); FileAccess *file = FileAccess::open(p_path, FileAccess::WRITE, &err);
@ -149,7 +136,6 @@ Error ConfigFile::save(const String &p_path) {
} }
Error ConfigFile::save_encrypted(const String &p_path, const Vector<uint8_t> &p_key) { Error ConfigFile::save_encrypted(const String &p_path, const Vector<uint8_t> &p_key) {
Error err; Error err;
FileAccess *f = FileAccess::open(p_path, FileAccess::WRITE, &err); FileAccess *f = FileAccess::open(p_path, FileAccess::WRITE, &err);
@ -167,7 +153,6 @@ Error ConfigFile::save_encrypted(const String &p_path, const Vector<uint8_t> &p_
} }
Error ConfigFile::save_encrypted_pass(const String &p_path, const String &p_pass) { Error ConfigFile::save_encrypted_pass(const String &p_path, const String &p_pass) {
Error err; Error err;
FileAccess *f = FileAccess::open(p_path, FileAccess::WRITE, &err); FileAccess *f = FileAccess::open(p_path, FileAccess::WRITE, &err);
@ -186,15 +171,12 @@ Error ConfigFile::save_encrypted_pass(const String &p_path, const String &p_pass
} }
Error ConfigFile::_internal_save(FileAccess *file) { Error ConfigFile::_internal_save(FileAccess *file) {
for (OrderedHashMap<String, OrderedHashMap<String, Variant>>::Element E = values.front(); E; E = E.next()) { for (OrderedHashMap<String, OrderedHashMap<String, Variant>>::Element E = values.front(); E; E = E.next()) {
if (E != values.front()) if (E != values.front())
file->store_string("\n"); file->store_string("\n");
file->store_string("[" + E.key() + "]\n\n"); file->store_string("[" + E.key() + "]\n\n");
for (OrderedHashMap<String, Variant>::Element F = E.get().front(); F; F = F.next()) { for (OrderedHashMap<String, Variant>::Element F = E.get().front(); F; F = F.next()) {
String vstr; String vstr;
VariantWriter::write_to_string(F.get(), vstr); VariantWriter::write_to_string(F.get(), vstr);
file->store_string(F.key() + "=" + vstr + "\n"); file->store_string(F.key() + "=" + vstr + "\n");
@ -207,7 +189,6 @@ Error ConfigFile::_internal_save(FileAccess *file) {
} }
Error ConfigFile::load(const String &p_path) { Error ConfigFile::load(const String &p_path) {
Error err; Error err;
FileAccess *f = FileAccess::open(p_path, FileAccess::READ, &err); FileAccess *f = FileAccess::open(p_path, FileAccess::READ, &err);
@ -218,7 +199,6 @@ Error ConfigFile::load(const String &p_path) {
} }
Error ConfigFile::load_encrypted(const String &p_path, const Vector<uint8_t> &p_key) { Error ConfigFile::load_encrypted(const String &p_path, const Vector<uint8_t> &p_key) {
Error err; Error err;
FileAccess *f = FileAccess::open(p_path, FileAccess::READ, &err); FileAccess *f = FileAccess::open(p_path, FileAccess::READ, &err);
@ -236,7 +216,6 @@ Error ConfigFile::load_encrypted(const String &p_path, const Vector<uint8_t> &p_
} }
Error ConfigFile::load_encrypted_pass(const String &p_path, const String &p_pass) { Error ConfigFile::load_encrypted_pass(const String &p_path, const String &p_pass) {
Error err; Error err;
FileAccess *f = FileAccess::open(p_path, FileAccess::READ, &err); FileAccess *f = FileAccess::open(p_path, FileAccess::READ, &err);
@ -255,7 +234,6 @@ Error ConfigFile::load_encrypted_pass(const String &p_path, const String &p_pass
} }
Error ConfigFile::_internal_load(const String &p_path, FileAccess *f) { Error ConfigFile::_internal_load(const String &p_path, FileAccess *f) {
VariantParser::StreamFile stream; VariantParser::StreamFile stream;
stream.f = f; stream.f = f;
@ -267,14 +245,12 @@ Error ConfigFile::_internal_load(const String &p_path, FileAccess *f) {
} }
Error ConfigFile::parse(const String &p_data) { Error ConfigFile::parse(const String &p_data) {
VariantParser::StreamString stream; VariantParser::StreamString stream;
stream.s = p_data; stream.s = p_data;
return _parse("<string>", &stream); return _parse("<string>", &stream);
} }
Error ConfigFile::_parse(const String &p_path, VariantParser::Stream *p_stream) { Error ConfigFile::_parse(const String &p_path, VariantParser::Stream *p_stream) {
String assign; String assign;
Variant value; Variant value;
VariantParser::Tag next_tag; VariantParser::Tag next_tag;
@ -285,7 +261,6 @@ Error ConfigFile::_parse(const String &p_path, VariantParser::Stream *p_stream)
String section; String section;
while (true) { while (true) {
assign = Variant(); assign = Variant();
next_tag.fields.clear(); next_tag.fields.clear();
next_tag.name = String(); next_tag.name = String();
@ -309,7 +284,6 @@ Error ConfigFile::_parse(const String &p_path, VariantParser::Stream *p_stream)
} }
void ConfigFile::_bind_methods() { void ConfigFile::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_value", "section", "key", "value"), &ConfigFile::set_value); ClassDB::bind_method(D_METHOD("set_value", "section", "key", "value"), &ConfigFile::set_value);
ClassDB::bind_method(D_METHOD("get_value", "section", "key", "default"), &ConfigFile::get_value, DEFVAL(Variant())); ClassDB::bind_method(D_METHOD("get_value", "section", "key", "default"), &ConfigFile::get_value, DEFVAL(Variant()));

1
core/io/config_file.h
View file

@ -37,7 +37,6 @@
#include "core/variant_parser.h" #include "core/variant_parser.h"
class ConfigFile : public Reference { class ConfigFile : public Reference {
GDCLASS(ConfigFile, Reference); GDCLASS(ConfigFile, Reference);
OrderedHashMap<String, OrderedHashMap<String, Variant>> values; OrderedHashMap<String, OrderedHashMap<String, Variant>> values;

2
core/io/dtls_server.cpp
View file

@ -37,7 +37,6 @@ DTLSServer *(*DTLSServer::_create)() = nullptr;
bool DTLSServer::available = false; bool DTLSServer::available = false;
DTLSServer *DTLSServer::create() { DTLSServer *DTLSServer::create() {
return _create(); return _create();
} }
@ -46,7 +45,6 @@ bool DTLSServer::is_available() {
} }
void DTLSServer::_bind_methods() { void DTLSServer::_bind_methods() {
ClassDB::bind_method(D_METHOD("setup", "key", "certificate", "chain"), &DTLSServer::setup, DEFVAL(Ref<X509Certificate>())); ClassDB::bind_method(D_METHOD("setup", "key", "certificate", "chain"), &DTLSServer::setup, DEFVAL(Ref<X509Certificate>()));
ClassDB::bind_method(D_METHOD("take_connection", "udp_peer"), &DTLSServer::take_connection); ClassDB::bind_method(D_METHOD("take_connection", "udp_peer"), &DTLSServer::take_connection);
} }

18
core/io/file_access_buffered.cpp
View file

@ -33,28 +33,23 @@
#include "core/error_macros.h" #include "core/error_macros.h"
Error FileAccessBuffered::set_error(Error p_error) const { Error FileAccessBuffered::set_error(Error p_error) const {
return (last_error = p_error); return (last_error = p_error);
} }
void FileAccessBuffered::set_cache_size(int p_size) { void FileAccessBuffered::set_cache_size(int p_size) {
cache_size = p_size; cache_size = p_size;
} }
int FileAccessBuffered::get_cache_size() { int FileAccessBuffered::get_cache_size() {
return cache_size; return cache_size;
} }
int FileAccessBuffered::cache_data_left() const { int FileAccessBuffered::cache_data_left() const {
if (file.offset >= file.size) { if (file.offset >= file.size) {
return 0; return 0;
} }
if (cache.offset == -1 || file.offset < cache.offset || file.offset >= cache.offset + cache.buffer.size()) { if (cache.offset == -1 || file.offset < cache.offset || file.offset >= cache.offset + cache.buffer.size()) {
return read_data_block(file.offset, cache_size); return read_data_block(file.offset, cache_size);
} }
@ -62,37 +57,30 @@ int FileAccessBuffered::cache_data_left() const {
} }
void FileAccessBuffered::seek(size_t p_position) { void FileAccessBuffered::seek(size_t p_position) {
file.offset = p_position; file.offset = p_position;
} }
void FileAccessBuffered::seek_end(int64_t p_position) { void FileAccessBuffered::seek_end(int64_t p_position) {
file.offset = file.size + p_position; file.offset = file.size + p_position;
} }
size_t FileAccessBuffered::get_position() const { size_t FileAccessBuffered::get_position() const {
return file.offset; return file.offset;
} }
size_t FileAccessBuffered::get_len() const { size_t FileAccessBuffered::get_len() const {
return file.size; return file.size;
} }
bool FileAccessBuffered::eof_reached() const { bool FileAccessBuffered::eof_reached() const {
return file.offset > file.size; return file.offset > file.size;
} }
uint8_t FileAccessBuffered::get_8() const { uint8_t FileAccessBuffered::get_8() const {
ERR_FAIL_COND_V_MSG(!file.open, 0, "Can't get data, when file is not opened."); ERR_FAIL_COND_V_MSG(!file.open, 0, "Can't get data, when file is not opened.");
uint8_t byte = 0; uint8_t byte = 0;
if (cache_data_left() >= 1) { if (cache_data_left() >= 1) {
byte = cache.buffer[file.offset - cache.offset]; byte = cache.buffer[file.offset - cache.offset];
} }
@ -102,15 +90,12 @@ uint8_t FileAccessBuffered::get_8() const {
} }
int FileAccessBuffered::get_buffer(uint8_t *p_dest, int p_length) const { int FileAccessBuffered::get_buffer(uint8_t *p_dest, int p_length) const {
ERR_FAIL_COND_V_MSG(!file.open, -1, "Can't get buffer, when file is not opened."); ERR_FAIL_COND_V_MSG(!file.open, -1, "Can't get buffer, when file is not opened.");
if (p_length > cache_size) { if (p_length > cache_size) {
int total_read = 0; int total_read = 0;
if (!(cache.offset == -1 || file.offset < cache.offset || file.offset >= cache.offset + cache.buffer.size())) { if (!(cache.offset == -1 || file.offset < cache.offset || file.offset >= cache.offset + cache.buffer.size())) {
int size = (cache.buffer.size() - (file.offset - cache.offset)); int size = (cache.buffer.size() - (file.offset - cache.offset));
size = size - (size % 4); size = size - (size % 4);
//const uint8_t* read = cache.buffer.ptr(); //const uint8_t* read = cache.buffer.ptr();
@ -134,7 +119,6 @@ int FileAccessBuffered::get_buffer(uint8_t *p_dest, int p_length) const {
int to_read = p_length; int to_read = p_length;
int total_read = 0; int total_read = 0;
while (to_read > 0) { while (to_read > 0) {
int left = cache_data_left(); int left = cache_data_left();
if (left == 0) { if (left == 0) {
file.offset += to_read; file.offset += to_read;
@ -158,11 +142,9 @@ int FileAccessBuffered::get_buffer(uint8_t *p_dest, int p_length) const {
} }
bool FileAccessBuffered::is_open() const { bool FileAccessBuffered::is_open() const {
return file.open; return file.open;
} }
Error FileAccessBuffered::get_error() const { Error FileAccessBuffered::get_error() const {
return last_error; return last_error;
} }

3
core/io/file_access_buffered.h
View file

@ -36,7 +36,6 @@
#include "core/ustring.h" #include "core/ustring.h"
class FileAccessBuffered : public FileAccess { class FileAccessBuffered : public FileAccess {
public: public:
enum { enum {
DEFAULT_CACHE_SIZE = 128 * 1024, DEFAULT_CACHE_SIZE = 128 * 1024,
@ -52,7 +51,6 @@ protected:
Error set_error(Error p_error) const; Error set_error(Error p_error) const;
mutable struct File { mutable struct File {
bool open; bool open;
int size; int size;
int offset; int offset;
@ -61,7 +59,6 @@ protected:
} file; } file;
mutable struct Cache { mutable struct Cache {
Vector<uint8_t> buffer; Vector<uint8_t> buffer;
int offset; int offset;
} cache; } cache;

12
core/io/file_access_buffered_fa.h
View file

@ -35,22 +35,18 @@
template <class T> template <class T>
class FileAccessBufferedFA : public FileAccessBuffered { class FileAccessBufferedFA : public FileAccessBuffered {
T f; T f;
int read_data_block(int p_offset, int p_size, uint8_t *p_dest = 0) const { int read_data_block(int p_offset, int p_size, uint8_t *p_dest = 0) const {
ERR_FAIL_COND_V_MSG(!f.is_open(), -1, "Can't read data block when file is not opened."); ERR_FAIL_COND_V_MSG(!f.is_open(), -1, "Can't read data block when file is not opened.");
((T *)&f)->seek(p_offset); ((T *)&f)->seek(p_offset);
if (p_dest) { if (p_dest) {
f.get_buffer(p_dest, p_size); f.get_buffer(p_dest, p_size);
return p_size; return p_size;
} else { } else {
cache.offset = p_offset; cache.offset = p_offset;
cache.buffer.resize(p_size); cache.buffer.resize(p_size);
@ -66,7 +62,6 @@ class FileAccessBufferedFA : public FileAccessBuffered {
}; };
static FileAccess *create() { static FileAccess *create() {
return memnew(FileAccessBufferedFA<T>()); return memnew(FileAccessBufferedFA<T>());
}; };
@ -78,27 +73,22 @@ protected:
public: public:
void flush() { void flush() {
f.flush(); f.flush();
}; };
void store_8(uint8_t p_dest) { void store_8(uint8_t p_dest) {
f.store_8(p_dest); f.store_8(p_dest);
}; };
void store_buffer(const uint8_t *p_src, int p_length) { void store_buffer(const uint8_t *p_src, int p_length) {
f.store_buffer(p_src, p_length); f.store_buffer(p_src, p_length);
}; };
bool file_exists(const String &p_name) { bool file_exists(const String &p_name) {
return f.file_exists(p_name); return f.file_exists(p_name);
}; };
Error _open(const String &p_path, int p_mode_flags) { Error _open(const String &p_path, int p_mode_flags) {
close(); close();
Error ret = f._open(p_path, p_mode_flags); Error ret = f._open(p_path, p_mode_flags);
@ -119,7 +109,6 @@ public:
}; };
void close() { void close() {
f.close(); f.close();
file.offset = 0; file.offset = 0;
@ -133,7 +122,6 @@ public:
}; };
virtual uint64_t _get_modified_time(const String &p_file) { virtual uint64_t _get_modified_time(const String &p_file) {
return f._get_modified_time(p_file); return f._get_modified_time(p_file);
} }

31
core/io/file_access_compressed.cpp
View file

@ -33,7 +33,6 @@
#include "core/print_string.h" #include "core/print_string.h"
void FileAccessCompressed::configure(const String &p_magic, Compression::Mode p_mode, int p_block_size) { void FileAccessCompressed::configure(const String &p_magic, Compression::Mode p_mode, int p_block_size) {
magic = p_magic.ascii().get_data(); magic = p_magic.ascii().get_data();
if (magic.length() > 4) if (magic.length() > 4)
magic = magic.substr(0, 4); magic = magic.substr(0, 4);
@ -59,7 +58,6 @@ void FileAccessCompressed::configure(const String &p_magic, Compression::Mode p_
} }
Error FileAccessCompressed::open_after_magic(FileAccess *p_base) { Error FileAccessCompressed::open_after_magic(FileAccess *p_base) {
f = p_base; f = p_base;
cmode = (Compression::Mode)f->get_32(); cmode = (Compression::Mode)f->get_32();
block_size = f->get_32(); block_size = f->get_32();
@ -72,7 +70,6 @@ Error FileAccessCompressed::open_after_magic(FileAccess *p_base) {
int acc_ofs = f->get_position() + bc * 4; int acc_ofs = f->get_position() + bc * 4;
int max_bs = 0; int max_bs = 0;
for (int i = 0; i < bc; i++) { for (int i = 0; i < bc; i++) {
ReadBlock rb; ReadBlock rb;
rb.offset = acc_ofs; rb.offset = acc_ofs;
rb.csize = f->get_32(); rb.csize = f->get_32();
@ -98,7 +95,6 @@ Error FileAccessCompressed::open_after_magic(FileAccess *p_base) {
} }
Error FileAccessCompressed::_open(const String &p_path, int p_mode_flags) { Error FileAccessCompressed::_open(const String &p_path, int p_mode_flags) {
ERR_FAIL_COND_V(p_mode_flags == READ_WRITE, ERR_UNAVAILABLE); ERR_FAIL_COND_V(p_mode_flags == READ_WRITE, ERR_UNAVAILABLE);
if (f) if (f)
@ -114,7 +110,6 @@ Error FileAccessCompressed::_open(const String &p_path, int p_mode_flags) {
} }
if (p_mode_flags & WRITE) { if (p_mode_flags & WRITE) {
buffer.clear(); buffer.clear();
writing = true; writing = true;
write_pos = 0; write_pos = 0;
@ -125,7 +120,6 @@ Error FileAccessCompressed::_open(const String &p_path, int p_mode_flags) {
//don't store anything else unless it's done saving! //don't store anything else unless it's done saving!
} else { } else {
char rmagic[5]; char rmagic[5];
f->get_buffer((uint8_t *)rmagic, 4); f->get_buffer((uint8_t *)rmagic, 4);
rmagic[4] = 0; rmagic[4] = 0;
@ -139,7 +133,6 @@ Error FileAccessCompressed::_open(const String &p_path, int p_mode_flags) {
return OK; return OK;
} }
void FileAccessCompressed::close() { void FileAccessCompressed::close() {
if (!f) if (!f)
return; return;
@ -159,7 +152,6 @@ void FileAccessCompressed::close() {
Vector<int> block_sizes; Vector<int> block_sizes;
for (int i = 0; i < bc; i++) { for (int i = 0; i < bc; i++) {
int bl = i == (bc - 1) ? write_max % block_size : block_size; int bl = i == (bc - 1) ? write_max % block_size : block_size;
uint8_t *bp = &write_ptr[i * block_size]; uint8_t *bp = &write_ptr[i * block_size];
@ -180,7 +172,6 @@ void FileAccessCompressed::close() {
buffer.clear(); buffer.clear();
} else { } else {
comp_buffer.clear(); comp_buffer.clear();
buffer.clear(); buffer.clear();
read_blocks.clear(); read_blocks.clear();
@ -191,21 +182,17 @@ void FileAccessCompressed::close() {
} }
bool FileAccessCompressed::is_open() const { bool FileAccessCompressed::is_open() const {
return f != nullptr; return f != nullptr;
} }
void FileAccessCompressed::seek(size_t p_position) { void FileAccessCompressed::seek(size_t p_position) {
ERR_FAIL_COND_MSG(!f, "File must be opened before use."); ERR_FAIL_COND_MSG(!f, "File must be opened before use.");
if (writing) { if (writing) {
ERR_FAIL_COND(p_position > write_max); ERR_FAIL_COND(p_position > write_max);
write_pos = p_position; write_pos = p_position;
} else { } else {
ERR_FAIL_COND(p_position > read_total); ERR_FAIL_COND(p_position > read_total);
if (p_position == read_total) { if (p_position == read_total) {
at_end = true; at_end = true;
@ -214,7 +201,6 @@ void FileAccessCompressed::seek(size_t p_position) {
read_eof = false; read_eof = false;
int block_idx = p_position / block_size; int block_idx = p_position / block_size;
if (block_idx != read_block) { if (block_idx != read_block) {
read_block = block_idx; read_block = block_idx;
f->seek(read_blocks[read_block].offset); f->seek(read_blocks[read_block].offset);
f->get_buffer(comp_buffer.ptrw(), read_blocks[read_block].csize); f->get_buffer(comp_buffer.ptrw(), read_blocks[read_block].csize);
@ -228,32 +214,24 @@ void FileAccessCompressed::seek(size_t p_position) {
} }
void FileAccessCompressed::seek_end(int64_t p_position) { void FileAccessCompressed::seek_end(int64_t p_position) {
ERR_FAIL_COND_MSG(!f, "File must be opened before use."); ERR_FAIL_COND_MSG(!f, "File must be opened before use.");
if (writing) { if (writing) {
seek(write_max + p_position); seek(write_max + p_position);
} else { } else {
seek(read_total + p_position); seek(read_total + p_position);
} }
} }
size_t FileAccessCompressed::get_position() const { size_t FileAccessCompressed::get_position() const {
ERR_FAIL_COND_V_MSG(!f, 0, "File must be opened before use."); ERR_FAIL_COND_V_MSG(!f, 0, "File must be opened before use.");
if (writing) { if (writing) {
return write_pos; return write_pos;
} else { } else {
return read_block * block_size + read_pos; return read_block * block_size + read_pos;
} }
} }
size_t FileAccessCompressed::get_len() const { size_t FileAccessCompressed::get_len() const {
ERR_FAIL_COND_V_MSG(!f, 0, "File must be opened before use."); ERR_FAIL_COND_V_MSG(!f, 0, "File must be opened before use.");
if (writing) { if (writing) {
return write_max; return write_max;
} else { } else {
return read_total; return read_total;
@ -261,7 +239,6 @@ size_t FileAccessCompressed::get_len() const {
} }
bool FileAccessCompressed::eof_reached() const { bool FileAccessCompressed::eof_reached() const {
ERR_FAIL_COND_V_MSG(!f, false, "File must be opened before use."); ERR_FAIL_COND_V_MSG(!f, false, "File must be opened before use.");
if (writing) { if (writing) {
return false; return false;
@ -271,7 +248,6 @@ bool FileAccessCompressed::eof_reached() const {
} }
uint8_t FileAccessCompressed::get_8() const { uint8_t FileAccessCompressed::get_8() const {
ERR_FAIL_COND_V_MSG(!f, 0, "File must be opened before use."); ERR_FAIL_COND_V_MSG(!f, 0, "File must be opened before use.");
ERR_FAIL_COND_V_MSG(writing, 0, "File has not been opened in read mode."); ERR_FAIL_COND_V_MSG(writing, 0, "File has not been opened in read mode.");
@ -302,7 +278,6 @@ uint8_t FileAccessCompressed::get_8() const {
return ret; return ret;
} }
int FileAccessCompressed::get_buffer(uint8_t *p_dst, int p_length) const { int FileAccessCompressed::get_buffer(uint8_t *p_dst, int p_length) const {
ERR_FAIL_COND_V_MSG(!f, 0, "File must be opened before use."); ERR_FAIL_COND_V_MSG(!f, 0, "File must be opened before use.");
ERR_FAIL_COND_V_MSG(writing, 0, "File has not been opened in read mode."); ERR_FAIL_COND_V_MSG(writing, 0, "File has not been opened in read mode.");
@ -312,7 +287,6 @@ int FileAccessCompressed::get_buffer(uint8_t *p_dst, int p_length) const {
} }
for (int i = 0; i < p_length; i++) { for (int i = 0; i < p_length; i++) {
p_dst[i] = read_ptr[read_pos]; p_dst[i] = read_ptr[read_pos];
read_pos++; read_pos++;
if (read_pos >= read_block_size) { if (read_pos >= read_block_size) {
@ -339,7 +313,6 @@ int FileAccessCompressed::get_buffer(uint8_t *p_dst, int p_length) const {
} }
Error FileAccessCompressed::get_error() const { Error FileAccessCompressed::get_error() const {
return read_eof ? ERR_FILE_EOF : OK; return read_eof ? ERR_FILE_EOF : OK;
} }
@ -351,7 +324,6 @@ void FileAccessCompressed::flush() {
} }
void FileAccessCompressed::store_8(uint8_t p_dest) { void FileAccessCompressed::store_8(uint8_t p_dest) {
ERR_FAIL_COND_MSG(!f, "File must be opened before use."); ERR_FAIL_COND_MSG(!f, "File must be opened before use.");
ERR_FAIL_COND_MSG(!writing, "File has not been opened in read mode."); ERR_FAIL_COND_MSG(!writing, "File has not been opened in read mode.");
@ -360,7 +332,6 @@ void FileAccessCompressed::store_8(uint8_t p_dest) {
} }
bool FileAccessCompressed::file_exists(const String &p_name) { bool FileAccessCompressed::file_exists(const String &p_name) {
FileAccess *fa = FileAccess::open(p_name, FileAccess::READ); FileAccess *fa = FileAccess::open(p_name, FileAccess::READ);
if (!fa) if (!fa)
return false; return false;
@ -369,7 +340,6 @@ bool FileAccessCompressed::file_exists(const String &p_name) {
} }
uint64_t FileAccessCompressed::_get_modified_time(const String &p_file) { uint64_t FileAccessCompressed::_get_modified_time(const String &p_file) {
if (f) if (f)
return f->get_modified_time(p_file); return f->get_modified_time(p_file);
else else
@ -390,7 +360,6 @@ Error FileAccessCompressed::_set_unix_permissions(const String &p_file, uint32_t
} }
FileAccessCompressed::~FileAccessCompressed() { FileAccessCompressed::~FileAccessCompressed() {
if (f) if (f)
close(); close();
} }

1
core/io/file_access_compressed.h
View file

@ -35,7 +35,6 @@
#include "core/os/file_access.h" #include "core/os/file_access.h"
class FileAccessCompressed : public FileAccess { class FileAccessCompressed : public FileAccess {
Compression::Mode cmode = Compression::MODE_ZSTD; Compression::Mode cmode = Compression::MODE_ZSTD;
bool writing = false; bool writing = false;
uint32_t write_pos = 0; uint32_t write_pos = 0;

33
core/io/file_access_encrypted.cpp
View file

@ -40,7 +40,6 @@
#define COMP_MAGIC 0x43454447 #define COMP_MAGIC 0x43454447
Error FileAccessEncrypted::open_and_parse(FileAccess *p_base, const Vector<uint8_t> &p_key, Mode p_mode) { Error FileAccessEncrypted::open_and_parse(FileAccess *p_base, const Vector<uint8_t> &p_key, Mode p_mode) {
ERR_FAIL_COND_V_MSG(file != nullptr, ERR_ALREADY_IN_USE, "Can't open file while another file from path '" + file->get_path_absolute() + "' is open."); ERR_FAIL_COND_V_MSG(file != nullptr, ERR_ALREADY_IN_USE, "Can't open file while another file from path '" + file->get_path_absolute() + "' is open.");
ERR_FAIL_COND_V(p_key.size() != 32, ERR_INVALID_PARAMETER); ERR_FAIL_COND_V(p_key.size() != 32, ERR_INVALID_PARAMETER);
@ -48,7 +47,6 @@ Error FileAccessEncrypted::open_and_parse(FileAccess *p_base, const Vector<uint8
eofed = false; eofed = false;
if (p_mode == MODE_WRITE_AES256) { if (p_mode == MODE_WRITE_AES256) {
data.clear(); data.clear();
writing = true; writing = true;
file = p_base; file = p_base;
@ -56,7 +54,6 @@ Error FileAccessEncrypted::open_and_parse(FileAccess *p_base, const Vector<uint8
key = p_key; key = p_key;
} else if (p_mode == MODE_READ) { } else if (p_mode == MODE_READ) {
writing = false; writing = false;
key = p_key; key = p_key;
uint32_t magic = p_base->get_32(); uint32_t magic = p_base->get_32();
@ -85,7 +82,6 @@ Error FileAccessEncrypted::open_and_parse(FileAccess *p_base, const Vector<uint8
ctx.set_decode_key(key.ptrw(), 256); ctx.set_decode_key(key.ptrw(), 256);
for (size_t i = 0; i < ds; i += 16) { for (size_t i = 0; i < ds; i += 16) {
ctx.decrypt_ecb(&data.write[i], &data.write[i]); ctx.decrypt_ecb(&data.write[i], &data.write[i]);
} }
@ -103,13 +99,11 @@ Error FileAccessEncrypted::open_and_parse(FileAccess *p_base, const Vector<uint8
} }
Error FileAccessEncrypted::open_and_parse_password(FileAccess *p_base, const String &p_key, Mode p_mode) { Error FileAccessEncrypted::open_and_parse_password(FileAccess *p_base, const String &p_key, Mode p_mode) {
String cs = p_key.md5_text(); String cs = p_key.md5_text();
ERR_FAIL_COND_V(cs.length() != 32, ERR_INVALID_PARAMETER); ERR_FAIL_COND_V(cs.length() != 32, ERR_INVALID_PARAMETER);
Vector<uint8_t> key; Vector<uint8_t> key;
key.resize(32); key.resize(32);
for (int i = 0; i < 32; i++) { for (int i = 0; i < 32; i++) {
key.write[i] = cs[i]; key.write[i] = cs[i];
} }
@ -117,16 +111,13 @@ Error FileAccessEncrypted::open_and_parse_password(FileAccess *p_base, const Str
} }
Error FileAccessEncrypted::_open(const String &p_path, int p_mode_flags) { Error FileAccessEncrypted::_open(const String &p_path, int p_mode_flags) {
return OK; return OK;
} }
void FileAccessEncrypted::close() { void FileAccessEncrypted::close() {
if (!file) if (!file)
return; return;
if (writing) { if (writing) {
Vector<uint8_t> compressed; Vector<uint8_t> compressed;
size_t len = data.size(); size_t len = data.size();
if (len % 16) { if (len % 16) {
@ -146,7 +137,6 @@ void FileAccessEncrypted::close() {
ctx.set_encode_key(key.ptrw(), 256); ctx.set_encode_key(key.ptrw(), 256);
for (size_t i = 0; i < len; i += 16) { for (size_t i = 0; i < len; i += 16) {
ctx.encrypt_ecb(&compressed.write[i], &compressed.write[i]); ctx.encrypt_ecb(&compressed.write[i], &compressed.write[i]);
} }
@ -163,7 +153,6 @@ void FileAccessEncrypted::close() {
data.clear(); data.clear();
} else { } else {
file->close(); file->close();
memdelete(file); memdelete(file);
data.clear(); data.clear();
@ -172,12 +161,10 @@ void FileAccessEncrypted::close() {
} }
bool FileAccessEncrypted::is_open() const { bool FileAccessEncrypted::is_open() const {
return file != nullptr; return file != nullptr;
} }
String FileAccessEncrypted::get_path() const { String FileAccessEncrypted::get_path() const {
if (file) if (file)
return file->get_path(); return file->get_path();
else else
@ -185,7 +172,6 @@ String FileAccessEncrypted::get_path() const {
} }
String FileAccessEncrypted::get_path_absolute() const { String FileAccessEncrypted::get_path_absolute() const {
if (file) if (file)
return file->get_path_absolute(); return file->get_path_absolute();
else else
@ -193,7 +179,6 @@ String FileAccessEncrypted::get_path_absolute() const {
} }
void FileAccessEncrypted::seek(size_t p_position) { void FileAccessEncrypted::seek(size_t p_position) {
if (p_position > (size_t)data.size()) if (p_position > (size_t)data.size())
p_position = data.size(); p_position = data.size();
@ -202,25 +187,20 @@ void FileAccessEncrypted::seek(size_t p_position) {
} }
void FileAccessEncrypted::seek_end(int64_t p_position) { void FileAccessEncrypted::seek_end(int64_t p_position) {
seek(data.size() + p_position); seek(data.size() + p_position);
} }
size_t FileAccessEncrypted::get_position() const { size_t FileAccessEncrypted::get_position() const {
return pos; return pos;
} }
size_t FileAccessEncrypted::get_len() const { size_t FileAccessEncrypted::get_len() const {
return data.size(); return data.size();
} }
bool FileAccessEncrypted::eof_reached() const { bool FileAccessEncrypted::eof_reached() const {
return eofed; return eofed;
} }
uint8_t FileAccessEncrypted::get_8() const { uint8_t FileAccessEncrypted::get_8() const {
ERR_FAIL_COND_V_MSG(writing, 0, "File has not been opened in read mode."); ERR_FAIL_COND_V_MSG(writing, 0, "File has not been opened in read mode.");
if (pos >= data.size()) { if (pos >= data.size()) {
eofed = true; eofed = true;
@ -232,12 +212,10 @@ uint8_t FileAccessEncrypted::get_8() const {
return b; return b;
} }
int FileAccessEncrypted::get_buffer(uint8_t *p_dst, int p_length) const { int FileAccessEncrypted::get_buffer(uint8_t *p_dst, int p_length) const {
ERR_FAIL_COND_V_MSG(writing, 0, "File has not been opened in read mode."); ERR_FAIL_COND_V_MSG(writing, 0, "File has not been opened in read mode.");
int to_copy = MIN(p_length, data.size() - pos); int to_copy = MIN(p_length, data.size() - pos);
for (int i = 0; i < to_copy; i++) { for (int i = 0; i < to_copy; i++) {
p_dst[i] = data[pos++]; p_dst[i] = data[pos++];
} }
@ -249,25 +227,19 @@ int FileAccessEncrypted::get_buffer(uint8_t *p_dst, int p_length) const {
} }
Error FileAccessEncrypted::get_error() const { Error FileAccessEncrypted::get_error() const {
return eofed ? ERR_FILE_EOF : OK; return eofed ? ERR_FILE_EOF : OK;
} }
void FileAccessEncrypted::store_buffer(const uint8_t *p_src, int p_length) { void FileAccessEncrypted::store_buffer(const uint8_t *p_src, int p_length) {
ERR_FAIL_COND_MSG(!writing, "File has not been opened in read mode."); ERR_FAIL_COND_MSG(!writing, "File has not been opened in read mode.");
if (pos < data.size()) { if (pos < data.size()) {
for (int i = 0; i < p_length; i++) { for (int i = 0; i < p_length; i++) {
store_8(p_src[i]); store_8(p_src[i]);
} }
} else if (pos == data.size()) { } else if (pos == data.size()) {
data.resize(pos + p_length); data.resize(pos + p_length);
for (int i = 0; i < p_length; i++) { for (int i = 0; i < p_length; i++) {
data.write[pos + i] = p_src[i]; data.write[pos + i] = p_src[i];
} }
pos += p_length; pos += p_length;
@ -281,7 +253,6 @@ void FileAccessEncrypted::flush() {
} }
void FileAccessEncrypted::store_8(uint8_t p_dest) { void FileAccessEncrypted::store_8(uint8_t p_dest) {
ERR_FAIL_COND_MSG(!writing, "File has not been opened in read mode."); ERR_FAIL_COND_MSG(!writing, "File has not been opened in read mode.");
if (pos < data.size()) { if (pos < data.size()) {
@ -294,7 +265,6 @@ void FileAccessEncrypted::store_8(uint8_t p_dest) {
} }
bool FileAccessEncrypted::file_exists(const String &p_name) { bool FileAccessEncrypted::file_exists(const String &p_name) {
FileAccess *fa = FileAccess::open(p_name, FileAccess::READ); FileAccess *fa = FileAccess::open(p_name, FileAccess::READ);
if (!fa) if (!fa)
return false; return false;
@ -303,12 +273,10 @@ bool FileAccessEncrypted::file_exists(const String &p_name) {
} }
uint64_t FileAccessEncrypted::_get_modified_time(const String &p_file) { uint64_t FileAccessEncrypted::_get_modified_time(const String &p_file) {
return 0; return 0;
} }
uint32_t FileAccessEncrypted::_get_unix_permissions(const String &p_file) { uint32_t FileAccessEncrypted::_get_unix_permissions(const String &p_file) {
return 0; return 0;
} }
@ -318,7 +286,6 @@ Error FileAccessEncrypted::_set_unix_permissions(const String &p_file, uint32_t
} }
FileAccessEncrypted::~FileAccessEncrypted() { FileAccessEncrypted::~FileAccessEncrypted() {
if (file) if (file)
close(); close();
} }

18
core/io/file_access_memory.cpp
View file

@ -38,7 +38,6 @@
static Map<String, Vector<uint8_t>> *files = nullptr; static Map<String, Vector<uint8_t>> *files = nullptr;
void FileAccessMemory::register_file(String p_name, Vector<uint8_t> p_data) { void FileAccessMemory::register_file(String p_name, Vector<uint8_t> p_data) {
if (!files) { if (!files) {
files = memnew((Map<String, Vector<uint8_t>>)); files = memnew((Map<String, Vector<uint8_t>>));
} }
@ -54,7 +53,6 @@ void FileAccessMemory::register_file(String p_name, Vector<uint8_t> p_data) {
} }
void FileAccessMemory::cleanup() { void FileAccessMemory::cleanup() {
if (!files) if (!files)
return; return;
@ -62,12 +60,10 @@ void FileAccessMemory::cleanup() {
} }
FileAccess *FileAccessMemory::create() { FileAccess *FileAccessMemory::create() {
return memnew(FileAccessMemory); return memnew(FileAccessMemory);
} }
bool FileAccessMemory::file_exists(const String &p_name) { bool FileAccessMemory::file_exists(const String &p_name) {
String name = fix_path(p_name); String name = fix_path(p_name);
//name = DirAccess::normalize_path(name); //name = DirAccess::normalize_path(name);
@ -75,7 +71,6 @@ bool FileAccessMemory::file_exists(const String &p_name) {
} }
Error FileAccessMemory::open_custom(const uint8_t *p_data, int p_len) { Error FileAccessMemory::open_custom(const uint8_t *p_data, int p_len) {
data = (uint8_t *)p_data; data = (uint8_t *)p_data;
length = p_len; length = p_len;
pos = 0; pos = 0;
@ -83,7 +78,6 @@ Error FileAccessMemory::open_custom(const uint8_t *p_data, int p_len) {
} }
Error FileAccessMemory::_open(const String &p_path, int p_mode_flags) { Error FileAccessMemory::_open(const String &p_path, int p_mode_flags) {
ERR_FAIL_COND_V(!files, ERR_FILE_NOT_FOUND); ERR_FAIL_COND_V(!files, ERR_FILE_NOT_FOUND);
String name = fix_path(p_path); String name = fix_path(p_path);
@ -100,46 +94,38 @@ Error FileAccessMemory::_open(const String &p_path, int p_mode_flags) {
} }
void FileAccessMemory::close() { void FileAccessMemory::close() {
data = nullptr; data = nullptr;
} }
bool FileAccessMemory::is_open() const { bool FileAccessMemory::is_open() const {
return data != nullptr; return data != nullptr;
} }
void FileAccessMemory::seek(size_t p_position) { void FileAccessMemory::seek(size_t p_position) {
ERR_FAIL_COND(!data); ERR_FAIL_COND(!data);
pos = p_position; pos = p_position;
} }
void FileAccessMemory::seek_end(int64_t p_position) { void FileAccessMemory::seek_end(int64_t p_position) {
ERR_FAIL_COND(!data); ERR_FAIL_COND(!data);
pos = length + p_position; pos = length + p_position;
} }
size_t FileAccessMemory::get_position() const { size_t FileAccessMemory::get_position() const {
ERR_FAIL_COND_V(!data, 0); ERR_FAIL_COND_V(!data, 0);
return pos; return pos;
} }
size_t FileAccessMemory::get_len() const { size_t FileAccessMemory::get_len() const {
ERR_FAIL_COND_V(!data, 0); ERR_FAIL_COND_V(!data, 0);
return length; return length;
} }
bool FileAccessMemory::eof_reached() const { bool FileAccessMemory::eof_reached() const {
return pos > length; return pos > length;
} }
uint8_t FileAccessMemory::get_8() const { uint8_t FileAccessMemory::get_8() const {
uint8_t ret = 0; uint8_t ret = 0;
if (pos < length) { if (pos < length) {
ret = data[pos]; ret = data[pos];
@ -150,7 +136,6 @@ uint8_t FileAccessMemory::get_8() const {
} }
int FileAccessMemory::get_buffer(uint8_t *p_dst, int p_length) const { int FileAccessMemory::get_buffer(uint8_t *p_dst, int p_length) const {
ERR_FAIL_COND_V(!data, -1); ERR_FAIL_COND_V(!data, -1);
int left = length - pos; int left = length - pos;
@ -167,7 +152,6 @@ int FileAccessMemory::get_buffer(uint8_t *p_dst, int p_length) const {
} }
Error FileAccessMemory::get_error() const { Error FileAccessMemory::get_error() const {
return pos >= length ? ERR_FILE_EOF : OK; return pos >= length ? ERR_FILE_EOF : OK;
} }
@ -176,14 +160,12 @@ void FileAccessMemory::flush() {
} }
void FileAccessMemory::store_8(uint8_t p_byte) { void FileAccessMemory::store_8(uint8_t p_byte) {
ERR_FAIL_COND(!data); ERR_FAIL_COND(!data);
ERR_FAIL_COND(pos >= length); ERR_FAIL_COND(pos >= length);
data[pos++] = p_byte; data[pos++] = p_byte;
} }
void FileAccessMemory::store_buffer(const uint8_t *p_src, int p_length) { void FileAccessMemory::store_buffer(const uint8_t *p_src, int p_length) {
int left = length - pos; int left = length - pos;
int write = MIN(p_length, left); int write = MIN(p_length, left);
if (write < p_length) { if (write < p_length) {

1
core/io/file_access_memory.h
View file

@ -34,7 +34,6 @@
#include "core/os/file_access.h" #include "core/os/file_access.h"
class FileAccessMemory : public FileAccess { class FileAccessMemory : public FileAccess {
uint8_t *data = nullptr; uint8_t *data = nullptr;
int length; int length;
mutable int pos; mutable int pos;

40
core/io/file_access_network.cpp
View file

@ -41,19 +41,16 @@
#define DEBUG_TIME(m_what) #define DEBUG_TIME(m_what)
void FileAccessNetworkClient::lock_mutex() { void FileAccessNetworkClient::lock_mutex() {
mutex.lock(); mutex.lock();
lockcount++; lockcount++;
} }
void FileAccessNetworkClient::unlock_mutex() { void FileAccessNetworkClient::unlock_mutex() {
lockcount--; lockcount--;
mutex.unlock(); mutex.unlock();
} }
void FileAccessNetworkClient::put_32(int p_32) { void FileAccessNetworkClient::put_32(int p_32) {
uint8_t buf[4]; uint8_t buf[4];
encode_uint32(p_32, buf); encode_uint32(p_32, buf);
client->put_data(buf, 4); client->put_data(buf, 4);
@ -61,7 +58,6 @@ void FileAccessNetworkClient::put_32(int p_32) {
} }
void FileAccessNetworkClient::put_64(int64_t p_64) { void FileAccessNetworkClient::put_64(int64_t p_64) {
uint8_t buf[8]; uint8_t buf[8];
encode_uint64(p_64, buf); encode_uint64(p_64, buf);
client->put_data(buf, 8); client->put_data(buf, 8);
@ -69,24 +65,20 @@ void FileAccessNetworkClient::put_64(int64_t p_64) {
} }
int FileAccessNetworkClient::get_32() { int FileAccessNetworkClient::get_32() {
uint8_t buf[4]; uint8_t buf[4];
client->get_data(buf, 4); client->get_data(buf, 4);
return decode_uint32(buf); return decode_uint32(buf);
} }
int64_t FileAccessNetworkClient::get_64() { int64_t FileAccessNetworkClient::get_64() {
uint8_t buf[8]; uint8_t buf[8];
client->get_data(buf, 8); client->get_data(buf, 8);
return decode_uint64(buf); return decode_uint64(buf);
} }
void FileAccessNetworkClient::_thread_func() { void FileAccessNetworkClient::_thread_func() {
client->set_no_delay(true); client->set_no_delay(true);
while (!quit) { while (!quit) {
DEBUG_PRINT("SEM WAIT - " + itos(sem->get())); DEBUG_PRINT("SEM WAIT - " + itos(sem->get()));
sem.wait(); sem.wait();
DEBUG_TIME("sem_unlock"); DEBUG_TIME("sem_unlock");
@ -127,9 +119,7 @@ void FileAccessNetworkClient::_thread_func() {
fa = accesses[id]; fa = accesses[id];
switch (response) { switch (response) {
case FileAccessNetwork::RESPONSE_OPEN: { case FileAccessNetwork::RESPONSE_OPEN: {
DEBUG_TIME("sem_open"); DEBUG_TIME("sem_open");
int status = get_32(); int status = get_32();
if (status != OK) { if (status != OK) {
@ -143,7 +133,6 @@ void FileAccessNetworkClient::_thread_func() {
} break; } break;
case FileAccessNetwork::RESPONSE_DATA: { case FileAccessNetwork::RESPONSE_DATA: {
int64_t offset = get_64(); int64_t offset = get_64();
uint32_t len = get_32(); uint32_t len = get_32();
@ -156,14 +145,12 @@ void FileAccessNetworkClient::_thread_func() {
} break; } break;
case FileAccessNetwork::RESPONSE_FILE_EXISTS: { case FileAccessNetwork::RESPONSE_FILE_EXISTS: {
int status = get_32(); int status = get_32();
fa->exists_modtime = status != 0; fa->exists_modtime = status != 0;
fa->sem.post(); fa->sem.post();
} break; } break;
case FileAccessNetwork::RESPONSE_GET_MODTIME: { case FileAccessNetwork::RESPONSE_GET_MODTIME: {
uint64_t status = get_64(); uint64_t status = get_64();
fa->exists_modtime = status; fa->exists_modtime = status;
fa->sem.post(); fa->sem.post();
@ -176,14 +163,12 @@ void FileAccessNetworkClient::_thread_func() {
} }
void FileAccessNetworkClient::_thread_func(void *s) { void FileAccessNetworkClient::_thread_func(void *s) {
FileAccessNetworkClient *self = (FileAccessNetworkClient *)s; FileAccessNetworkClient *self = (FileAccessNetworkClient *)s;
self->_thread_func(); self->_thread_func();
} }
Error FileAccessNetworkClient::connect(const String &p_host, int p_port, const String &p_password) { Error FileAccessNetworkClient::connect(const String &p_host, int p_port, const String &p_password) {
IP_Address ip; IP_Address ip;
if (p_host.is_valid_ip_address()) { if (p_host.is_valid_ip_address()) {
@ -236,7 +221,6 @@ FileAccessNetworkClient::~FileAccessNetworkClient() {
} }
void FileAccessNetwork::_set_block(int p_offset, const Vector<uint8_t> &p_block) { void FileAccessNetwork::_set_block(int p_offset, const Vector<uint8_t> &p_block) {
int page = p_offset / page_size; int page = p_offset / page_size;
ERR_FAIL_INDEX(page, pages.size()); ERR_FAIL_INDEX(page, pages.size());
if (page < pages.size() - 1) { if (page < pages.size() - 1) {
@ -258,7 +242,6 @@ void FileAccessNetwork::_set_block(int p_offset, const Vector<uint8_t> &p_block)
} }
void FileAccessNetwork::_respond(size_t p_len, Error p_status) { void FileAccessNetwork::_respond(size_t p_len, Error p_status) {
DEBUG_PRINT("GOT RESPONSE - len: " + itos(p_len) + " status: " + itos(p_status)); DEBUG_PRINT("GOT RESPONSE - len: " + itos(p_len) + " status: " + itos(p_status));
response = p_status; response = p_status;
if (response != OK) if (response != OK)
@ -270,7 +253,6 @@ void FileAccessNetwork::_respond(size_t p_len, Error p_status) {
} }
Error FileAccessNetwork::_open(const String &p_path, int p_mode_flags) { Error FileAccessNetwork::_open(const String &p_path, int p_mode_flags) {
ERR_FAIL_COND_V(p_mode_flags != READ, ERR_UNAVAILABLE); ERR_FAIL_COND_V(p_mode_flags != READ, ERR_UNAVAILABLE);
if (opened) if (opened)
close(); close();
@ -305,7 +287,6 @@ Error FileAccessNetwork::_open(const String &p_path, int p_mode_flags) {
} }
void FileAccessNetwork::close() { void FileAccessNetwork::close() {
if (!opened) if (!opened)
return; return;
@ -320,12 +301,10 @@ void FileAccessNetwork::close() {
nc->unlock_mutex(); nc->unlock_mutex();
} }
bool FileAccessNetwork::is_open() const { bool FileAccessNetwork::is_open() const {
return opened; return opened;
} }
void FileAccessNetwork::seek(size_t p_position) { void FileAccessNetwork::seek(size_t p_position) {
ERR_FAIL_COND_MSG(!opened, "File must be opened before use."); ERR_FAIL_COND_MSG(!opened, "File must be opened before use.");
eof_flag = p_position > total_size; eof_flag = p_position > total_size;
@ -337,39 +316,32 @@ void FileAccessNetwork::seek(size_t p_position) {
} }
void FileAccessNetwork::seek_end(int64_t p_position) { void FileAccessNetwork::seek_end(int64_t p_position) {
seek(total_size + p_position); seek(total_size + p_position);
} }
size_t FileAccessNetwork::get_position() const { size_t FileAccessNetwork::get_position() const {
ERR_FAIL_COND_V_MSG(!opened, 0, "File must be opened before use."); ERR_FAIL_COND_V_MSG(!opened, 0, "File must be opened before use.");
return pos; return pos;
} }
size_t FileAccessNetwork::get_len() const { size_t FileAccessNetwork::get_len() const {
ERR_FAIL_COND_V_MSG(!opened, 0, "File must be opened before use."); ERR_FAIL_COND_V_MSG(!opened, 0, "File must be opened before use.");
return total_size; return total_size;
} }
bool FileAccessNetwork::eof_reached() const { bool FileAccessNetwork::eof_reached() const {
ERR_FAIL_COND_V_MSG(!opened, false, "File must be opened before use."); ERR_FAIL_COND_V_MSG(!opened, false, "File must be opened before use.");
return eof_flag; return eof_flag;
} }
uint8_t FileAccessNetwork::get_8() const { uint8_t FileAccessNetwork::get_8() const {
uint8_t v; uint8_t v;
get_buffer(&v, 1); get_buffer(&v, 1);
return v; return v;
} }
void FileAccessNetwork::_queue_page(int p_page) const { void FileAccessNetwork::_queue_page(int p_page) const {
if (p_page >= pages.size()) if (p_page >= pages.size())
return; return;
if (pages[p_page].buffer.empty() && !pages[p_page].queued) { if (pages[p_page].buffer.empty() && !pages[p_page].queued) {
FileAccessNetworkClient *nc = FileAccessNetworkClient::singleton; FileAccessNetworkClient *nc = FileAccessNetworkClient::singleton;
{ {
MutexLock lock(nc->blockrequest_mutex); MutexLock lock(nc->blockrequest_mutex);
@ -388,7 +360,6 @@ void FileAccessNetwork::_queue_page(int p_page) const {
} }
int FileAccessNetwork::get_buffer(uint8_t *p_dst, int p_length) const { int FileAccessNetwork::get_buffer(uint8_t *p_dst, int p_length) const {
//bool eof=false; //bool eof=false;
if (pos + p_length > total_size) { if (pos + p_length > total_size) {
eof_flag = true; eof_flag = true;
@ -402,7 +373,6 @@ int FileAccessNetwork::get_buffer(uint8_t *p_dst, int p_length) const {
uint8_t *buff = last_page_buff; uint8_t *buff = last_page_buff;
for (int i = 0; i < p_length; i++) { for (int i = 0; i < p_length; i++) {
int page = pos / page_size; int page = pos / page_size;
if (page != last_page) { if (page != last_page) {
@ -410,7 +380,6 @@ int FileAccessNetwork::get_buffer(uint8_t *p_dst, int p_length) const {
if (pages[page].buffer.empty()) { if (pages[page].buffer.empty()) {
waiting_on_page = page; waiting_on_page = page;
for (int j = 0; j < read_ahead; j++) { for (int j = 0; j < read_ahead; j++) {
_queue_page(page + j); _queue_page(page + j);
} }
buffer_mutex.unlock(); buffer_mutex.unlock();
@ -418,9 +387,7 @@ int FileAccessNetwork::get_buffer(uint8_t *p_dst, int p_length) const {
page_sem.wait(); page_sem.wait();
DEBUG_PRINT("done"); DEBUG_PRINT("done");
} else { } else {
for (int j = 0; j < read_ahead; j++) { for (int j = 0; j < read_ahead; j++) {
_queue_page(page + j); _queue_page(page + j);
} }
//queue pages //queue pages
@ -440,7 +407,6 @@ int FileAccessNetwork::get_buffer(uint8_t *p_dst, int p_length) const {
} }
Error FileAccessNetwork::get_error() const { Error FileAccessNetwork::get_error() const {
return pos == total_size ? ERR_FILE_EOF : OK; return pos == total_size ? ERR_FILE_EOF : OK;
} }
@ -449,12 +415,10 @@ void FileAccessNetwork::flush() {
} }
void FileAccessNetwork::store_8(uint8_t p_dest) { void FileAccessNetwork::store_8(uint8_t p_dest) {
ERR_FAIL(); ERR_FAIL();
} }
bool FileAccessNetwork::file_exists(const String &p_path) { bool FileAccessNetwork::file_exists(const String &p_path) {
FileAccessNetworkClient *nc = FileAccessNetworkClient::singleton; FileAccessNetworkClient *nc = FileAccessNetworkClient::singleton;
nc->lock_mutex(); nc->lock_mutex();
nc->put_32(id); nc->put_32(id);
@ -471,7 +435,6 @@ bool FileAccessNetwork::file_exists(const String &p_path) {
} }
uint64_t FileAccessNetwork::_get_modified_time(const String &p_file) { uint64_t FileAccessNetwork::_get_modified_time(const String &p_file) {
FileAccessNetworkClient *nc = FileAccessNetworkClient::singleton; FileAccessNetworkClient *nc = FileAccessNetworkClient::singleton;
nc->lock_mutex(); nc->lock_mutex();
nc->put_32(id); nc->put_32(id);
@ -498,7 +461,6 @@ Error FileAccessNetwork::_set_unix_permissions(const String &p_file, uint32_t p_
} }
void FileAccessNetwork::configure() { void FileAccessNetwork::configure() {
GLOBAL_DEF("network/remote_fs/page_size", 65536); GLOBAL_DEF("network/remote_fs/page_size", 65536);
ProjectSettings::get_singleton()->set_custom_property_info("network/remote_fs/page_size", PropertyInfo(Variant::INT, "network/remote_fs/page_size", PROPERTY_HINT_RANGE, "1,65536,1,or_greater")); //is used as denominator and can't be zero ProjectSettings::get_singleton()->set_custom_property_info("network/remote_fs/page_size", PropertyInfo(Variant::INT, "network/remote_fs/page_size", PROPERTY_HINT_RANGE, "1,65536,1,or_greater")); //is used as denominator and can't be zero
GLOBAL_DEF("network/remote_fs/page_read_ahead", 4); GLOBAL_DEF("network/remote_fs/page_read_ahead", 4);
@ -506,7 +468,6 @@ void FileAccessNetwork::configure() {
} }
FileAccessNetwork::FileAccessNetwork() { FileAccessNetwork::FileAccessNetwork() {
FileAccessNetworkClient *nc = FileAccessNetworkClient::singleton; FileAccessNetworkClient *nc = FileAccessNetworkClient::singleton;
nc->lock_mutex(); nc->lock_mutex();
id = nc->last_id++; id = nc->last_id++;
@ -517,7 +478,6 @@ FileAccessNetwork::FileAccessNetwork() {
} }
FileAccessNetwork::~FileAccessNetwork() { FileAccessNetwork::~FileAccessNetwork() {
close(); close();
FileAccessNetworkClient *nc = FileAccessNetworkClient::singleton; FileAccessNetworkClient *nc = FileAccessNetworkClient::singleton;

3
core/io/file_access_network.h
View file

@ -39,9 +39,7 @@
class FileAccessNetwork; class FileAccessNetwork;
class FileAccessNetworkClient { class FileAccessNetworkClient {
struct BlockRequest { struct BlockRequest {
int id; int id;
uint64_t offset; uint64_t offset;
int size; int size;
@ -84,7 +82,6 @@ public:
}; };
class FileAccessNetwork : public FileAccess { class FileAccessNetwork : public FileAccess {
Semaphore sem; Semaphore sem;
Semaphore page_sem; Semaphore page_sem;
Mutex buffer_mutex; Mutex buffer_mutex;

51
core/io/file_access_pack.cpp
View file

@ -35,11 +35,8 @@
#include <stdio.h> #include <stdio.h>
Error PackedData::add_pack(const String &p_path, bool p_replace_files) { Error PackedData::add_pack(const String &p_path, bool p_replace_files) {
for (int i = 0; i < sources.size(); i++) { for (int i = 0; i < sources.size(); i++) {
if (sources[i]->try_open_pack(p_path, p_replace_files)) { if (sources[i]->try_open_pack(p_path, p_replace_files)) {
return OK; return OK;
}; };
}; };
@ -48,7 +45,6 @@ Error PackedData::add_pack(const String &p_path, bool p_replace_files) {
}; };
void PackedData::add_path(const String &pkg_path, const String &path, uint64_t ofs, uint64_t size, const uint8_t *p_md5, PackSource *p_src, bool p_replace_files) { void PackedData::add_path(const String &pkg_path, const String &path, uint64_t ofs, uint64_t size, const uint8_t *p_md5, PackSource *p_src, bool p_replace_files) {
PathMD5 pmd5(path.md5_buffer()); PathMD5 pmd5(path.md5_buffer());
//printf("adding path %ls, %lli, %lli\n", path.c_str(), pmd5.a, pmd5.b); //printf("adding path %ls, %lli, %lli\n", path.c_str(), pmd5.a, pmd5.b);
@ -75,9 +71,7 @@ void PackedData::add_path(const String &pkg_path, const String &path, uint64_t o
Vector<String> ds = p.get_base_dir().split("/"); Vector<String> ds = p.get_base_dir().split("/");
for (int j = 0; j < ds.size(); j++) { for (int j = 0; j < ds.size(); j++) {
if (!cd->subdirs.has(ds[j])) { if (!cd->subdirs.has(ds[j])) {
PackedDir *pd = memnew(PackedDir); PackedDir *pd = memnew(PackedDir);
pd->name = ds[j]; pd->name = ds[j];
pd->parent = cd; pd->parent = cd;
@ -97,7 +91,6 @@ void PackedData::add_path(const String &pkg_path, const String &path, uint64_t o
} }
void PackedData::add_pack_source(PackSource *p_source) { void PackedData::add_pack_source(PackSource *p_source) {
if (p_source != nullptr) { if (p_source != nullptr) {
sources.push_back(p_source); sources.push_back(p_source);
} }
@ -106,7 +99,6 @@ void PackedData::add_pack_source(PackSource *p_source) {
PackedData *PackedData::singleton = nullptr; PackedData *PackedData::singleton = nullptr;
PackedData::PackedData() { PackedData::PackedData() {
singleton = this; singleton = this;
root = memnew(PackedDir); root = memnew(PackedDir);
@ -114,14 +106,12 @@ PackedData::PackedData() {
} }
void PackedData::_free_packed_dirs(PackedDir *p_dir) { void PackedData::_free_packed_dirs(PackedDir *p_dir) {
for (Map<String, PackedDir *>::Element *E = p_dir->subdirs.front(); E; E = E->next()) for (Map<String, PackedDir *>::Element *E = p_dir->subdirs.front(); E; E = E->next())
_free_packed_dirs(E->get()); _free_packed_dirs(E->get());
memdelete(p_dir); memdelete(p_dir);
} }
PackedData::~PackedData() { PackedData::~PackedData() {
for (int i = 0; i < sources.size(); i++) { for (int i = 0; i < sources.size(); i++) {
memdelete(sources[i]); memdelete(sources[i]);
} }
@ -131,7 +121,6 @@ PackedData::~PackedData() {
////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////
bool PackedSourcePCK::try_open_pack(const String &p_path, bool p_replace_files) { bool PackedSourcePCK::try_open_pack(const String &p_path, bool p_replace_files) {
FileAccess *f = FileAccess::open(p_path, FileAccess::READ); FileAccess *f = FileAccess::open(p_path, FileAccess::READ);
if (!f) if (!f)
return false; return false;
@ -144,7 +133,6 @@ bool PackedSourcePCK::try_open_pack(const String &p_path, bool p_replace_files)
f->seek(f->get_position() - 4); f->seek(f->get_position() - 4);
magic = f->get_32(); magic = f->get_32();
if (magic != PACK_HEADER_MAGIC) { if (magic != PACK_HEADER_MAGIC) {
f->close(); f->close();
memdelete(f); memdelete(f);
return false; return false;
@ -156,7 +144,6 @@ bool PackedSourcePCK::try_open_pack(const String &p_path, bool p_replace_files)
magic = f->get_32(); magic = f->get_32();
if (magic != PACK_HEADER_MAGIC) { if (magic != PACK_HEADER_MAGIC) {
f->close(); f->close();
memdelete(f); memdelete(f);
return false; return false;
@ -187,7 +174,6 @@ bool PackedSourcePCK::try_open_pack(const String &p_path, bool p_replace_files)
int file_count = f->get_32(); int file_count = f->get_32();
for (int i = 0; i < file_count; i++) { for (int i = 0; i < file_count; i++) {
uint32_t sl = f->get_32(); uint32_t sl = f->get_32();
CharString cs; CharString cs;
cs.resize(sl + 1); cs.resize(sl + 1);
@ -210,30 +196,25 @@ bool PackedSourcePCK::try_open_pack(const String &p_path, bool p_replace_files)
}; };
FileAccess *PackedSourcePCK::get_file(const String &p_path, PackedData::PackedFile *p_file) { FileAccess *PackedSourcePCK::get_file(const String &p_path, PackedData::PackedFile *p_file) {
return memnew(FileAccessPack(p_path, *p_file)); return memnew(FileAccessPack(p_path, *p_file));
}; };
////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////
Error FileAccessPack::_open(const String &p_path, int p_mode_flags) { Error FileAccessPack::_open(const String &p_path, int p_mode_flags) {
ERR_FAIL_V(ERR_UNAVAILABLE); ERR_FAIL_V(ERR_UNAVAILABLE);
return ERR_UNAVAILABLE; return ERR_UNAVAILABLE;
} }
void FileAccessPack::close() { void FileAccessPack::close() {
f->close(); f->close();
} }
bool FileAccessPack::is_open() const { bool FileAccessPack::is_open() const {
return f->is_open(); return f->is_open();
} }
void FileAccessPack::seek(size_t p_position) { void FileAccessPack::seek(size_t p_position) {
if (p_position > pf.size) { if (p_position > pf.size) {
eof = true; eof = true;
} else { } else {
@ -244,25 +225,20 @@ void FileAccessPack::seek(size_t p_position) {
pos = p_position; pos = p_position;
} }
void FileAccessPack::seek_end(int64_t p_position) { void FileAccessPack::seek_end(int64_t p_position) {
seek(pf.size + p_position); seek(pf.size + p_position);
} }
size_t FileAccessPack::get_position() const { size_t FileAccessPack::get_position() const {
return pos; return pos;
} }
size_t FileAccessPack::get_len() const { size_t FileAccessPack::get_len() const {
return pf.size; return pf.size;
} }
bool FileAccessPack::eof_reached() const { bool FileAccessPack::eof_reached() const {
return eof; return eof;
} }
uint8_t FileAccessPack::get_8() const { uint8_t FileAccessPack::get_8() const {
if (pos >= pf.size) { if (pos >= pf.size) {
eof = true; eof = true;
return 0; return 0;
@ -273,7 +249,6 @@ uint8_t FileAccessPack::get_8() const {
} }
int FileAccessPack::get_buffer(uint8_t *p_dst, int p_length) const { int FileAccessPack::get_buffer(uint8_t *p_dst, int p_length) const {
if (eof) if (eof)
return 0; return 0;
@ -298,36 +273,30 @@ void FileAccessPack::set_endian_swap(bool p_swap) {
} }
Error FileAccessPack::get_error() const { Error FileAccessPack::get_error() const {
if (eof) if (eof)
return ERR_FILE_EOF; return ERR_FILE_EOF;
return OK; return OK;
} }
void FileAccessPack::flush() { void FileAccessPack::flush() {
ERR_FAIL(); ERR_FAIL();
} }
void FileAccessPack::store_8(uint8_t p_dest) { void FileAccessPack::store_8(uint8_t p_dest) {
ERR_FAIL(); ERR_FAIL();
} }
void FileAccessPack::store_buffer(const uint8_t *p_src, int p_length) { void FileAccessPack::store_buffer(const uint8_t *p_src, int p_length) {
ERR_FAIL(); ERR_FAIL();
} }
bool FileAccessPack::file_exists(const String &p_name) { bool FileAccessPack::file_exists(const String &p_name) {
return false; return false;
} }
FileAccessPack::FileAccessPack(const String &p_path, const PackedData::PackedFile &p_file) : FileAccessPack::FileAccessPack(const String &p_path, const PackedData::PackedFile &p_file) :
pf(p_file), pf(p_file),
f(FileAccess::open(pf.pack, FileAccess::READ)) { f(FileAccess::open(pf.pack, FileAccess::READ)) {
ERR_FAIL_COND_MSG(!f, "Can't open pack-referenced file '" + String(pf.pack) + "'."); ERR_FAIL_COND_MSG(!f, "Can't open pack-referenced file '" + String(pf.pack) + "'.");
f->seek(pf.offset); f->seek(pf.offset);
@ -345,17 +314,14 @@ FileAccessPack::~FileAccessPack() {
////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////
Error DirAccessPack::list_dir_begin() { Error DirAccessPack::list_dir_begin() {
list_dirs.clear(); list_dirs.clear();
list_files.clear(); list_files.clear();
for (Map<String, PackedData::PackedDir *>::Element *E = current->subdirs.front(); E; E = E->next()) { for (Map<String, PackedData::PackedDir *>::Element *E = current->subdirs.front(); E; E = E->next()) {
list_dirs.push_back(E->key()); list_dirs.push_back(E->key());
} }
for (Set<String>::Element *E = current->files.front(); E; E = E->next()) { for (Set<String>::Element *E = current->files.front(); E; E = E->next()) {
list_files.push_back(E->get()); list_files.push_back(E->get());
} }
@ -363,7 +329,6 @@ Error DirAccessPack::list_dir_begin() {
} }
String DirAccessPack::get_next() { String DirAccessPack::get_next() {
if (list_dirs.size()) { if (list_dirs.size()) {
cdir = true; cdir = true;
String d = list_dirs.front()->get(); String d = list_dirs.front()->get();
@ -379,30 +344,24 @@ String DirAccessPack::get_next() {
} }
} }
bool DirAccessPack::current_is_dir() const { bool DirAccessPack::current_is_dir() const {
return cdir; return cdir;
} }
bool DirAccessPack::current_is_hidden() const { bool DirAccessPack::current_is_hidden() const {
return false; return false;
} }
void DirAccessPack::list_dir_end() { void DirAccessPack::list_dir_end() {
list_dirs.clear(); list_dirs.clear();
list_files.clear(); list_files.clear();
} }
int DirAccessPack::get_drive_count() { int DirAccessPack::get_drive_count() {
return 0; return 0;
} }
String DirAccessPack::get_drive(int p_drive) { String DirAccessPack::get_drive(int p_drive) {
return ""; return "";
} }
Error DirAccessPack::change_dir(String p_dir) { Error DirAccessPack::change_dir(String p_dir) {
String nd = p_dir.replace("\\", "/"); String nd = p_dir.replace("\\", "/");
bool absolute = false; bool absolute = false;
if (nd.begins_with("res://")) { if (nd.begins_with("res://")) {
@ -430,7 +389,6 @@ Error DirAccessPack::change_dir(String p_dir) {
pd = current; pd = current;
for (int i = 0; i < paths.size(); i++) { for (int i = 0; i < paths.size(); i++) {
String p = paths[i]; String p = paths[i];
if (p == ".") { if (p == ".") {
continue; continue;
@ -439,11 +397,9 @@ Error DirAccessPack::change_dir(String p_dir) {
pd = pd->parent; pd = pd->parent;
} }
} else if (pd->subdirs.has(p)) { } else if (pd->subdirs.has(p)) {
pd = pd->subdirs[p]; pd = pd->subdirs[p];
} else { } else {
return ERR_INVALID_PARAMETER; return ERR_INVALID_PARAMETER;
} }
} }
@ -454,7 +410,6 @@ Error DirAccessPack::change_dir(String p_dir) {
} }
String DirAccessPack::get_current_dir(bool p_include_drive) { String DirAccessPack::get_current_dir(bool p_include_drive) {
PackedData::PackedDir *pd = current; PackedData::PackedDir *pd = current;
String p = current->name; String p = current->name;
@ -467,35 +422,29 @@ String DirAccessPack::get_current_dir(bool p_include_drive) {
} }
bool DirAccessPack::file_exists(String p_file) { bool DirAccessPack::file_exists(String p_file) {
p_file = fix_path(p_file); p_file = fix_path(p_file);
return current->files.has(p_file); return current->files.has(p_file);
} }
bool DirAccessPack::dir_exists(String p_dir) { bool DirAccessPack::dir_exists(String p_dir) {
p_dir = fix_path(p_dir); p_dir = fix_path(p_dir);
return current->subdirs.has(p_dir); return current->subdirs.has(p_dir);
} }
Error DirAccessPack::make_dir(String p_dir) { Error DirAccessPack::make_dir(String p_dir) {
return ERR_UNAVAILABLE; return ERR_UNAVAILABLE;
} }
Error DirAccessPack::rename(String p_from, String p_to) { Error DirAccessPack::rename(String p_from, String p_to) {
return ERR_UNAVAILABLE; return ERR_UNAVAILABLE;
} }
Error DirAccessPack::remove(String p_name) { Error DirAccessPack::remove(String p_name) {
return ERR_UNAVAILABLE; return ERR_UNAVAILABLE;
} }
size_t DirAccessPack::get_space_left() { size_t DirAccessPack::get_space_left() {
return 0; return 0;
} }

8
core/io/file_access_pack.h
View file

@ -51,7 +51,6 @@ class PackedData {
public: public:
struct PackedFile { struct PackedFile {
String pack; String pack;
uint64_t offset; //if offset is ZERO, the file was ERASED uint64_t offset; //if offset is ZERO, the file was ERASED
uint64_t size; uint64_t size;
@ -71,7 +70,6 @@ private:
uint64_t a = 0; uint64_t a = 0;
uint64_t b = 0; uint64_t b = 0;
bool operator<(const PathMD5 &p_md5) const { bool operator<(const PathMD5 &p_md5) const {
if (p_md5.a == a) { if (p_md5.a == a) {
return b < p_md5.b; return b < p_md5.b;
} else { } else {
@ -120,7 +118,6 @@ public:
}; };
class PackSource { class PackSource {
public: public:
virtual bool try_open_pack(const String &p_path, bool p_replace_files) = 0; virtual bool try_open_pack(const String &p_path, bool p_replace_files) = 0;
virtual FileAccess *get_file(const String &p_path, PackedData::PackedFile *p_file) = 0; virtual FileAccess *get_file(const String &p_path, PackedData::PackedFile *p_file) = 0;
@ -128,14 +125,12 @@ public:
}; };
class PackedSourcePCK : public PackSource { class PackedSourcePCK : public PackSource {
public: public:
virtual bool try_open_pack(const String &p_path, bool p_replace_files); virtual bool try_open_pack(const String &p_path, bool p_replace_files);
virtual FileAccess *get_file(const String &p_path, PackedData::PackedFile *p_file); virtual FileAccess *get_file(const String &p_path, PackedData::PackedFile *p_file);
}; };
class FileAccessPack : public FileAccess { class FileAccessPack : public FileAccess {
PackedData::PackedFile pf; PackedData::PackedFile pf;
mutable size_t pos; mutable size_t pos;
@ -178,7 +173,6 @@ public:
}; };
FileAccess *PackedData::try_open_path(const String &p_path) { FileAccess *PackedData::try_open_path(const String &p_path) {
PathMD5 pmd5(p_path.md5_buffer()); PathMD5 pmd5(p_path.md5_buffer());
Map<PathMD5, PackedFile>::Element *E = files.find(pmd5); Map<PathMD5, PackedFile>::Element *E = files.find(pmd5);
if (!E) if (!E)
@ -190,12 +184,10 @@ FileAccess *PackedData::try_open_path(const String &p_path) {
} }
bool PackedData::has_path(const String &p_path) { bool PackedData::has_path(const String &p_path) {
return files.has(PathMD5(p_path.md5_buffer())); return files.has(PathMD5(p_path.md5_buffer()));
} }
class DirAccessPack : public DirAccess { class DirAccessPack : public DirAccess {
PackedData::PackedDir *current; PackedData::PackedDir *current;
List<String> list_dirs; List<String> list_dirs;

35
core/io/file_access_zip.cpp
View file

@ -40,7 +40,6 @@ ZipArchive *ZipArchive::instance = nullptr;
extern "C" { extern "C" {
static void *godot_open(void *data, const char *p_fname, int mode) { static void *godot_open(void *data, const char *p_fname, int mode) {
if (mode & ZLIB_FILEFUNC_MODE_WRITE) { if (mode & ZLIB_FILEFUNC_MODE_WRITE) {
return nullptr; return nullptr;
} }
@ -52,30 +51,25 @@ static void *godot_open(void *data, const char *p_fname, int mode) {
} }
static uLong godot_read(void *data, void *fdata, void *buf, uLong size) { static uLong godot_read(void *data, void *fdata, void *buf, uLong size) {
FileAccess *f = (FileAccess *)data; FileAccess *f = (FileAccess *)data;
f->get_buffer((uint8_t *)buf, size); f->get_buffer((uint8_t *)buf, size);
return size; return size;
} }
static uLong godot_write(voidpf opaque, voidpf stream, const void *buf, uLong size) { static uLong godot_write(voidpf opaque, voidpf stream, const void *buf, uLong size) {
return 0; return 0;
} }
static long godot_tell(voidpf opaque, voidpf stream) { static long godot_tell(voidpf opaque, voidpf stream) {
FileAccess *f = (FileAccess *)opaque; FileAccess *f = (FileAccess *)opaque;
return f->get_position(); return f->get_position();
} }
static long godot_seek(voidpf opaque, voidpf stream, uLong offset, int origin) { static long godot_seek(voidpf opaque, voidpf stream, uLong offset, int origin) {
FileAccess *f = (FileAccess *)opaque; FileAccess *f = (FileAccess *)opaque;
int pos = offset; int pos = offset;
switch (origin) { switch (origin) {
case ZLIB_FILEFUNC_SEEK_CUR: case ZLIB_FILEFUNC_SEEK_CUR:
pos = f->get_position() + offset; pos = f->get_position() + offset;
break; break;
@ -91,32 +85,27 @@ static long godot_seek(voidpf opaque, voidpf stream, uLong offset, int origin) {
} }
static int godot_close(voidpf opaque, voidpf stream) { static int godot_close(voidpf opaque, voidpf stream) {
FileAccess *f = (FileAccess *)opaque; FileAccess *f = (FileAccess *)opaque;
f->close(); f->close();
return 0; return 0;
} }
static int godot_testerror(voidpf opaque, voidpf stream) { static int godot_testerror(voidpf opaque, voidpf stream) {
FileAccess *f = (FileAccess *)opaque; FileAccess *f = (FileAccess *)opaque;
return f->get_error() != OK ? 1 : 0; return f->get_error() != OK ? 1 : 0;
} }
static voidpf godot_alloc(voidpf opaque, uInt items, uInt size) { static voidpf godot_alloc(voidpf opaque, uInt items, uInt size) {
return memalloc(items * size); return memalloc(items * size);
} }
static void godot_free(voidpf opaque, voidpf address) { static void godot_free(voidpf opaque, voidpf address) {
memfree(address); memfree(address);
} }
} // extern "C" } // extern "C"
void ZipArchive::close_handle(unzFile p_file) const { void ZipArchive::close_handle(unzFile p_file) const {
ERR_FAIL_COND_MSG(!p_file, "Cannot close a file if none is open."); ERR_FAIL_COND_MSG(!p_file, "Cannot close a file if none is open.");
FileAccess *f = (FileAccess *)unzGetOpaque(p_file); FileAccess *f = (FileAccess *)unzGetOpaque(p_file);
unzCloseCurrentFile(p_file); unzCloseCurrentFile(p_file);
@ -125,7 +114,6 @@ void ZipArchive::close_handle(unzFile p_file) const {
} }
unzFile ZipArchive::get_file_handle(String p_file) const { unzFile ZipArchive::get_file_handle(String p_file) const {
ERR_FAIL_COND_V_MSG(!file_exists(p_file), nullptr, "File '" + p_file + " doesn't exist."); ERR_FAIL_COND_V_MSG(!file_exists(p_file), nullptr, "File '" + p_file + " doesn't exist.");
File file = files[p_file]; File file = files[p_file];
@ -152,7 +140,6 @@ unzFile ZipArchive::get_file_handle(String p_file) const {
ERR_FAIL_COND_V(!pkg, nullptr); ERR_FAIL_COND_V(!pkg, nullptr);
int unz_err = unzGoToFilePos(pkg, &file.file_pos); int unz_err = unzGoToFilePos(pkg, &file.file_pos);
if (unz_err != UNZ_OK || unzOpenCurrentFile(pkg) != UNZ_OK) { if (unz_err != UNZ_OK || unzOpenCurrentFile(pkg) != UNZ_OK) {
unzClose(pkg); unzClose(pkg);
ERR_FAIL_V(nullptr); ERR_FAIL_V(nullptr);
} }
@ -161,7 +148,6 @@ unzFile ZipArchive::get_file_handle(String p_file) const {
} }
bool ZipArchive::try_open_pack(const String &p_path, bool p_replace_files) { bool ZipArchive::try_open_pack(const String &p_path, bool p_replace_files) {
//printf("opening zip pack %ls, %i, %i\n", p_name.c_str(), p_name.extension().nocasecmp_to("zip"), p_name.extension().nocasecmp_to("pcz")); //printf("opening zip pack %ls, %i, %i\n", p_name.c_str(), p_name.extension().nocasecmp_to("zip"), p_name.extension().nocasecmp_to("pcz"));
if (p_path.get_extension().nocasecmp_to("zip") != 0 && p_path.get_extension().nocasecmp_to("pcz") != 0) if (p_path.get_extension().nocasecmp_to("zip") != 0 && p_path.get_extension().nocasecmp_to("pcz") != 0)
return false; return false;
@ -195,7 +181,6 @@ bool ZipArchive::try_open_pack(const String &p_path, bool p_replace_files) {
int pkg_num = packages.size() - 1; int pkg_num = packages.size() - 1;
for (uint64_t i = 0; i < gi.number_entry; i++) { for (uint64_t i = 0; i < gi.number_entry; i++) {
char filename_inzip[256]; char filename_inzip[256];
unz_file_info64 file_info; unz_file_info64 file_info;
@ -222,17 +207,14 @@ bool ZipArchive::try_open_pack(const String &p_path, bool p_replace_files) {
} }
bool ZipArchive::file_exists(String p_name) const { bool ZipArchive::file_exists(String p_name) const {
return files.has(p_name); return files.has(p_name);
} }
FileAccess *ZipArchive::get_file(const String &p_path, PackedData::PackedFile *p_file) { FileAccess *ZipArchive::get_file(const String &p_path, PackedData::PackedFile *p_file) {
return memnew(FileAccessZip(p_path, *p_file)); return memnew(FileAccessZip(p_path, *p_file));
} }
ZipArchive *ZipArchive::get_singleton() { ZipArchive *ZipArchive::get_singleton() {
if (instance == nullptr) { if (instance == nullptr) {
instance = memnew(ZipArchive); instance = memnew(ZipArchive);
} }
@ -245,9 +227,7 @@ ZipArchive::ZipArchive() {
} }
ZipArchive::~ZipArchive() { ZipArchive::~ZipArchive() {
for (int i = 0; i < packages.size(); i++) { for (int i = 0; i < packages.size(); i++) {
FileAccess *f = (FileAccess *)unzGetOpaque(packages[i].zfile); FileAccess *f = (FileAccess *)unzGetOpaque(packages[i].zfile);
unzClose(packages[i].zfile); unzClose(packages[i].zfile);
memdelete(f); memdelete(f);
@ -257,7 +237,6 @@ ZipArchive::~ZipArchive() {
} }
Error FileAccessZip::_open(const String &p_path, int p_mode_flags) { Error FileAccessZip::_open(const String &p_path, int p_mode_flags) {
close(); close();
ERR_FAIL_COND_V(p_mode_flags & FileAccess::WRITE, FAILED); ERR_FAIL_COND_V(p_mode_flags & FileAccess::WRITE, FAILED);
@ -273,7 +252,6 @@ Error FileAccessZip::_open(const String &p_path, int p_mode_flags) {
} }
void FileAccessZip::close() { void FileAccessZip::close() {
if (!zfile) if (!zfile)
return; return;
@ -284,50 +262,42 @@ void FileAccessZip::close() {
} }
bool FileAccessZip::is_open() const { bool FileAccessZip::is_open() const {
return zfile != nullptr; return zfile != nullptr;
} }
void FileAccessZip::seek(size_t p_position) { void FileAccessZip::seek(size_t p_position) {
ERR_FAIL_COND(!zfile); ERR_FAIL_COND(!zfile);
unzSeekCurrentFile(zfile, p_position); unzSeekCurrentFile(zfile, p_position);
} }
void FileAccessZip::seek_end(int64_t p_position) { void FileAccessZip::seek_end(int64_t p_position) {
ERR_FAIL_COND(!zfile); ERR_FAIL_COND(!zfile);
unzSeekCurrentFile(zfile, get_len() + p_position); unzSeekCurrentFile(zfile, get_len() + p_position);
} }
size_t FileAccessZip::get_position() const { size_t FileAccessZip::get_position() const {
ERR_FAIL_COND_V(!zfile, 0); ERR_FAIL_COND_V(!zfile, 0);
return unztell(zfile); return unztell(zfile);
} }
size_t FileAccessZip::get_len() const { size_t FileAccessZip::get_len() const {
ERR_FAIL_COND_V(!zfile, 0); ERR_FAIL_COND_V(!zfile, 0);
return file_info.uncompressed_size; return file_info.uncompressed_size;
} }
bool FileAccessZip::eof_reached() const { bool FileAccessZip::eof_reached() const {
ERR_FAIL_COND_V(!zfile, true); ERR_FAIL_COND_V(!zfile, true);
return at_eof; return at_eof;
} }
uint8_t FileAccessZip::get_8() const { uint8_t FileAccessZip::get_8() const {
uint8_t ret = 0; uint8_t ret = 0;
get_buffer(&ret, 1); get_buffer(&ret, 1);
return ret; return ret;
} }
int FileAccessZip::get_buffer(uint8_t *p_dst, int p_length) const { int FileAccessZip::get_buffer(uint8_t *p_dst, int p_length) const {
ERR_FAIL_COND_V(!zfile, -1); ERR_FAIL_COND_V(!zfile, -1);
at_eof = unzeof(zfile); at_eof = unzeof(zfile);
if (at_eof) if (at_eof)
@ -340,9 +310,7 @@ int FileAccessZip::get_buffer(uint8_t *p_dst, int p_length) const {
} }
Error FileAccessZip::get_error() const { Error FileAccessZip::get_error() const {
if (!zfile) { if (!zfile) {
return ERR_UNCONFIGURED; return ERR_UNCONFIGURED;
} }
if (eof_reached()) { if (eof_reached()) {
@ -353,17 +321,14 @@ Error FileAccessZip::get_error() const {
} }
void FileAccessZip::flush() { void FileAccessZip::flush() {
ERR_FAIL(); ERR_FAIL();
} }
void FileAccessZip::store_8(uint8_t p_dest) { void FileAccessZip::store_8(uint8_t p_dest) {
ERR_FAIL(); ERR_FAIL();
} }
bool FileAccessZip::file_exists(const String &p_name) { bool FileAccessZip::file_exists(const String &p_name) {
return false; return false;
} }

3
core/io/file_access_zip.h
View file

@ -41,10 +41,8 @@
#include <stdlib.h> #include <stdlib.h>
class ZipArchive : public PackSource { class ZipArchive : public PackSource {
public: public:
struct File { struct File {
int package = -1; int package = -1;
unz_file_pos file_pos; unz_file_pos file_pos;
File() {} File() {}
@ -81,7 +79,6 @@ public:
}; };
class FileAccessZip : public FileAccess { class FileAccessZip : public FileAccess {
unzFile zfile; unzFile zfile;
unz_file_info64 file_info; unz_file_info64 file_info;

49
core/io/http_client.cpp
View file

@ -47,7 +47,6 @@ const char *HTTPClient::_methods[METHOD_MAX] = {
#ifndef JAVASCRIPT_ENABLED #ifndef JAVASCRIPT_ENABLED
Error HTTPClient::connect_to_host(const String &p_host, int p_port, bool p_ssl, bool p_verify_host) { Error HTTPClient::connect_to_host(const String &p_host, int p_port, bool p_ssl, bool p_verify_host) {
close(); close();
conn_port = p_port; conn_port = p_port;
@ -58,10 +57,8 @@ Error HTTPClient::connect_to_host(const String &p_host, int p_port, bool p_ssl,
String host_lower = conn_host.to_lower(); String host_lower = conn_host.to_lower();
if (host_lower.begins_with("http://")) { if (host_lower.begins_with("http://")) {
conn_host = conn_host.substr(7, conn_host.length() - 7); conn_host = conn_host.substr(7, conn_host.length() - 7);
} else if (host_lower.begins_with("https://")) { } else if (host_lower.begins_with("https://")) {
ssl = true; ssl = true;
conn_host = conn_host.substr(8, conn_host.length() - 8); conn_host = conn_host.substr(8, conn_host.length() - 8);
} }
@ -97,7 +94,6 @@ Error HTTPClient::connect_to_host(const String &p_host, int p_port, bool p_ssl,
} }
void HTTPClient::set_connection(const Ref<StreamPeer> &p_connection) { void HTTPClient::set_connection(const Ref<StreamPeer> &p_connection) {
ERR_FAIL_COND_MSG(p_connection.is_null(), "Connection is not a reference to a valid StreamPeer object."); ERR_FAIL_COND_MSG(p_connection.is_null(), "Connection is not a reference to a valid StreamPeer object.");
close(); close();
@ -106,12 +102,10 @@ void HTTPClient::set_connection(const Ref<StreamPeer> &p_connection) {
} }
Ref<StreamPeer> HTTPClient::get_connection() const { Ref<StreamPeer> HTTPClient::get_connection() const {
return connection; return connection;
} }
Error HTTPClient::request_raw(Method p_method, const String &p_url, const Vector<String> &p_headers, const Vector<uint8_t> &p_body) { Error HTTPClient::request_raw(Method p_method, const String &p_url, const Vector<String> &p_headers, const Vector<uint8_t> &p_body) {
ERR_FAIL_INDEX_V(p_method, METHOD_MAX, ERR_INVALID_PARAMETER); ERR_FAIL_INDEX_V(p_method, METHOD_MAX, ERR_INVALID_PARAMETER);
ERR_FAIL_COND_V(!p_url.begins_with("/"), ERR_INVALID_PARAMETER); ERR_FAIL_COND_V(!p_url.begins_with("/"), ERR_INVALID_PARAMETER);
ERR_FAIL_COND_V(status != STATUS_CONNECTED, ERR_INVALID_PARAMETER); ERR_FAIL_COND_V(status != STATUS_CONNECTED, ERR_INVALID_PARAMETER);
@ -179,7 +173,6 @@ Error HTTPClient::request_raw(Method p_method, const String &p_url, const Vector
} }
Error HTTPClient::request(Method p_method, const String &p_url, const Vector<String> &p_headers, const String &p_body) { Error HTTPClient::request(Method p_method, const String &p_url, const Vector<String> &p_headers, const String &p_body) {
ERR_FAIL_INDEX_V(p_method, METHOD_MAX, ERR_INVALID_PARAMETER); ERR_FAIL_INDEX_V(p_method, METHOD_MAX, ERR_INVALID_PARAMETER);
ERR_FAIL_COND_V(!p_url.begins_with("/"), ERR_INVALID_PARAMETER); ERR_FAIL_COND_V(!p_url.begins_with("/"), ERR_INVALID_PARAMETER);
ERR_FAIL_COND_V(status != STATUS_CONNECTED, ERR_INVALID_PARAMETER); ERR_FAIL_COND_V(status != STATUS_CONNECTED, ERR_INVALID_PARAMETER);
@ -235,27 +228,22 @@ Error HTTPClient::request(Method p_method, const String &p_url, const Vector<Str
} }
bool HTTPClient::has_response() const { bool HTTPClient::has_response() const {
return response_headers.size() != 0; return response_headers.size() != 0;
} }
bool HTTPClient::is_response_chunked() const { bool HTTPClient::is_response_chunked() const {
return chunked; return chunked;
} }
int HTTPClient::get_response_code() const { int HTTPClient::get_response_code() const {
return response_num; return response_num;
} }
Error HTTPClient::get_response_headers(List<String> *r_response) { Error HTTPClient::get_response_headers(List<String> *r_response) {
if (!response_headers.size()) if (!response_headers.size())
return ERR_INVALID_PARAMETER; return ERR_INVALID_PARAMETER;
for (int i = 0; i < response_headers.size(); i++) { for (int i = 0; i < response_headers.size(); i++) {
r_response->push_back(response_headers[i]); r_response->push_back(response_headers[i]);
} }
@ -265,7 +253,6 @@ Error HTTPClient::get_response_headers(List<String> *r_response) {
} }
void HTTPClient::close() { void HTTPClient::close() {
if (tcp_connection->get_status() != StreamPeerTCP::STATUS_NONE) if (tcp_connection->get_status() != StreamPeerTCP::STATUS_NONE)
tcp_connection->disconnect_from_host(); tcp_connection->disconnect_from_host();
@ -273,7 +260,6 @@ void HTTPClient::close() {
status = STATUS_DISCONNECTED; status = STATUS_DISCONNECTED;
head_request = false; head_request = false;
if (resolving != IP::RESOLVER_INVALID_ID) { if (resolving != IP::RESOLVER_INVALID_ID) {
IP::get_singleton()->erase_resolve_item(resolving); IP::get_singleton()->erase_resolve_item(resolving);
resolving = IP::RESOLVER_INVALID_ID; resolving = IP::RESOLVER_INVALID_ID;
} }
@ -290,9 +276,7 @@ void HTTPClient::close() {
} }
Error HTTPClient::poll() { Error HTTPClient::poll() {
switch (status) { switch (status) {
case STATUS_RESOLVING: { case STATUS_RESOLVING: {
ERR_FAIL_COND_V(resolving == IP::RESOLVER_INVALID_ID, ERR_BUG); ERR_FAIL_COND_V(resolving == IP::RESOLVER_INVALID_ID, ERR_BUG);
@ -302,7 +286,6 @@ Error HTTPClient::poll() {
return OK; // Still resolving return OK; // Still resolving
case IP::RESOLVER_STATUS_DONE: { case IP::RESOLVER_STATUS_DONE: {
IP_Address host = IP::get_singleton()->get_resolve_item_address(resolving); IP_Address host = IP::get_singleton()->get_resolve_item_address(resolving);
Error err = tcp_connection->connect_to_host(host, conn_port); Error err = tcp_connection->connect_to_host(host, conn_port);
IP::get_singleton()->erase_resolve_item(resolving); IP::get_singleton()->erase_resolve_item(resolving);
@ -316,7 +299,6 @@ Error HTTPClient::poll() {
} break; } break;
case IP::RESOLVER_STATUS_NONE: case IP::RESOLVER_STATUS_NONE:
case IP::RESOLVER_STATUS_ERROR: { case IP::RESOLVER_STATUS_ERROR: {
IP::get_singleton()->erase_resolve_item(resolving); IP::get_singleton()->erase_resolve_item(resolving);
resolving = IP::RESOLVER_INVALID_ID; resolving = IP::RESOLVER_INVALID_ID;
close(); close();
@ -326,10 +308,8 @@ Error HTTPClient::poll() {
} }
} break; } break;
case STATUS_CONNECTING: { case STATUS_CONNECTING: {
StreamPeerTCP::Status s = tcp_connection->get_status(); StreamPeerTCP::Status s = tcp_connection->get_status();
switch (s) { switch (s) {
case StreamPeerTCP::STATUS_CONNECTING: { case StreamPeerTCP::STATUS_CONNECTING: {
return OK; return OK;
} break; } break;
@ -379,7 +359,6 @@ Error HTTPClient::poll() {
} break; } break;
case StreamPeerTCP::STATUS_ERROR: case StreamPeerTCP::STATUS_ERROR:
case StreamPeerTCP::STATUS_NONE: { case StreamPeerTCP::STATUS_NONE: {
close(); close();
status = STATUS_CANT_CONNECT; status = STATUS_CANT_CONNECT;
return ERR_CANT_CONNECT; return ERR_CANT_CONNECT;
@ -404,7 +383,6 @@ Error HTTPClient::poll() {
return OK; return OK;
} break; } break;
case STATUS_REQUESTING: { case STATUS_REQUESTING: {
while (true) { while (true) {
uint8_t byte; uint8_t byte;
int rec = 0; int rec = 0;
@ -423,7 +401,6 @@ Error HTTPClient::poll() {
if ( if (
(rs >= 2 && response_str[rs - 2] == '\n' && response_str[rs - 1] == '\n') || (rs >= 2 && response_str[rs - 2] == '\n' && response_str[rs - 1] == '\n') ||
(rs >= 4 && response_str[rs - 4] == '\r' && response_str[rs - 3] == '\n' && response_str[rs - 2] == '\r' && response_str[rs - 1] == '\n')) { (rs >= 4 && response_str[rs - 4] == '\r' && response_str[rs - 3] == '\n' && response_str[rs - 2] == '\r' && response_str[rs - 1] == '\n')) {
// End of response, parse. // End of response, parse.
response_str.push_back(0); response_str.push_back(0);
String response; String response;
@ -445,7 +422,6 @@ Error HTTPClient::poll() {
bool keep_alive = true; bool keep_alive = true;
for (int i = 0; i < responses.size(); i++) { for (int i = 0; i < responses.size(); i++) {
String header = responses[i].strip_edges(); String header = responses[i].strip_edges();
String s = header.to_lower(); String s = header.to_lower();
if (s.length() == 0) if (s.length() == 0)
@ -464,11 +440,9 @@ Error HTTPClient::poll() {
} }
if (i == 0 && responses[i].begins_with("HTTP")) { if (i == 0 && responses[i].begins_with("HTTP")) {
String num = responses[i].get_slicec(' ', 1); String num = responses[i].get_slicec(' ', 1);
response_num = num.to_int(); response_num = num.to_int();
} else { } else {
response_headers.push_back(header); response_headers.push_back(header);
} }
} }
@ -480,14 +454,11 @@ Error HTTPClient::poll() {
} }
if (body_size != -1 || chunked) { if (body_size != -1 || chunked) {
status = STATUS_BODY; status = STATUS_BODY;
} else if (!keep_alive) { } else if (!keep_alive) {
read_until_eof = true; read_until_eof = true;
status = STATUS_BODY; status = STATUS_BODY;
} else { } else {
status = STATUS_CONNECTED; status = STATUS_CONNECTED;
} }
return OK; return OK;
@ -513,21 +484,17 @@ Error HTTPClient::poll() {
} }
int HTTPClient::get_response_body_length() const { int HTTPClient::get_response_body_length() const {
return body_size; return body_size;
} }
PackedByteArray HTTPClient::read_response_body_chunk() { PackedByteArray HTTPClient::read_response_body_chunk() {
ERR_FAIL_COND_V(status != STATUS_BODY, PackedByteArray()); ERR_FAIL_COND_V(status != STATUS_BODY, PackedByteArray());
PackedByteArray ret; PackedByteArray ret;
Error err = OK; Error err = OK;
if (chunked) { if (chunked) {
while (true) { while (true) {
if (chunk_trailer_part) { if (chunk_trailer_part) {
// We need to consume the trailer part too or keep-alive will break // We need to consume the trailer part too or keep-alive will break
uint8_t b; uint8_t b;
@ -569,7 +536,6 @@ PackedByteArray HTTPClient::read_response_body_chunk() {
} }
if (chunk.size() > 2 && chunk[chunk.size() - 2] == '\r' && chunk[chunk.size() - 1] == '\n') { if (chunk.size() > 2 && chunk[chunk.size() - 2] == '\r' && chunk[chunk.size() - 1] == '\n') {
int len = 0; int len = 0;
for (int i = 0; i < chunk.size() - 2; i++) { for (int i = 0; i < chunk.size() - 2; i++) {
char c = chunk[i]; char c = chunk[i];
@ -605,7 +571,6 @@ PackedByteArray HTTPClient::read_response_body_chunk() {
chunk.resize(chunk_left); chunk.resize(chunk_left);
} }
} else { } else {
int rec = 0; int rec = 0;
err = _get_http_data(&chunk.write[chunk.size() - chunk_left], chunk_left, rec); err = _get_http_data(&chunk.write[chunk.size() - chunk_left], chunk_left, rec);
if (rec == 0) { if (rec == 0) {
@ -614,7 +579,6 @@ PackedByteArray HTTPClient::read_response_body_chunk() {
chunk_left -= rec; chunk_left -= rec;
if (chunk_left == 0) { if (chunk_left == 0) {
if (chunk[chunk.size() - 2] != '\r' || chunk[chunk.size() - 1] != '\n') { if (chunk[chunk.size() - 2] != '\r' || chunk[chunk.size() - 1] != '\n') {
ERR_PRINT("HTTP Invalid chunk terminator (not \\r\\n)"); ERR_PRINT("HTTP Invalid chunk terminator (not \\r\\n)");
status = STATUS_CONNECTION_ERROR; status = STATUS_CONNECTION_ERROR;
@ -632,7 +596,6 @@ PackedByteArray HTTPClient::read_response_body_chunk() {
} }
} else { } else {
int to_read = !read_until_eof ? MIN(body_left, read_chunk_size) : read_chunk_size; int to_read = !read_until_eof ? MIN(body_left, read_chunk_size) : read_chunk_size;
ret.resize(to_read); ret.resize(to_read);
int _offset = 0; int _offset = 0;
@ -658,18 +621,14 @@ PackedByteArray HTTPClient::read_response_body_chunk() {
} }
if (err != OK) { if (err != OK) {
close(); close();
if (err == ERR_FILE_EOF) { if (err == ERR_FILE_EOF) {
status = STATUS_DISCONNECTED; // Server disconnected status = STATUS_DISCONNECTED; // Server disconnected
} else { } else {
status = STATUS_CONNECTION_ERROR; status = STATUS_CONNECTION_ERROR;
} }
} else if (body_left == 0 && !chunked && !read_until_eof) { } else if (body_left == 0 && !chunked && !read_until_eof) {
status = STATUS_CONNECTED; status = STATUS_CONNECTED;
} }
@ -677,24 +636,19 @@ PackedByteArray HTTPClient::read_response_body_chunk() {
} }
HTTPClient::Status HTTPClient::get_status() const { HTTPClient::Status HTTPClient::get_status() const {
return status; return status;
} }
void HTTPClient::set_blocking_mode(bool p_enable) { void HTTPClient::set_blocking_mode(bool p_enable) {
blocking = p_enable; blocking = p_enable;
} }
bool HTTPClient::is_blocking_mode_enabled() const { bool HTTPClient::is_blocking_mode_enabled() const {
return blocking; return blocking;
} }
Error HTTPClient::_get_http_data(uint8_t *p_buffer, int p_bytes, int &r_received) { Error HTTPClient::_get_http_data(uint8_t *p_buffer, int p_bytes, int &r_received) {
if (blocking) { if (blocking) {
// We can't use StreamPeer.get_data, since when reaching EOF we will get an // We can't use StreamPeer.get_data, since when reaching EOF we will get an
// error without knowing how many bytes we received. // error without knowing how many bytes we received.
Error err = ERR_FILE_EOF; Error err = ERR_FILE_EOF;
@ -767,7 +721,6 @@ String HTTPClient::query_string_from_dict(const Dictionary &p_dict) {
} }
Dictionary HTTPClient::_get_response_headers_as_dictionary() { Dictionary HTTPClient::_get_response_headers_as_dictionary() {
List<String> rh; List<String> rh;
get_response_headers(&rh); get_response_headers(&rh);
Dictionary ret; Dictionary ret;
@ -785,7 +738,6 @@ Dictionary HTTPClient::_get_response_headers_as_dictionary() {
} }
PackedStringArray HTTPClient::_get_response_headers() { PackedStringArray HTTPClient::_get_response_headers() {
List<String> rh; List<String> rh;
get_response_headers(&rh); get_response_headers(&rh);
PackedStringArray ret; PackedStringArray ret;
@ -799,7 +751,6 @@ PackedStringArray HTTPClient::_get_response_headers() {
} }
void HTTPClient::_bind_methods() { void HTTPClient::_bind_methods() {
ClassDB::bind_method(D_METHOD("connect_to_host", "host", "port", "use_ssl", "verify_host"), &HTTPClient::connect_to_host, DEFVAL(-1), DEFVAL(false), DEFVAL(true)); ClassDB::bind_method(D_METHOD("connect_to_host", "host", "port", "use_ssl", "verify_host"), &HTTPClient::connect_to_host, DEFVAL(-1), DEFVAL(false), DEFVAL(true));
ClassDB::bind_method(D_METHOD("set_connection", "connection"), &HTTPClient::set_connection); ClassDB::bind_method(D_METHOD("set_connection", "connection"), &HTTPClient::set_connection);
ClassDB::bind_method(D_METHOD("get_connection"), &HTTPClient::get_connection); ClassDB::bind_method(D_METHOD("get_connection"), &HTTPClient::get_connection);

1
core/io/http_client.h
View file

@ -37,7 +37,6 @@
#include "core/reference.h" #include "core/reference.h"
class HTTPClient : public Reference { class HTTPClient : public Reference {
GDCLASS(HTTPClient, Reference); GDCLASS(HTTPClient, Reference);
public: public:

16
core/io/image_loader.cpp
View file

@ -33,11 +33,9 @@
#include "core/print_string.h" #include "core/print_string.h"
bool ImageFormatLoader::recognize(const String &p_extension) const { bool ImageFormatLoader::recognize(const String &p_extension) const {
List<String> extensions; List<String> extensions;
get_recognized_extensions(&extensions); get_recognized_extensions(&extensions);
for (List<String>::Element *E = extensions.front(); E; E = E->next()) { for (List<String>::Element *E = extensions.front(); E; E = E->next()) {
if (E->get().nocasecmp_to(p_extension) == 0) if (E->get().nocasecmp_to(p_extension) == 0)
return true; return true;
} }
@ -61,7 +59,6 @@ Error ImageLoader::load_image(String p_file, Ref<Image> p_image, FileAccess *p_c
String extension = p_file.get_extension(); String extension = p_file.get_extension();
for (int i = 0; i < loader.size(); i++) { for (int i = 0; i < loader.size(); i++) {
if (!loader[i]->recognize(extension)) if (!loader[i]->recognize(extension))
continue; continue;
Error err = loader[i]->load_image(p_image, f, p_force_linear, p_scale); Error err = loader[i]->load_image(p_image, f, p_force_linear, p_scale);
@ -70,7 +67,6 @@ Error ImageLoader::load_image(String p_file, Ref<Image> p_image, FileAccess *p_c
} }
if (err != ERR_FILE_UNRECOGNIZED) { if (err != ERR_FILE_UNRECOGNIZED) {
if (!p_custom) if (!p_custom)
memdelete(f); memdelete(f);
@ -85,17 +81,13 @@ Error ImageLoader::load_image(String p_file, Ref<Image> p_image, FileAccess *p_c
} }
void ImageLoader::get_recognized_extensions(List<String> *p_extensions) { void ImageLoader::get_recognized_extensions(List<String> *p_extensions) {
for (int i = 0; i < loader.size(); i++) { for (int i = 0; i < loader.size(); i++) {
loader[i]->get_recognized_extensions(p_extensions); loader[i]->get_recognized_extensions(p_extensions);
} }
} }
ImageFormatLoader *ImageLoader::recognize(const String &p_extension) { ImageFormatLoader *ImageLoader::recognize(const String &p_extension) {
for (int i = 0; i < loader.size(); i++) { for (int i = 0; i < loader.size(); i++) {
if (loader[i]->recognize(p_extension)) if (loader[i]->recognize(p_extension))
return loader[i]; return loader[i];
} }
@ -106,22 +98,18 @@ ImageFormatLoader *ImageLoader::recognize(const String &p_extension) {
Vector<ImageFormatLoader *> ImageLoader::loader; Vector<ImageFormatLoader *> ImageLoader::loader;
void ImageLoader::add_image_format_loader(ImageFormatLoader *p_loader) { void ImageLoader::add_image_format_loader(ImageFormatLoader *p_loader) {
loader.push_back(p_loader); loader.push_back(p_loader);
} }
void ImageLoader::remove_image_format_loader(ImageFormatLoader *p_loader) { void ImageLoader::remove_image_format_loader(ImageFormatLoader *p_loader) {
loader.erase(p_loader); loader.erase(p_loader);
} }
const Vector<ImageFormatLoader *> &ImageLoader::get_image_format_loaders() { const Vector<ImageFormatLoader *> &ImageLoader::get_image_format_loaders() {
return loader; return loader;
} }
void ImageLoader::cleanup() { void ImageLoader::cleanup() {
while (loader.size()) { while (loader.size()) {
remove_image_format_loader(loader[0]); remove_image_format_loader(loader[0]);
} }
@ -130,7 +118,6 @@ void ImageLoader::cleanup() {
///////////////// /////////////////
RES ResourceFormatLoaderImage::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, bool p_no_cache) { RES ResourceFormatLoaderImage::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, bool p_no_cache) {
FileAccess *f = FileAccess::open(p_path, FileAccess::READ); FileAccess *f = FileAccess::open(p_path, FileAccess::READ);
if (!f) { if (!f) {
if (r_error) { if (r_error) {
@ -192,16 +179,13 @@ RES ResourceFormatLoaderImage::load(const String &p_path, const String &p_origin
} }
void ResourceFormatLoaderImage::get_recognized_extensions(List<String> *p_extensions) const { void ResourceFormatLoaderImage::get_recognized_extensions(List<String> *p_extensions) const {
p_extensions->push_back("image"); p_extensions->push_back("image");
} }
bool ResourceFormatLoaderImage::handles_type(const String &p_type) const { bool ResourceFormatLoaderImage::handles_type(const String &p_type) const {
return p_type == "Image"; return p_type == "Image";
} }
String ResourceFormatLoaderImage::get_resource_type(const String &p_path) const { String ResourceFormatLoaderImage::get_resource_type(const String &p_path) const {
return p_path.get_extension().to_lower() == "image" ? "Image" : String(); return p_path.get_extension().to_lower() == "image" ? "Image" : String();
} }

1
core/io/image_loader.h
View file

@ -53,7 +53,6 @@ public:
}; };
class ImageLoader { class ImageLoader {
static Vector<ImageFormatLoader *> loader; static Vector<ImageFormatLoader *> loader;
friend class ResourceFormatLoaderImage; friend class ResourceFormatLoaderImage;

21
core/io/ip.cpp
View file

@ -39,9 +39,7 @@ VARIANT_ENUM_CAST(IP::ResolverStatus);
/************* RESOLVER ******************/ /************* RESOLVER ******************/
struct _IP_ResolverPrivate { struct _IP_ResolverPrivate {
struct QueueItem { struct QueueItem {
volatile IP::ResolverStatus status; volatile IP::ResolverStatus status;
IP_Address response; IP_Address response;
String hostname; String hostname;
@ -62,7 +60,6 @@ struct _IP_ResolverPrivate {
QueueItem queue[IP::RESOLVER_MAX_QUERIES]; QueueItem queue[IP::RESOLVER_MAX_QUERIES];
IP::ResolverID find_empty_id() const { IP::ResolverID find_empty_id() const {
for (int i = 0; i < IP::RESOLVER_MAX_QUERIES; i++) { for (int i = 0; i < IP::RESOLVER_MAX_QUERIES; i++) {
if (queue[i].status == IP::RESOLVER_STATUS_NONE) if (queue[i].status == IP::RESOLVER_STATUS_NONE)
return i; return i;
@ -78,9 +75,7 @@ struct _IP_ResolverPrivate {
bool thread_abort; bool thread_abort;
void resolve_queues() { void resolve_queues() {
for (int i = 0; i < IP::RESOLVER_MAX_QUERIES; i++) { for (int i = 0; i < IP::RESOLVER_MAX_QUERIES; i++) {
if (queue[i].status != IP::RESOLVER_STATUS_WAITING) if (queue[i].status != IP::RESOLVER_STATUS_WAITING)
continue; continue;
queue[i].response = IP::get_singleton()->resolve_hostname(queue[i].hostname, queue[i].type); queue[i].response = IP::get_singleton()->resolve_hostname(queue[i].hostname, queue[i].type);
@ -93,11 +88,9 @@ struct _IP_ResolverPrivate {
} }
static void _thread_function(void *self) { static void _thread_function(void *self) {
_IP_ResolverPrivate *ipr = (_IP_ResolverPrivate *)self; _IP_ResolverPrivate *ipr = (_IP_ResolverPrivate *)self;
while (!ipr->thread_abort) { while (!ipr->thread_abort) {
ipr->sem.wait(); ipr->sem.wait();
MutexLock lock(ipr->mutex); MutexLock lock(ipr->mutex);
@ -113,7 +106,6 @@ struct _IP_ResolverPrivate {
}; };
IP_Address IP::resolve_hostname(const String &p_hostname, IP::Type p_type) { IP_Address IP::resolve_hostname(const String &p_hostname, IP::Type p_type) {
MutexLock lock(resolver->mutex); MutexLock lock(resolver->mutex);
String key = _IP_ResolverPrivate::get_cache_key(p_hostname, p_type); String key = _IP_ResolverPrivate::get_cache_key(p_hostname, p_type);
@ -128,7 +120,6 @@ IP_Address IP::resolve_hostname(const String &p_hostname, IP::Type p_type) {
} }
IP::ResolverID IP::resolve_hostname_queue_item(const String &p_hostname, IP::Type p_type) { IP::ResolverID IP::resolve_hostname_queue_item(const String &p_hostname, IP::Type p_type) {
MutexLock lock(resolver->mutex); MutexLock lock(resolver->mutex);
ResolverID id = resolver->find_empty_id(); ResolverID id = resolver->find_empty_id();
@ -157,7 +148,6 @@ IP::ResolverID IP::resolve_hostname_queue_item(const String &p_hostname, IP::Typ
} }
IP::ResolverStatus IP::get_resolve_item_status(ResolverID p_id) const { IP::ResolverStatus IP::get_resolve_item_status(ResolverID p_id) const {
ERR_FAIL_INDEX_V(p_id, IP::RESOLVER_MAX_QUERIES, IP::RESOLVER_STATUS_NONE); ERR_FAIL_INDEX_V(p_id, IP::RESOLVER_MAX_QUERIES, IP::RESOLVER_STATUS_NONE);
MutexLock lock(resolver->mutex); MutexLock lock(resolver->mutex);
@ -171,7 +161,6 @@ IP::ResolverStatus IP::get_resolve_item_status(ResolverID p_id) const {
} }
IP_Address IP::get_resolve_item_address(ResolverID p_id) const { IP_Address IP::get_resolve_item_address(ResolverID p_id) const {
ERR_FAIL_INDEX_V(p_id, IP::RESOLVER_MAX_QUERIES, IP_Address()); ERR_FAIL_INDEX_V(p_id, IP::RESOLVER_MAX_QUERIES, IP_Address());
MutexLock lock(resolver->mutex); MutexLock lock(resolver->mutex);
@ -186,7 +175,6 @@ IP_Address IP::get_resolve_item_address(ResolverID p_id) const {
} }
void IP::erase_resolve_item(ResolverID p_id) { void IP::erase_resolve_item(ResolverID p_id) {
ERR_FAIL_INDEX(p_id, IP::RESOLVER_MAX_QUERIES); ERR_FAIL_INDEX(p_id, IP::RESOLVER_MAX_QUERIES);
MutexLock lock(resolver->mutex); MutexLock lock(resolver->mutex);
@ -195,7 +183,6 @@ void IP::erase_resolve_item(ResolverID p_id) {
} }
void IP::clear_cache(const String &p_hostname) { void IP::clear_cache(const String &p_hostname) {
MutexLock lock(resolver->mutex); MutexLock lock(resolver->mutex);
if (p_hostname.empty()) { if (p_hostname.empty()) {
@ -209,7 +196,6 @@ void IP::clear_cache(const String &p_hostname) {
} }
Array IP::_get_local_addresses() const { Array IP::_get_local_addresses() const {
Array addresses; Array addresses;
List<IP_Address> ip_addresses; List<IP_Address> ip_addresses;
get_local_addresses(&ip_addresses); get_local_addresses(&ip_addresses);
@ -221,7 +207,6 @@ Array IP::_get_local_addresses() const {
} }
Array IP::_get_local_interfaces() const { Array IP::_get_local_interfaces() const {
Array results; Array results;
Map<String, Interface_Info> interfaces; Map<String, Interface_Info> interfaces;
get_local_interfaces(&interfaces); get_local_interfaces(&interfaces);
@ -245,7 +230,6 @@ Array IP::_get_local_interfaces() const {
} }
void IP::get_local_addresses(List<IP_Address> *r_addresses) const { void IP::get_local_addresses(List<IP_Address> *r_addresses) const {
Map<String, Interface_Info> interfaces; Map<String, Interface_Info> interfaces;
get_local_interfaces(&interfaces); get_local_interfaces(&interfaces);
for (Map<String, Interface_Info>::Element *E = interfaces.front(); E; E = E->next()) { for (Map<String, Interface_Info>::Element *E = interfaces.front(); E; E = E->next()) {
@ -256,7 +240,6 @@ void IP::get_local_addresses(List<IP_Address> *r_addresses) const {
} }
void IP::_bind_methods() { void IP::_bind_methods() {
ClassDB::bind_method(D_METHOD("resolve_hostname", "host", "ip_type"), &IP::resolve_hostname, DEFVAL(IP::TYPE_ANY)); ClassDB::bind_method(D_METHOD("resolve_hostname", "host", "ip_type"), &IP::resolve_hostname, DEFVAL(IP::TYPE_ANY));
ClassDB::bind_method(D_METHOD("resolve_hostname_queue_item", "host", "ip_type"), &IP::resolve_hostname_queue_item, DEFVAL(IP::TYPE_ANY)); ClassDB::bind_method(D_METHOD("resolve_hostname_queue_item", "host", "ip_type"), &IP::resolve_hostname_queue_item, DEFVAL(IP::TYPE_ANY));
ClassDB::bind_method(D_METHOD("get_resolve_item_status", "id"), &IP::get_resolve_item_status); ClassDB::bind_method(D_METHOD("get_resolve_item_status", "id"), &IP::get_resolve_item_status);
@ -283,21 +266,18 @@ void IP::_bind_methods() {
IP *IP::singleton = nullptr; IP *IP::singleton = nullptr;
IP *IP::get_singleton() { IP *IP::get_singleton() {
return singleton; return singleton;
} }
IP *(*IP::_create)() = nullptr; IP *(*IP::_create)() = nullptr;
IP *IP::create() { IP *IP::create() {
ERR_FAIL_COND_V_MSG(singleton, nullptr, "IP singleton already exist."); ERR_FAIL_COND_V_MSG(singleton, nullptr, "IP singleton already exist.");
ERR_FAIL_COND_V(!_create, nullptr); ERR_FAIL_COND_V(!_create, nullptr);
return _create(); return _create();
} }
IP::IP() { IP::IP() {
singleton = this; singleton = this;
resolver = memnew(_IP_ResolverPrivate); resolver = memnew(_IP_ResolverPrivate);
@ -312,7 +292,6 @@ IP::IP() {
} }
IP::~IP() { IP::~IP() {
#ifndef NO_THREADS #ifndef NO_THREADS
if (resolver->thread) { if (resolver->thread) {
resolver->thread_abort = true; resolver->thread_abort = true;

16
core/io/ip_address.cpp
View file

@ -39,7 +39,6 @@ IP_Address::operator Variant() const {
#include <string.h> #include <string.h>
IP_Address::operator String() const { IP_Address::operator String() const {
if (wildcard) if (wildcard)
return "*"; return "*";
@ -61,10 +60,8 @@ IP_Address::operator String() const {
} }
static void _parse_hex(const String &p_string, int p_start, uint8_t *p_dst) { static void _parse_hex(const String &p_string, int p_start, uint8_t *p_dst) {
uint16_t ret = 0; uint16_t ret = 0;
for (int i = p_start; i < p_start + 4; i++) { for (int i = p_start; i < p_start + 4; i++) {
if (i >= p_string.length()) { if (i >= p_string.length()) {
break; break;
}; };
@ -72,7 +69,6 @@ static void _parse_hex(const String &p_string, int p_start, uint8_t *p_dst) {
int n = 0; int n = 0;
CharType c = p_string[i]; CharType c = p_string[i];
if (c >= '0' && c <= '9') { if (c >= '0' && c <= '9') {
n = c - '0'; n = c - '0';
} else if (c >= 'a' && c <= 'f') { } else if (c >= 'a' && c <= 'f') {
n = 10 + (c - 'a'); n = 10 + (c - 'a');
@ -92,7 +88,6 @@ static void _parse_hex(const String &p_string, int p_start, uint8_t *p_dst) {
}; };
void IP_Address::_parse_ipv6(const String &p_string) { void IP_Address::_parse_ipv6(const String &p_string) {
static const int parts_total = 8; static const int parts_total = 8;
int parts[parts_total] = { 0 }; int parts[parts_total] = { 0 };
int parts_count = 0; int parts_count = 0;
@ -102,10 +97,8 @@ void IP_Address::_parse_ipv6(const String &p_string) {
int parts_idx = 0; int parts_idx = 0;
for (int i = 0; i < p_string.length(); i++) { for (int i = 0; i < p_string.length(); i++) {
CharType c = p_string[i]; CharType c = p_string[i];
if (c == ':') { if (c == ':') {
if (i == 0) { if (i == 0) {
continue; // next must be a ":" continue; // next must be a ":"
}; };
@ -115,7 +108,6 @@ void IP_Address::_parse_ipv6(const String &p_string) {
}; };
part_found = false; part_found = false;
} else if (c == '.') { } else if (c == '.') {
part_ipv4 = true; part_ipv4 = true;
} else if ((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F')) { } else if ((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F')) {
@ -136,9 +128,7 @@ void IP_Address::_parse_ipv6(const String &p_string) {
int idx = 0; int idx = 0;
for (int i = 0; i < parts_idx; i++) { for (int i = 0; i < parts_idx; i++) {
if (parts[i] == -1) { if (parts[i] == -1) {
for (int j = 0; j < parts_extra; j++) { for (int j = 0; j < parts_extra; j++) {
field16[idx++] = 0; field16[idx++] = 0;
}; };
@ -154,7 +144,6 @@ void IP_Address::_parse_ipv6(const String &p_string) {
}; };
void IP_Address::_parse_ipv4(const String &p_string, int p_start, uint8_t *p_ret) { void IP_Address::_parse_ipv4(const String &p_string, int p_start, uint8_t *p_ret) {
String ip; String ip;
if (p_start != 0) { if (p_start != 0) {
ip = p_string.substr(p_start, p_string.length() - p_start); ip = p_string.substr(p_start, p_string.length() - p_start);
@ -170,7 +159,6 @@ void IP_Address::_parse_ipv4(const String &p_string, int p_start, uint8_t *p_ret
}; };
void IP_Address::clear() { void IP_Address::clear() {
memset(&field8[0], 0, sizeof(field8)); memset(&field8[0], 0, sizeof(field8));
valid = false; valid = false;
wildcard = false; wildcard = false;
@ -204,7 +192,6 @@ void IP_Address::set_ipv6(const uint8_t *p_buf) {
} }
IP_Address::IP_Address(const String &p_string) { IP_Address::IP_Address(const String &p_string) {
clear(); clear();
if (p_string == "*") { if (p_string == "*") {
@ -228,7 +215,6 @@ IP_Address::IP_Address(const String &p_string) {
} }
_FORCE_INLINE_ static void _32_to_buf(uint8_t *p_dst, uint32_t p_n) { _FORCE_INLINE_ static void _32_to_buf(uint8_t *p_dst, uint32_t p_n) {
p_dst[0] = (p_n >> 24) & 0xff; p_dst[0] = (p_n >> 24) & 0xff;
p_dst[1] = (p_n >> 16) & 0xff; p_dst[1] = (p_n >> 16) & 0xff;
p_dst[2] = (p_n >> 8) & 0xff; p_dst[2] = (p_n >> 8) & 0xff;
@ -236,7 +222,6 @@ _FORCE_INLINE_ static void _32_to_buf(uint8_t *p_dst, uint32_t p_n) {
}; };
IP_Address::IP_Address(uint32_t p_a, uint32_t p_b, uint32_t p_c, uint32_t p_d, bool is_v6) { IP_Address::IP_Address(uint32_t p_a, uint32_t p_b, uint32_t p_c, uint32_t p_d, bool is_v6) {
clear(); clear();
valid = true; valid = true;
if (!is_v6) { if (!is_v6) {
@ -247,7 +232,6 @@ IP_Address::IP_Address(uint32_t p_a, uint32_t p_b, uint32_t p_c, uint32_t p_d, b
field8[14] = p_c; field8[14] = p_c;
field8[15] = p_d; field8[15] = p_d;
} else { } else {
_32_to_buf(&field8[0], p_a); _32_to_buf(&field8[0], p_a);
_32_to_buf(&field8[4], p_b); _32_to_buf(&field8[4], p_b);
_32_to_buf(&field8[8], p_c); _32_to_buf(&field8[8], p_c);

1
core/io/ip_address.h
View file

@ -34,7 +34,6 @@
#include "core/ustring.h" #include "core/ustring.h"
struct IP_Address { struct IP_Address {
private: private:
union { union {
uint8_t field8[16]; uint8_t field8[16];

43
core/io/json.cpp
View file

@ -46,7 +46,6 @@ const char *JSON::tk_name[TK_MAX] = {
}; };
static String _make_indent(const String &p_indent, int p_size) { static String _make_indent(const String &p_indent, int p_size) {
String indent_text = ""; String indent_text = "";
if (!p_indent.empty()) { if (!p_indent.empty()) {
for (int i = 0; i < p_size; i++) for (int i = 0; i < p_size; i++)
@ -56,7 +55,6 @@ static String _make_indent(const String &p_indent, int p_size) {
} }
String JSON::_print_var(const Variant &p_var, const String &p_indent, int p_cur_indent, bool p_sort_keys) { String JSON::_print_var(const Variant &p_var, const String &p_indent, int p_cur_indent, bool p_sort_keys) {
String colon = ":"; String colon = ":";
String end_statement = ""; String end_statement = "";
@ -66,7 +64,6 @@ String JSON::_print_var(const Variant &p_var, const String &p_indent, int p_cur_
} }
switch (p_var.get_type()) { switch (p_var.get_type()) {
case Variant::NIL: case Variant::NIL:
return "null"; return "null";
case Variant::BOOL: case Variant::BOOL:
@ -81,7 +78,6 @@ String JSON::_print_var(const Variant &p_var, const String &p_indent, int p_cur_
case Variant::PACKED_FLOAT64_ARRAY: case Variant::PACKED_FLOAT64_ARRAY:
case Variant::PACKED_STRING_ARRAY: case Variant::PACKED_STRING_ARRAY:
case Variant::ARRAY: { case Variant::ARRAY: {
String s = "["; String s = "[";
s += end_statement; s += end_statement;
Array a = p_var; Array a = p_var;
@ -96,7 +92,6 @@ String JSON::_print_var(const Variant &p_var, const String &p_indent, int p_cur_
return s; return s;
}; };
case Variant::DICTIONARY: { case Variant::DICTIONARY: {
String s = "{"; String s = "{";
s += end_statement; s += end_statement;
Dictionary d = p_var; Dictionary d = p_var;
@ -107,7 +102,6 @@ String JSON::_print_var(const Variant &p_var, const String &p_indent, int p_cur_
keys.sort(); keys.sort();
for (List<Variant>::Element *E = keys.front(); E; E = E->next()) { for (List<Variant>::Element *E = keys.front(); E; E = E->next()) {
if (E != keys.front()) { if (E != keys.front()) {
s += ","; s += ",";
s += end_statement; s += end_statement;
@ -126,17 +120,13 @@ String JSON::_print_var(const Variant &p_var, const String &p_indent, int p_cur_
} }
String JSON::print(const Variant &p_var, const String &p_indent, bool p_sort_keys) { String JSON::print(const Variant &p_var, const String &p_indent, bool p_sort_keys) {
return _print_var(p_var, p_indent, 0, p_sort_keys); return _print_var(p_var, p_indent, 0, p_sort_keys);
} }
Error JSON::_get_token(const CharType *p_str, int &index, int p_len, Token &r_token, int &line, String &r_err_str) { Error JSON::_get_token(const CharType *p_str, int &index, int p_len, Token &r_token, int &line, String &r_err_str) {
while (p_len > 0) { while (p_len > 0) {
switch (p_str[index]) { switch (p_str[index]) {
case '\n': { case '\n': {
line++; line++;
index++; index++;
break; break;
@ -146,43 +136,36 @@ Error JSON::_get_token(const CharType *p_str, int &index, int p_len, Token &r_to
return OK; return OK;
} break; } break;
case '{': { case '{': {
r_token.type = TK_CURLY_BRACKET_OPEN; r_token.type = TK_CURLY_BRACKET_OPEN;
index++; index++;
return OK; return OK;
}; };
case '}': { case '}': {
r_token.type = TK_CURLY_BRACKET_CLOSE; r_token.type = TK_CURLY_BRACKET_CLOSE;
index++; index++;
return OK; return OK;
}; };
case '[': { case '[': {
r_token.type = TK_BRACKET_OPEN; r_token.type = TK_BRACKET_OPEN;
index++; index++;
return OK; return OK;
}; };
case ']': { case ']': {
r_token.type = TK_BRACKET_CLOSE; r_token.type = TK_BRACKET_CLOSE;
index++; index++;
return OK; return OK;
}; };
case ':': { case ':': {
r_token.type = TK_COLON; r_token.type = TK_COLON;
index++; index++;
return OK; return OK;
}; };
case ',': { case ',': {
r_token.type = TK_COMMA; r_token.type = TK_COMMA;
index++; index++;
return OK; return OK;
}; };
case '"': { case '"': {
index++; index++;
String str; String str;
while (true) { while (true) {
@ -203,7 +186,6 @@ Error JSON::_get_token(const CharType *p_str, int &index, int p_len, Token &r_to
CharType res = 0; CharType res = 0;
switch (next) { switch (next) {
case 'b': case 'b':
res = 8; res = 8;
break; break;
@ -228,7 +210,6 @@ Error JSON::_get_token(const CharType *p_str, int &index, int p_len, Token &r_to
return ERR_PARSE_ERROR; return ERR_PARSE_ERROR;
} }
if (!((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F'))) { if (!((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F'))) {
r_err_str = "Malformed hex constant in string"; r_err_str = "Malformed hex constant in string";
return ERR_PARSE_ERROR; return ERR_PARSE_ERROR;
} }
@ -273,7 +254,6 @@ Error JSON::_get_token(const CharType *p_str, int &index, int p_len, Token &r_to
} break; } break;
default: { default: {
if (p_str[index] <= 32) { if (p_str[index] <= 32) {
index++; index++;
break; break;
@ -289,11 +269,9 @@ Error JSON::_get_token(const CharType *p_str, int &index, int p_len, Token &r_to
return OK; return OK;
} else if ((p_str[index] >= 'A' && p_str[index] <= 'Z') || (p_str[index] >= 'a' && p_str[index] <= 'z')) { } else if ((p_str[index] >= 'A' && p_str[index] <= 'Z') || (p_str[index] >= 'a' && p_str[index] <= 'z')) {
String id; String id;
while ((p_str[index] >= 'A' && p_str[index] <= 'Z') || (p_str[index] >= 'a' && p_str[index] <= 'z')) { while ((p_str[index] >= 'A' && p_str[index] <= 'Z') || (p_str[index] >= 'a' && p_str[index] <= 'z')) {
id += p_str[index]; id += p_str[index];
index++; index++;
} }
@ -313,9 +291,7 @@ Error JSON::_get_token(const CharType *p_str, int &index, int p_len, Token &r_to
} }
Error JSON::_parse_value(Variant &value, Token &token, const CharType *p_str, int &index, int p_len, int &line, String &r_err_str) { Error JSON::_parse_value(Variant &value, Token &token, const CharType *p_str, int &index, int p_len, int &line, String &r_err_str) {
if (token.type == TK_CURLY_BRACKET_OPEN) { if (token.type == TK_CURLY_BRACKET_OPEN) {
Dictionary d; Dictionary d;
Error err = _parse_object(d, p_str, index, p_len, line, r_err_str); Error err = _parse_object(d, p_str, index, p_len, line, r_err_str);
if (err) if (err)
@ -323,7 +299,6 @@ Error JSON::_parse_value(Variant &value, Token &token, const CharType *p_str, in
value = d; value = d;
return OK; return OK;
} else if (token.type == TK_BRACKET_OPEN) { } else if (token.type == TK_BRACKET_OPEN) {
Array a; Array a;
Error err = _parse_array(a, p_str, index, p_len, line, r_err_str); Error err = _parse_array(a, p_str, index, p_len, line, r_err_str);
if (err) if (err)
@ -332,7 +307,6 @@ Error JSON::_parse_value(Variant &value, Token &token, const CharType *p_str, in
return OK; return OK;
} else if (token.type == TK_IDENTIFIER) { } else if (token.type == TK_IDENTIFIER) {
String id = token.value; String id = token.value;
if (id == "true") if (id == "true")
value = true; value = true;
@ -347,11 +321,9 @@ Error JSON::_parse_value(Variant &value, Token &token, const CharType *p_str, in
return OK; return OK;
} else if (token.type == TK_NUMBER) { } else if (token.type == TK_NUMBER) {
value = token.value; value = token.value;
return OK; return OK;
} else if (token.type == TK_STRING) { } else if (token.type == TK_STRING) {
value = token.value; value = token.value;
return OK; return OK;
} else { } else {
@ -361,25 +333,20 @@ Error JSON::_parse_value(Variant &value, Token &token, const CharType *p_str, in
} }
Error JSON::_parse_array(Array &array, const CharType *p_str, int &index, int p_len, int &line, String &r_err_str) { Error JSON::_parse_array(Array &array, const CharType *p_str, int &index, int p_len, int &line, String &r_err_str) {
Token token; Token token;
bool need_comma = false; bool need_comma = false;
while (index < p_len) { while (index < p_len) {
Error err = _get_token(p_str, index, p_len, token, line, r_err_str); Error err = _get_token(p_str, index, p_len, token, line, r_err_str);
if (err != OK) if (err != OK)
return err; return err;
if (token.type == TK_BRACKET_CLOSE) { if (token.type == TK_BRACKET_CLOSE) {
return OK; return OK;
} }
if (need_comma) { if (need_comma) {
if (token.type != TK_COMMA) { if (token.type != TK_COMMA) {
r_err_str = "Expected ','"; r_err_str = "Expected ','";
return ERR_PARSE_ERROR; return ERR_PARSE_ERROR;
} else { } else {
@ -401,29 +368,23 @@ Error JSON::_parse_array(Array &array, const CharType *p_str, int &index, int p_
} }
Error JSON::_parse_object(Dictionary &object, const CharType *p_str, int &index, int p_len, int &line, String &r_err_str) { Error JSON::_parse_object(Dictionary &object, const CharType *p_str, int &index, int p_len, int &line, String &r_err_str) {
bool at_key = true; bool at_key = true;
String key; String key;
Token token; Token token;
bool need_comma = false; bool need_comma = false;
while (index < p_len) { while (index < p_len) {
if (at_key) { if (at_key) {
Error err = _get_token(p_str, index, p_len, token, line, r_err_str); Error err = _get_token(p_str, index, p_len, token, line, r_err_str);
if (err != OK) if (err != OK)
return err; return err;
if (token.type == TK_CURLY_BRACKET_CLOSE) { if (token.type == TK_CURLY_BRACKET_CLOSE) {
return OK; return OK;
} }
if (need_comma) { if (need_comma) {
if (token.type != TK_COMMA) { if (token.type != TK_COMMA) {
r_err_str = "Expected '}' or ','"; r_err_str = "Expected '}' or ','";
return ERR_PARSE_ERROR; return ERR_PARSE_ERROR;
} else { } else {
@ -433,7 +394,6 @@ Error JSON::_parse_object(Dictionary &object, const CharType *p_str, int &index,
} }
if (token.type != TK_STRING) { if (token.type != TK_STRING) {
r_err_str = "Expected key"; r_err_str = "Expected key";
return ERR_PARSE_ERROR; return ERR_PARSE_ERROR;
} }
@ -443,13 +403,11 @@ Error JSON::_parse_object(Dictionary &object, const CharType *p_str, int &index,
if (err != OK) if (err != OK)
return err; return err;
if (token.type != TK_COLON) { if (token.type != TK_COLON) {
r_err_str = "Expected ':'"; r_err_str = "Expected ':'";
return ERR_PARSE_ERROR; return ERR_PARSE_ERROR;
} }
at_key = false; at_key = false;
} else { } else {
Error err = _get_token(p_str, index, p_len, token, line, r_err_str); Error err = _get_token(p_str, index, p_len, token, line, r_err_str);
if (err != OK) if (err != OK)
return err; return err;
@ -468,7 +426,6 @@ Error JSON::_parse_object(Dictionary &object, const CharType *p_str, int &index,
} }
Error JSON::parse(const String &p_json, Variant &r_ret, String &r_err_str, int &r_err_line) { Error JSON::parse(const String &p_json, Variant &r_ret, String &r_err_str, int &r_err_line) {
const CharType *str = p_json.ptr(); const CharType *str = p_json.ptr();
int idx = 0; int idx = 0;
int len = p_json.length(); int len = p_json.length();

2
core/io/json.h
View file

@ -34,7 +34,6 @@
#include "core/variant.h" #include "core/variant.h"
class JSON { class JSON {
enum TokenType { enum TokenType {
TK_CURLY_BRACKET_OPEN, TK_CURLY_BRACKET_OPEN,
TK_CURLY_BRACKET_CLOSE, TK_CURLY_BRACKET_CLOSE,
@ -58,7 +57,6 @@ class JSON {
}; };
struct Token { struct Token {
TokenType type; TokenType type;
Variant value; Variant value;
}; };

1
core/io/logger.h
View file

@ -62,7 +62,6 @@ public:
* Writes messages to stdout/stderr. * Writes messages to stdout/stderr.
*/ */
class StdLogger : public Logger { class StdLogger : public Logger {
public: public:
virtual void logv(const char *p_format, va_list p_list, bool p_err) _PRINTF_FORMAT_ATTRIBUTE_2_0; virtual void logv(const char *p_format, va_list p_list, bool p_err) _PRINTF_FORMAT_ATTRIBUTE_2_0;
virtual ~StdLogger() {} virtual ~StdLogger() {}

114
core/io/marshalls.cpp
View file

@ -49,7 +49,6 @@ void EncodedObjectAsID::set_object_id(ObjectID p_id) {
} }
ObjectID EncodedObjectAsID::get_object_id() const { ObjectID EncodedObjectAsID::get_object_id() const {
return id; return id;
} }
@ -97,7 +96,6 @@ static Error _decode_string(const uint8_t *&buf, int &len, int *r_len, String &r
} }
Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int *r_len, bool p_allow_objects) { Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int *r_len, bool p_allow_objects) {
const uint8_t *buf = p_buffer; const uint8_t *buf = p_buffer;
int len = p_len; int len = p_len;
@ -113,13 +111,10 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
*r_len = 4; *r_len = 4;
switch (type & ENCODE_MASK) { switch (type & ENCODE_MASK) {
case Variant::NIL: { case Variant::NIL: {
r_variant = Variant(); r_variant = Variant();
} break; } break;
case Variant::BOOL: { case Variant::BOOL: {
ERR_FAIL_COND_V(len < 4, ERR_INVALID_DATA); ERR_FAIL_COND_V(len < 4, ERR_INVALID_DATA);
bool val = decode_uint32(buf); bool val = decode_uint32(buf);
r_variant = val; r_variant = val;
@ -127,7 +122,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
(*r_len) += 4; (*r_len) += 4;
} break; } break;
case Variant::INT: { case Variant::INT: {
if (type & ENCODE_FLAG_64) { if (type & ENCODE_FLAG_64) {
ERR_FAIL_COND_V(len < 8, ERR_INVALID_DATA); ERR_FAIL_COND_V(len < 8, ERR_INVALID_DATA);
int64_t val = decode_uint64(buf); int64_t val = decode_uint64(buf);
@ -145,7 +139,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
} break; } break;
case Variant::FLOAT: { case Variant::FLOAT: {
if (type & ENCODE_FLAG_64) { if (type & ENCODE_FLAG_64) {
ERR_FAIL_COND_V(len < 8, ERR_INVALID_DATA); ERR_FAIL_COND_V(len < 8, ERR_INVALID_DATA);
double val = decode_double(buf); double val = decode_double(buf);
@ -162,7 +155,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
} break; } break;
case Variant::STRING: { case Variant::STRING: {
String str; String str;
Error err = _decode_string(buf, len, r_len, str); Error err = _decode_string(buf, len, r_len, str);
if (err) if (err)
@ -173,7 +165,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
// math types // math types
case Variant::VECTOR2: { case Variant::VECTOR2: {
ERR_FAIL_COND_V(len < 4 * 2, ERR_INVALID_DATA); ERR_FAIL_COND_V(len < 4 * 2, ERR_INVALID_DATA);
Vector2 val; Vector2 val;
val.x = decode_float(&buf[0]); val.x = decode_float(&buf[0]);
@ -185,7 +176,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
} break; } break;
case Variant::VECTOR2I: { case Variant::VECTOR2I: {
ERR_FAIL_COND_V(len < 4 * 2, ERR_INVALID_DATA); ERR_FAIL_COND_V(len < 4 * 2, ERR_INVALID_DATA);
Vector2i val; Vector2i val;
val.x = decode_uint32(&buf[0]); val.x = decode_uint32(&buf[0]);
@ -197,7 +187,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
} break; } break;
case Variant::RECT2: { case Variant::RECT2: {
ERR_FAIL_COND_V(len < 4 * 4, ERR_INVALID_DATA); ERR_FAIL_COND_V(len < 4 * 4, ERR_INVALID_DATA);
Rect2 val; Rect2 val;
val.position.x = decode_float(&buf[0]); val.position.x = decode_float(&buf[0]);
@ -211,7 +200,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
} break; } break;
case Variant::RECT2I: { case Variant::RECT2I: {
ERR_FAIL_COND_V(len < 4 * 4, ERR_INVALID_DATA); ERR_FAIL_COND_V(len < 4 * 4, ERR_INVALID_DATA);
Rect2i val; Rect2i val;
val.position.x = decode_uint32(&buf[0]); val.position.x = decode_uint32(&buf[0]);
@ -225,7 +213,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
} break; } break;
case Variant::VECTOR3: { case Variant::VECTOR3: {
ERR_FAIL_COND_V(len < 4 * 3, ERR_INVALID_DATA); ERR_FAIL_COND_V(len < 4 * 3, ERR_INVALID_DATA);
Vector3 val; Vector3 val;
val.x = decode_float(&buf[0]); val.x = decode_float(&buf[0]);
@ -238,7 +225,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
} break; } break;
case Variant::VECTOR3I: { case Variant::VECTOR3I: {
ERR_FAIL_COND_V(len < 4 * 3, ERR_INVALID_DATA); ERR_FAIL_COND_V(len < 4 * 3, ERR_INVALID_DATA);
Vector3i val; Vector3i val;
val.x = decode_uint32(&buf[0]); val.x = decode_uint32(&buf[0]);
@ -251,12 +237,10 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
} break; } break;
case Variant::TRANSFORM2D: { case Variant::TRANSFORM2D: {
ERR_FAIL_COND_V(len < 4 * 6, ERR_INVALID_DATA); ERR_FAIL_COND_V(len < 4 * 6, ERR_INVALID_DATA);
Transform2D val; Transform2D val;
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
for (int j = 0; j < 2; j++) { for (int j = 0; j < 2; j++) {
val.elements[i][j] = decode_float(&buf[(i * 2 + j) * 4]); val.elements[i][j] = decode_float(&buf[(i * 2 + j) * 4]);
} }
} }
@ -268,7 +252,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
} break; } break;
case Variant::PLANE: { case Variant::PLANE: {
ERR_FAIL_COND_V(len < 4 * 4, ERR_INVALID_DATA); ERR_FAIL_COND_V(len < 4 * 4, ERR_INVALID_DATA);
Plane val; Plane val;
val.normal.x = decode_float(&buf[0]); val.normal.x = decode_float(&buf[0]);
@ -282,7 +265,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
} break; } break;
case Variant::QUAT: { case Variant::QUAT: {
ERR_FAIL_COND_V(len < 4 * 4, ERR_INVALID_DATA); ERR_FAIL_COND_V(len < 4 * 4, ERR_INVALID_DATA);
Quat val; Quat val;
val.x = decode_float(&buf[0]); val.x = decode_float(&buf[0]);
@ -296,7 +278,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
} break; } break;
case Variant::AABB: { case Variant::AABB: {
ERR_FAIL_COND_V(len < 4 * 6, ERR_INVALID_DATA); ERR_FAIL_COND_V(len < 4 * 6, ERR_INVALID_DATA);
AABB val; AABB val;
val.position.x = decode_float(&buf[0]); val.position.x = decode_float(&buf[0]);
@ -312,12 +293,10 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
} break; } break;
case Variant::BASIS: { case Variant::BASIS: {
ERR_FAIL_COND_V(len < 4 * 9, ERR_INVALID_DATA); ERR_FAIL_COND_V(len < 4 * 9, ERR_INVALID_DATA);
Basis val; Basis val;
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
for (int j = 0; j < 3; j++) { for (int j = 0; j < 3; j++) {
val.elements[i][j] = decode_float(&buf[(i * 3 + j) * 4]); val.elements[i][j] = decode_float(&buf[(i * 3 + j) * 4]);
} }
} }
@ -329,12 +308,10 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
} break; } break;
case Variant::TRANSFORM: { case Variant::TRANSFORM: {
ERR_FAIL_COND_V(len < 4 * 12, ERR_INVALID_DATA); ERR_FAIL_COND_V(len < 4 * 12, ERR_INVALID_DATA);
Transform val; Transform val;
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
for (int j = 0; j < 3; j++) { for (int j = 0; j < 3; j++) {
val.basis.elements[i][j] = decode_float(&buf[(i * 3 + j) * 4]); val.basis.elements[i][j] = decode_float(&buf[(i * 3 + j) * 4]);
} }
} }
@ -351,7 +328,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
// misc types // misc types
case Variant::COLOR: { case Variant::COLOR: {
ERR_FAIL_COND_V(len < 4 * 4, ERR_INVALID_DATA); ERR_FAIL_COND_V(len < 4 * 4, ERR_INVALID_DATA);
Color val; Color val;
val.r = decode_float(&buf[0]); val.r = decode_float(&buf[0]);
@ -365,7 +341,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
} break; } break;
case Variant::STRING_NAME: { case Variant::STRING_NAME: {
String str; String str;
Error err = _decode_string(buf, len, r_len, str); Error err = _decode_string(buf, len, r_len, str);
if (err) if (err)
@ -375,7 +350,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
} break; } break;
case Variant::NODE_PATH: { case Variant::NODE_PATH: {
ERR_FAIL_COND_V(len < 4, ERR_INVALID_DATA); ERR_FAIL_COND_V(len < 4, ERR_INVALID_DATA);
int32_t strlen = decode_uint32(buf); int32_t strlen = decode_uint32(buf);
@ -401,7 +375,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
(*r_len) += 12; (*r_len) += 12;
for (uint32_t i = 0; i < total; i++) { for (uint32_t i = 0; i < total; i++) {
String str; String str;
Error err = _decode_string(buf, len, r_len, str); Error err = _decode_string(buf, len, r_len, str);
if (err) if (err)
@ -423,11 +396,9 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
} break; } break;
case Variant::_RID: { case Variant::_RID: {
r_variant = RID(); r_variant = RID();
} break; } break;
case Variant::OBJECT: { case Variant::OBJECT: {
if (type & ENCODE_FLAG_OBJECT_AS_ID) { if (type & ENCODE_FLAG_OBJECT_AS_ID) {
//this _is_ allowed //this _is_ allowed
ERR_FAIL_COND_V(len < 8, ERR_INVALID_DATA); ERR_FAIL_COND_V(len < 8, ERR_INVALID_DATA);
@ -456,7 +427,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
if (str == String()) { if (str == String()) {
r_variant = (Object *)nullptr; r_variant = (Object *)nullptr;
} else { } else {
Object *obj = ClassDB::instance(str); Object *obj = ClassDB::instance(str);
ERR_FAIL_COND_V(!obj, ERR_UNAVAILABLE); ERR_FAIL_COND_V(!obj, ERR_UNAVAILABLE);
@ -470,7 +440,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
} }
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
str = String(); str = String();
err = _decode_string(buf, len, r_len, str); err = _decode_string(buf, len, r_len, str);
if (err) if (err)
@ -502,16 +471,13 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
} break; } break;
case Variant::CALLABLE: { case Variant::CALLABLE: {
r_variant = Callable(); r_variant = Callable();
} break; } break;
case Variant::SIGNAL: { case Variant::SIGNAL: {
r_variant = Signal(); r_variant = Signal();
} break; } break;
case Variant::DICTIONARY: { case Variant::DICTIONARY: {
ERR_FAIL_COND_V(len < 4, ERR_INVALID_DATA); ERR_FAIL_COND_V(len < 4, ERR_INVALID_DATA);
int32_t count = decode_uint32(buf); int32_t count = decode_uint32(buf);
// bool shared = count&0x80000000; // bool shared = count&0x80000000;
@ -527,7 +493,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
Dictionary d; Dictionary d;
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
Variant key, value; Variant key, value;
int used; int used;
@ -556,7 +521,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
} break; } break;
case Variant::ARRAY: { case Variant::ARRAY: {
ERR_FAIL_COND_V(len < 4, ERR_INVALID_DATA); ERR_FAIL_COND_V(len < 4, ERR_INVALID_DATA);
int32_t count = decode_uint32(buf); int32_t count = decode_uint32(buf);
// bool shared = count&0x80000000; // bool shared = count&0x80000000;
@ -572,7 +536,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
Array varr; Array varr;
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
int used = 0; int used = 0;
Variant v; Variant v;
Error err = decode_variant(v, buf, len, &used, p_allow_objects); Error err = decode_variant(v, buf, len, &used, p_allow_objects);
@ -591,7 +554,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
// arrays // arrays
case Variant::PACKED_BYTE_ARRAY: { case Variant::PACKED_BYTE_ARRAY: {
ERR_FAIL_COND_V(len < 4, ERR_INVALID_DATA); ERR_FAIL_COND_V(len < 4, ERR_INVALID_DATA);
int32_t count = decode_uint32(buf); int32_t count = decode_uint32(buf);
buf += 4; buf += 4;
@ -604,7 +566,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
data.resize(count); data.resize(count);
uint8_t *w = data.ptrw(); uint8_t *w = data.ptrw();
for (int32_t i = 0; i < count; i++) { for (int32_t i = 0; i < count; i++) {
w[i] = buf[i]; w[i] = buf[i];
} }
} }
@ -619,7 +580,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
} break; } break;
case Variant::PACKED_INT32_ARRAY: { case Variant::PACKED_INT32_ARRAY: {
ERR_FAIL_COND_V(len < 4, ERR_INVALID_DATA); ERR_FAIL_COND_V(len < 4, ERR_INVALID_DATA);
int32_t count = decode_uint32(buf); int32_t count = decode_uint32(buf);
buf += 4; buf += 4;
@ -634,7 +594,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
data.resize(count); data.resize(count);
int32_t *w = data.ptrw(); int32_t *w = data.ptrw();
for (int32_t i = 0; i < count; i++) { for (int32_t i = 0; i < count; i++) {
w[i] = decode_uint32(&buf[i * 4]); w[i] = decode_uint32(&buf[i * 4]);
} }
} }
@ -645,7 +604,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
} break; } break;
case Variant::PACKED_INT64_ARRAY: { case Variant::PACKED_INT64_ARRAY: {
ERR_FAIL_COND_V(len < 4, ERR_INVALID_DATA); ERR_FAIL_COND_V(len < 4, ERR_INVALID_DATA);
int64_t count = decode_uint64(buf); int64_t count = decode_uint64(buf);
buf += 4; buf += 4;
@ -660,7 +618,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
data.resize(count); data.resize(count);
int64_t *w = data.ptrw(); int64_t *w = data.ptrw();
for (int64_t i = 0; i < count; i++) { for (int64_t i = 0; i < count; i++) {
w[i] = decode_uint64(&buf[i * 8]); w[i] = decode_uint64(&buf[i * 8]);
} }
} }
@ -671,7 +628,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
} break; } break;
case Variant::PACKED_FLOAT32_ARRAY: { case Variant::PACKED_FLOAT32_ARRAY: {
ERR_FAIL_COND_V(len < 4, ERR_INVALID_DATA); ERR_FAIL_COND_V(len < 4, ERR_INVALID_DATA);
int32_t count = decode_uint32(buf); int32_t count = decode_uint32(buf);
buf += 4; buf += 4;
@ -686,7 +642,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
data.resize(count); data.resize(count);
float *w = data.ptrw(); float *w = data.ptrw();
for (int32_t i = 0; i < count; i++) { for (int32_t i = 0; i < count; i++) {
w[i] = decode_float(&buf[i * 4]); w[i] = decode_float(&buf[i * 4]);
} }
} }
@ -698,7 +653,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
} break; } break;
case Variant::PACKED_FLOAT64_ARRAY: { case Variant::PACKED_FLOAT64_ARRAY: {
ERR_FAIL_COND_V(len < 4, ERR_INVALID_DATA); ERR_FAIL_COND_V(len < 4, ERR_INVALID_DATA);
int64_t count = decode_uint64(buf); int64_t count = decode_uint64(buf);
buf += 4; buf += 4;
@ -713,7 +667,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
data.resize(count); data.resize(count);
double *w = data.ptrw(); double *w = data.ptrw();
for (int64_t i = 0; i < count; i++) { for (int64_t i = 0; i < count; i++) {
w[i] = decode_double(&buf[i * 8]); w[i] = decode_double(&buf[i * 8]);
} }
} }
@ -725,7 +678,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
} break; } break;
case Variant::PACKED_STRING_ARRAY: { case Variant::PACKED_STRING_ARRAY: {
ERR_FAIL_COND_V(len < 4, ERR_INVALID_DATA); ERR_FAIL_COND_V(len < 4, ERR_INVALID_DATA);
int32_t count = decode_uint32(buf); int32_t count = decode_uint32(buf);
@ -738,7 +690,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
//printf("string count: %i\n",count); //printf("string count: %i\n",count);
for (int32_t i = 0; i < count; i++) { for (int32_t i = 0; i < count; i++) {
String str; String str;
Error err = _decode_string(buf, len, r_len, str); Error err = _decode_string(buf, len, r_len, str);
if (err) if (err)
@ -751,7 +702,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
} break; } break;
case Variant::PACKED_VECTOR2_ARRAY: { case Variant::PACKED_VECTOR2_ARRAY: {
ERR_FAIL_COND_V(len < 4, ERR_INVALID_DATA); ERR_FAIL_COND_V(len < 4, ERR_INVALID_DATA);
int32_t count = decode_uint32(buf); int32_t count = decode_uint32(buf);
buf += 4; buf += 4;
@ -770,7 +720,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
Vector2 *w = varray.ptrw(); Vector2 *w = varray.ptrw();
for (int32_t i = 0; i < count; i++) { for (int32_t i = 0; i < count; i++) {
w[i].x = decode_float(buf + i * 4 * 2 + 4 * 0); w[i].x = decode_float(buf + i * 4 * 2 + 4 * 0);
w[i].y = decode_float(buf + i * 4 * 2 + 4 * 1); w[i].y = decode_float(buf + i * 4 * 2 + 4 * 1);
} }
@ -785,7 +734,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
} break; } break;
case Variant::PACKED_VECTOR3_ARRAY: { case Variant::PACKED_VECTOR3_ARRAY: {
ERR_FAIL_COND_V(len < 4, ERR_INVALID_DATA); ERR_FAIL_COND_V(len < 4, ERR_INVALID_DATA);
int32_t count = decode_uint32(buf); int32_t count = decode_uint32(buf);
buf += 4; buf += 4;
@ -805,7 +753,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
Vector3 *w = varray.ptrw(); Vector3 *w = varray.ptrw();
for (int32_t i = 0; i < count; i++) { for (int32_t i = 0; i < count; i++) {
w[i].x = decode_float(buf + i * 4 * 3 + 4 * 0); w[i].x = decode_float(buf + i * 4 * 3 + 4 * 0);
w[i].y = decode_float(buf + i * 4 * 3 + 4 * 1); w[i].y = decode_float(buf + i * 4 * 3 + 4 * 1);
w[i].z = decode_float(buf + i * 4 * 3 + 4 * 2); w[i].z = decode_float(buf + i * 4 * 3 + 4 * 2);
@ -821,7 +768,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
} break; } break;
case Variant::PACKED_COLOR_ARRAY: { case Variant::PACKED_COLOR_ARRAY: {
ERR_FAIL_COND_V(len < 4, ERR_INVALID_DATA); ERR_FAIL_COND_V(len < 4, ERR_INVALID_DATA);
int32_t count = decode_uint32(buf); int32_t count = decode_uint32(buf);
buf += 4; buf += 4;
@ -841,7 +787,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
Color *w = carray.ptrw(); Color *w = carray.ptrw();
for (int32_t i = 0; i < count; i++) { for (int32_t i = 0; i < count; i++) {
w[i].r = decode_float(buf + i * 4 * 4 + 4 * 0); w[i].r = decode_float(buf + i * 4 * 4 + 4 * 0);
w[i].g = decode_float(buf + i * 4 * 4 + 4 * 1); w[i].g = decode_float(buf + i * 4 * 4 + 4 * 1);
w[i].b = decode_float(buf + i * 4 * 4 + 4 * 2); w[i].b = decode_float(buf + i * 4 * 4 + 4 * 2);
@ -866,7 +811,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
} }
static void _encode_string(const String &p_string, uint8_t *&buf, int &r_len) { static void _encode_string(const String &p_string, uint8_t *&buf, int &r_len) {
CharString utf8 = p_string.utf8(); CharString utf8 = p_string.utf8();
if (buf) { if (buf) {
@ -886,7 +830,6 @@ static void _encode_string(const String &p_string, uint8_t *&buf, int &r_len) {
} }
Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bool p_full_objects) { Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bool p_full_objects) {
uint8_t *buf = r_buffer; uint8_t *buf = r_buffer;
r_len = 0; r_len = 0;
@ -894,7 +837,6 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
uint32_t flags = 0; uint32_t flags = 0;
switch (p_variant.get_type()) { switch (p_variant.get_type()) {
case Variant::INT: { case Variant::INT: {
int64_t val = p_variant; int64_t val = p_variant;
if (val > (int64_t)INT_MAX || val < (int64_t)INT_MIN) { if (val > (int64_t)INT_MAX || val < (int64_t)INT_MIN) {
@ -902,7 +844,6 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
} }
} break; } break;
case Variant::FLOAT: { case Variant::FLOAT: {
double d = p_variant; double d = p_variant;
float f = d; float f = d;
if (double(f) != d) { if (double(f) != d) {
@ -910,7 +851,6 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
} }
} break; } break;
case Variant::OBJECT: { case Variant::OBJECT: {
// Test for potential wrong values sent by the debugger when it breaks. // Test for potential wrong values sent by the debugger when it breaks.
Object *obj = p_variant.get_validated_object(); Object *obj = p_variant.get_validated_object();
if (!obj) { if (!obj) {
@ -937,13 +877,10 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
r_len += 4; r_len += 4;
switch (p_variant.get_type()) { switch (p_variant.get_type()) {
case Variant::NIL: { case Variant::NIL: {
//nothing to do //nothing to do
} break; } break;
case Variant::BOOL: { case Variant::BOOL: {
if (buf) { if (buf) {
encode_uint32(p_variant.operator bool(), buf); encode_uint32(p_variant.operator bool(), buf);
} }
@ -952,7 +889,6 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
} break; } break;
case Variant::INT: { case Variant::INT: {
if (flags & ENCODE_FLAG_64) { if (flags & ENCODE_FLAG_64) {
//64 bits //64 bits
if (buf) { if (buf) {
@ -969,7 +905,6 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
} }
} break; } break;
case Variant::FLOAT: { case Variant::FLOAT: {
if (flags & ENCODE_FLAG_64) { if (flags & ENCODE_FLAG_64) {
if (buf) { if (buf) {
encode_double(p_variant.operator double(), buf); encode_double(p_variant.operator double(), buf);
@ -978,7 +913,6 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
r_len += 8; r_len += 8;
} else { } else {
if (buf) { if (buf) {
encode_float(p_variant.operator float(), buf); encode_float(p_variant.operator float(), buf);
} }
@ -988,7 +922,6 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
} break; } break;
case Variant::NODE_PATH: { case Variant::NODE_PATH: {
NodePath np = p_variant; NodePath np = p_variant;
if (buf) { if (buf) {
encode_uint32(uint32_t(np.get_name_count()) | 0x80000000, buf); //for compatibility with the old format encode_uint32(uint32_t(np.get_name_count()) | 0x80000000, buf); //for compatibility with the old format
@ -1007,7 +940,6 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
int total = np.get_name_count() + np.get_subname_count(); int total = np.get_name_count() + np.get_subname_count();
for (int i = 0; i < total; i++) { for (int i = 0; i < total; i++) {
String str; String str;
if (i < np.get_name_count()) if (i < np.get_name_count())
@ -1034,19 +966,16 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
} break; } break;
case Variant::STRING: { case Variant::STRING: {
_encode_string(p_variant, buf, r_len); _encode_string(p_variant, buf, r_len);
} break; } break;
case Variant::STRING_NAME: { case Variant::STRING_NAME: {
_encode_string(p_variant, buf, r_len); _encode_string(p_variant, buf, r_len);
} break; } break;
// math types // math types
case Variant::VECTOR2: { case Variant::VECTOR2: {
if (buf) { if (buf) {
Vector2 v2 = p_variant; Vector2 v2 = p_variant;
encode_float(v2.x, &buf[0]); encode_float(v2.x, &buf[0]);
@ -1057,7 +986,6 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
} break; } break;
case Variant::VECTOR2I: { case Variant::VECTOR2I: {
if (buf) { if (buf) {
Vector2i v2 = p_variant; Vector2i v2 = p_variant;
encode_uint32(v2.x, &buf[0]); encode_uint32(v2.x, &buf[0]);
@ -1068,7 +996,6 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
} break; } break;
case Variant::RECT2: { case Variant::RECT2: {
if (buf) { if (buf) {
Rect2 r2 = p_variant; Rect2 r2 = p_variant;
encode_float(r2.position.x, &buf[0]); encode_float(r2.position.x, &buf[0]);
@ -1080,7 +1007,6 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
} break; } break;
case Variant::RECT2I: { case Variant::RECT2I: {
if (buf) { if (buf) {
Rect2i r2 = p_variant; Rect2i r2 = p_variant;
encode_uint32(r2.position.x, &buf[0]); encode_uint32(r2.position.x, &buf[0]);
@ -1092,7 +1018,6 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
} break; } break;
case Variant::VECTOR3: { case Variant::VECTOR3: {
if (buf) { if (buf) {
Vector3 v3 = p_variant; Vector3 v3 = p_variant;
encode_float(v3.x, &buf[0]); encode_float(v3.x, &buf[0]);
@ -1104,7 +1029,6 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
} break; } break;
case Variant::VECTOR3I: { case Variant::VECTOR3I: {
if (buf) { if (buf) {
Vector3i v3 = p_variant; Vector3i v3 = p_variant;
encode_uint32(v3.x, &buf[0]); encode_uint32(v3.x, &buf[0]);
@ -1116,12 +1040,10 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
} break; } break;
case Variant::TRANSFORM2D: { case Variant::TRANSFORM2D: {
if (buf) { if (buf) {
Transform2D val = p_variant; Transform2D val = p_variant;
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
for (int j = 0; j < 2; j++) { for (int j = 0; j < 2; j++) {
copymem(&buf[(i * 2 + j) * 4], &val.elements[i][j], sizeof(float)); copymem(&buf[(i * 2 + j) * 4], &val.elements[i][j], sizeof(float));
} }
} }
@ -1131,7 +1053,6 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
} break; } break;
case Variant::PLANE: { case Variant::PLANE: {
if (buf) { if (buf) {
Plane p = p_variant; Plane p = p_variant;
encode_float(p.normal.x, &buf[0]); encode_float(p.normal.x, &buf[0]);
@ -1144,7 +1065,6 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
} break; } break;
case Variant::QUAT: { case Variant::QUAT: {
if (buf) { if (buf) {
Quat q = p_variant; Quat q = p_variant;
encode_float(q.x, &buf[0]); encode_float(q.x, &buf[0]);
@ -1157,7 +1077,6 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
} break; } break;
case Variant::AABB: { case Variant::AABB: {
if (buf) { if (buf) {
AABB aabb = p_variant; AABB aabb = p_variant;
encode_float(aabb.position.x, &buf[0]); encode_float(aabb.position.x, &buf[0]);
@ -1172,12 +1091,10 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
} break; } break;
case Variant::BASIS: { case Variant::BASIS: {
if (buf) { if (buf) {
Basis val = p_variant; Basis val = p_variant;
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
for (int j = 0; j < 3; j++) { for (int j = 0; j < 3; j++) {
copymem(&buf[(i * 3 + j) * 4], &val.elements[i][j], sizeof(float)); copymem(&buf[(i * 3 + j) * 4], &val.elements[i][j], sizeof(float));
} }
} }
@ -1187,12 +1104,10 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
} break; } break;
case Variant::TRANSFORM: { case Variant::TRANSFORM: {
if (buf) { if (buf) {
Transform val = p_variant; Transform val = p_variant;
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
for (int j = 0; j < 3; j++) { for (int j = 0; j < 3; j++) {
copymem(&buf[(i * 3 + j) * 4], &val.basis.elements[i][j], sizeof(float)); copymem(&buf[(i * 3 + j) * 4], &val.basis.elements[i][j], sizeof(float));
} }
} }
@ -1208,7 +1123,6 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
// misc types // misc types
case Variant::COLOR: { case Variant::COLOR: {
if (buf) { if (buf) {
Color c = p_variant; Color c = p_variant;
encode_float(c.r, &buf[0]); encode_float(c.r, &buf[0]);
@ -1221,18 +1135,13 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
} break; } break;
case Variant::_RID: { case Variant::_RID: {
} break; } break;
case Variant::CALLABLE: { case Variant::CALLABLE: {
} break; } break;
case Variant::SIGNAL: { case Variant::SIGNAL: {
} break; } break;
case Variant::OBJECT: { case Variant::OBJECT: {
if (p_full_objects) { if (p_full_objects) {
Object *obj = p_variant; Object *obj = p_variant;
if (!obj) { if (!obj) {
if (buf) { if (buf) {
@ -1248,7 +1157,6 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
int pc = 0; int pc = 0;
for (List<PropertyInfo>::Element *E = props.front(); E; E = E->next()) { for (List<PropertyInfo>::Element *E = props.front(); E; E = E->next()) {
if (!(E->get().usage & PROPERTY_USAGE_STORAGE)) if (!(E->get().usage & PROPERTY_USAGE_STORAGE))
continue; continue;
pc++; pc++;
@ -1262,7 +1170,6 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
r_len += 4; r_len += 4;
for (List<PropertyInfo>::Element *E = props.front(); E; E = E->next()) { for (List<PropertyInfo>::Element *E = props.front(); E; E = E->next()) {
if (!(E->get().usage & PROPERTY_USAGE_STORAGE)) if (!(E->get().usage & PROPERTY_USAGE_STORAGE))
continue; continue;
@ -1280,7 +1187,6 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
} }
} else { } else {
if (buf) { if (buf) {
Object *obj = p_variant.get_validated_object(); Object *obj = p_variant.get_validated_object();
ObjectID id; ObjectID id;
if (obj) { if (obj) {
@ -1295,7 +1201,6 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
} break; } break;
case Variant::DICTIONARY: { case Variant::DICTIONARY: {
Dictionary d = p_variant; Dictionary d = p_variant;
if (buf) { if (buf) {
@ -1308,7 +1213,6 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
d.get_key_list(&keys); d.get_key_list(&keys);
for (List<Variant>::Element *E = keys.front(); E; E = E->next()) { for (List<Variant>::Element *E = keys.front(); E; E = E->next()) {
/* /*
CharString utf8 = E->->utf8(); CharString utf8 = E->->utf8();
@ -1339,7 +1243,6 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
} break; } break;
case Variant::ARRAY: { case Variant::ARRAY: {
Array v = p_variant; Array v = p_variant;
if (buf) { if (buf) {
@ -1350,7 +1253,6 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
r_len += 4; r_len += 4;
for (int i = 0; i < v.size(); i++) { for (int i = 0; i < v.size(); i++) {
int len; int len;
encode_variant(v.get(i), buf, len, p_full_objects); encode_variant(v.get(i), buf, len, p_full_objects);
ERR_FAIL_COND_V(len % 4, ERR_BUG); ERR_FAIL_COND_V(len % 4, ERR_BUG);
@ -1362,7 +1264,6 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
} break; } break;
// arrays // arrays
case Variant::PACKED_BYTE_ARRAY: { case Variant::PACKED_BYTE_ARRAY: {
Vector<uint8_t> data = p_variant; Vector<uint8_t> data = p_variant;
int datalen = data.size(); int datalen = data.size();
int datasize = sizeof(uint8_t); int datasize = sizeof(uint8_t);
@ -1384,7 +1285,6 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
} break; } break;
case Variant::PACKED_INT32_ARRAY: { case Variant::PACKED_INT32_ARRAY: {
Vector<int32_t> data = p_variant; Vector<int32_t> data = p_variant;
int datalen = data.size(); int datalen = data.size();
int datasize = sizeof(int32_t); int datasize = sizeof(int32_t);
@ -1401,7 +1301,6 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
} break; } break;
case Variant::PACKED_INT64_ARRAY: { case Variant::PACKED_INT64_ARRAY: {
Vector<int64_t> data = p_variant; Vector<int64_t> data = p_variant;
int datalen = data.size(); int datalen = data.size();
int datasize = sizeof(int64_t); int datasize = sizeof(int64_t);
@ -1418,7 +1317,6 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
} break; } break;
case Variant::PACKED_FLOAT32_ARRAY: { case Variant::PACKED_FLOAT32_ARRAY: {
Vector<float> data = p_variant; Vector<float> data = p_variant;
int datalen = data.size(); int datalen = data.size();
int datasize = sizeof(float); int datasize = sizeof(float);
@ -1435,7 +1333,6 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
} break; } break;
case Variant::PACKED_FLOAT64_ARRAY: { case Variant::PACKED_FLOAT64_ARRAY: {
Vector<double> data = p_variant; Vector<double> data = p_variant;
int datalen = data.size(); int datalen = data.size();
int datasize = sizeof(double); int datasize = sizeof(double);
@ -1452,7 +1349,6 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
} break; } break;
case Variant::PACKED_STRING_ARRAY: { case Variant::PACKED_STRING_ARRAY: {
Vector<String> data = p_variant; Vector<String> data = p_variant;
int len = data.size(); int len = data.size();
@ -1464,7 +1360,6 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
r_len += 4; r_len += 4;
for (int i = 0; i < len; i++) { for (int i = 0; i < len; i++) {
CharString utf8 = data.get(i).utf8(); CharString utf8 = data.get(i).utf8();
if (buf) { if (buf) {
@ -1484,7 +1379,6 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
} break; } break;
case Variant::PACKED_VECTOR2_ARRAY: { case Variant::PACKED_VECTOR2_ARRAY: {
Vector<Vector2> data = p_variant; Vector<Vector2> data = p_variant;
int len = data.size(); int len = data.size();
@ -1496,9 +1390,7 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
r_len += 4; r_len += 4;
if (buf) { if (buf) {
for (int i = 0; i < len; i++) { for (int i = 0; i < len; i++) {
Vector2 v = data.get(i); Vector2 v = data.get(i);
encode_float(v.x, &buf[0]); encode_float(v.x, &buf[0]);
@ -1511,7 +1403,6 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
} break; } break;
case Variant::PACKED_VECTOR3_ARRAY: { case Variant::PACKED_VECTOR3_ARRAY: {
Vector<Vector3> data = p_variant; Vector<Vector3> data = p_variant;
int len = data.size(); int len = data.size();
@ -1523,9 +1414,7 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
r_len += 4; r_len += 4;
if (buf) { if (buf) {
for (int i = 0; i < len; i++) { for (int i = 0; i < len; i++) {
Vector3 v = data.get(i); Vector3 v = data.get(i);
encode_float(v.x, &buf[0]); encode_float(v.x, &buf[0]);
@ -1539,7 +1428,6 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
} break; } break;
case Variant::PACKED_COLOR_ARRAY: { case Variant::PACKED_COLOR_ARRAY: {
Vector<Color> data = p_variant; Vector<Color> data = p_variant;
int len = data.size(); int len = data.size();
@ -1551,9 +1439,7 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
r_len += 4; r_len += 4;
if (buf) { if (buf) {
for (int i = 0; i < len; i++) { for (int i = 0; i < len; i++) {
Color c = data.get(i); Color c = data.get(i);
encode_float(c.r, &buf[0]); encode_float(c.r, &buf[0]);

21
core/io/marshalls.h
View file

@ -41,21 +41,17 @@
*/ */
union MarshallFloat { union MarshallFloat {
uint32_t i; ///< int uint32_t i; ///< int
float f; ///< float float f; ///< float
}; };
union MarshallDouble { union MarshallDouble {
uint64_t l; ///< long long uint64_t l; ///< long long
double d; ///< double double d; ///< double
}; };
static inline unsigned int encode_uint16(uint16_t p_uint, uint8_t *p_arr) { static inline unsigned int encode_uint16(uint16_t p_uint, uint8_t *p_arr) {
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
*p_arr = p_uint & 0xFF; *p_arr = p_uint & 0xFF;
p_arr++; p_arr++;
p_uint >>= 8; p_uint >>= 8;
@ -65,9 +61,7 @@ static inline unsigned int encode_uint16(uint16_t p_uint, uint8_t *p_arr) {
} }
static inline unsigned int encode_uint32(uint32_t p_uint, uint8_t *p_arr) { static inline unsigned int encode_uint32(uint32_t p_uint, uint8_t *p_arr) {
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
*p_arr = p_uint & 0xFF; *p_arr = p_uint & 0xFF;
p_arr++; p_arr++;
p_uint >>= 8; p_uint >>= 8;
@ -77,7 +71,6 @@ static inline unsigned int encode_uint32(uint32_t p_uint, uint8_t *p_arr) {
} }
static inline unsigned int encode_float(float p_float, uint8_t *p_arr) { static inline unsigned int encode_float(float p_float, uint8_t *p_arr) {
MarshallFloat mf; MarshallFloat mf;
mf.f = p_float; mf.f = p_float;
encode_uint32(mf.i, p_arr); encode_uint32(mf.i, p_arr);
@ -86,9 +79,7 @@ static inline unsigned int encode_float(float p_float, uint8_t *p_arr) {
} }
static inline unsigned int encode_uint64(uint64_t p_uint, uint8_t *p_arr) { static inline unsigned int encode_uint64(uint64_t p_uint, uint8_t *p_arr) {
for (int i = 0; i < 8; i++) { for (int i = 0; i < 8; i++) {
*p_arr = p_uint & 0xFF; *p_arr = p_uint & 0xFF;
p_arr++; p_arr++;
p_uint >>= 8; p_uint >>= 8;
@ -98,7 +89,6 @@ static inline unsigned int encode_uint64(uint64_t p_uint, uint8_t *p_arr) {
} }
static inline unsigned int encode_double(double p_double, uint8_t *p_arr) { static inline unsigned int encode_double(double p_double, uint8_t *p_arr) {
MarshallDouble md; MarshallDouble md;
md.d = p_double; md.d = p_double;
encode_uint64(md.l, p_arr); encode_uint64(md.l, p_arr);
@ -107,13 +97,10 @@ static inline unsigned int encode_double(double p_double, uint8_t *p_arr) {
} }
static inline int encode_cstring(const char *p_string, uint8_t *p_data) { static inline int encode_cstring(const char *p_string, uint8_t *p_data) {
int len = 0; int len = 0;
while (*p_string) { while (*p_string) {
if (p_data) { if (p_data) {
*p_data = (uint8_t)*p_string; *p_data = (uint8_t)*p_string;
p_data++; p_data++;
} }
@ -127,11 +114,9 @@ static inline int encode_cstring(const char *p_string, uint8_t *p_data) {
} }
static inline uint16_t decode_uint16(const uint8_t *p_arr) { static inline uint16_t decode_uint16(const uint8_t *p_arr) {
uint16_t u = 0; uint16_t u = 0;
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
uint16_t b = *p_arr; uint16_t b = *p_arr;
b <<= (i * 8); b <<= (i * 8);
u |= b; u |= b;
@ -142,11 +127,9 @@ static inline uint16_t decode_uint16(const uint8_t *p_arr) {
} }
static inline uint32_t decode_uint32(const uint8_t *p_arr) { static inline uint32_t decode_uint32(const uint8_t *p_arr) {
uint32_t u = 0; uint32_t u = 0;
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
uint32_t b = *p_arr; uint32_t b = *p_arr;
b <<= (i * 8); b <<= (i * 8);
u |= b; u |= b;
@ -157,18 +140,15 @@ static inline uint32_t decode_uint32(const uint8_t *p_arr) {
} }
static inline float decode_float(const uint8_t *p_arr) { static inline float decode_float(const uint8_t *p_arr) {
MarshallFloat mf; MarshallFloat mf;
mf.i = decode_uint32(p_arr); mf.i = decode_uint32(p_arr);
return mf.f; return mf.f;
} }
static inline uint64_t decode_uint64(const uint8_t *p_arr) { static inline uint64_t decode_uint64(const uint8_t *p_arr) {
uint64_t u = 0; uint64_t u = 0;
for (int i = 0; i < 8; i++) { for (int i = 0; i < 8; i++) {
uint64_t b = (*p_arr) & 0xFF; uint64_t b = (*p_arr) & 0xFF;
b <<= (i * 8); b <<= (i * 8);
u |= b; u |= b;
@ -179,7 +159,6 @@ static inline uint64_t decode_uint64(const uint8_t *p_arr) {
} }
static inline double decode_double(const uint8_t *p_arr) { static inline double decode_double(const uint8_t *p_arr) {
MarshallDouble md; MarshallDouble md;
md.l = decode_uint64(p_arr); md.l = decode_uint64(p_arr);
return md.d; return md.d;

44
core/io/multiplayer_api.cpp
View file

@ -45,9 +45,7 @@
#endif #endif
_FORCE_INLINE_ bool _should_call_local(MultiplayerAPI::RPCMode mode, bool is_master, bool &r_skip_rpc) { _FORCE_INLINE_ bool _should_call_local(MultiplayerAPI::RPCMode mode, bool is_master, bool &r_skip_rpc) {
switch (mode) { switch (mode) {
case MultiplayerAPI::RPC_MODE_DISABLED: { case MultiplayerAPI::RPC_MODE_DISABLED: {
// Do nothing. // Do nothing.
} break; } break;
@ -78,7 +76,6 @@ _FORCE_INLINE_ bool _should_call_local(MultiplayerAPI::RPCMode mode, bool is_mas
_FORCE_INLINE_ bool _can_call_mode(Node *p_node, MultiplayerAPI::RPCMode mode, int p_remote_id) { _FORCE_INLINE_ bool _can_call_mode(Node *p_node, MultiplayerAPI::RPCMode mode, int p_remote_id) {
switch (mode) { switch (mode) {
case MultiplayerAPI::RPC_MODE_DISABLED: { case MultiplayerAPI::RPC_MODE_DISABLED: {
return false; return false;
} break; } break;
@ -100,7 +97,6 @@ _FORCE_INLINE_ bool _can_call_mode(Node *p_node, MultiplayerAPI::RPCMode mode, i
} }
void MultiplayerAPI::poll() { void MultiplayerAPI::poll() {
if (!network_peer.is_valid() || network_peer->get_connection_status() == NetworkedMultiplayerPeer::CONNECTION_DISCONNECTED) if (!network_peer.is_valid() || network_peer->get_connection_status() == NetworkedMultiplayerPeer::CONNECTION_DISCONNECTED)
return; return;
@ -110,7 +106,6 @@ void MultiplayerAPI::poll() {
return; return;
while (network_peer->get_available_packet_count()) { while (network_peer->get_available_packet_count()) {
int sender = network_peer->get_packet_peer(); int sender = network_peer->get_packet_peer();
const uint8_t *packet; const uint8_t *packet;
int len; int len;
@ -144,7 +139,6 @@ void MultiplayerAPI::set_root_node(Node *p_node) {
} }
void MultiplayerAPI::set_network_peer(const Ref<NetworkedMultiplayerPeer> &p_peer) { void MultiplayerAPI::set_network_peer(const Ref<NetworkedMultiplayerPeer> &p_peer) {
if (p_peer == network_peer) if (p_peer == network_peer)
return; // Nothing to do return; // Nothing to do
@ -208,7 +202,6 @@ int get_packet_len(uint32_t p_node_target, int p_packet_len) {
} }
void MultiplayerAPI::_process_packet(int p_from, const uint8_t *p_packet, int p_packet_len) { void MultiplayerAPI::_process_packet(int p_from, const uint8_t *p_packet, int p_packet_len) {
ERR_FAIL_COND_MSG(root_node == nullptr, "Multiplayer root node was not initialized. If you are using custom multiplayer, remember to set the root node via MultiplayerAPI.set_root_node before using it."); ERR_FAIL_COND_MSG(root_node == nullptr, "Multiplayer root node was not initialized. If you are using custom multiplayer, remember to set the root node via MultiplayerAPI.set_root_node before using it.");
ERR_FAIL_COND_MSG(p_packet_len < 1, "Invalid packet received. Size too small."); ERR_FAIL_COND_MSG(p_packet_len < 1, "Invalid packet received. Size too small.");
@ -220,20 +213,16 @@ void MultiplayerAPI::_process_packet(int p_from, const uint8_t *p_packet, int p_
uint8_t packet_type = p_packet[0] & 7; uint8_t packet_type = p_packet[0] & 7;
switch (packet_type) { switch (packet_type) {
case NETWORK_COMMAND_SIMPLIFY_PATH: { case NETWORK_COMMAND_SIMPLIFY_PATH: {
_process_simplify_path(p_from, p_packet, p_packet_len); _process_simplify_path(p_from, p_packet, p_packet_len);
} break; } break;
case NETWORK_COMMAND_CONFIRM_PATH: { case NETWORK_COMMAND_CONFIRM_PATH: {
_process_confirm_path(p_from, p_packet, p_packet_len); _process_confirm_path(p_from, p_packet, p_packet_len);
} break; } break;
case NETWORK_COMMAND_REMOTE_CALL: case NETWORK_COMMAND_REMOTE_CALL:
case NETWORK_COMMAND_REMOTE_SET: { case NETWORK_COMMAND_REMOTE_SET: {
// Extract packet meta // Extract packet meta
int packet_min_size = 1; int packet_min_size = 1;
int name_id_offset = 1; int name_id_offset = 1;
@ -304,25 +293,21 @@ void MultiplayerAPI::_process_packet(int p_from, const uint8_t *p_packet, int p_
const int packet_len = get_packet_len(node_target, p_packet_len); const int packet_len = get_packet_len(node_target, p_packet_len);
if (packet_type == NETWORK_COMMAND_REMOTE_CALL) { if (packet_type == NETWORK_COMMAND_REMOTE_CALL) {
_process_rpc(node, name_id, p_from, p_packet, packet_len, packet_min_size); _process_rpc(node, name_id, p_from, p_packet, packet_len, packet_min_size);
} else { } else {
_process_rset(node, name_id, p_from, p_packet, packet_len, packet_min_size); _process_rset(node, name_id, p_from, p_packet, packet_len, packet_min_size);
} }
} break; } break;
case NETWORK_COMMAND_RAW: { case NETWORK_COMMAND_RAW: {
_process_raw(p_from, p_packet, p_packet_len); _process_raw(p_from, p_packet, p_packet_len);
} break; } break;
} }
} }
Node *MultiplayerAPI::_process_get_node(int p_from, const uint8_t *p_packet, uint32_t p_node_target, int p_packet_len) { Node *MultiplayerAPI::_process_get_node(int p_from, const uint8_t *p_packet, uint32_t p_node_target, int p_packet_len) {
Node *node = nullptr; Node *node = nullptr;
if (p_node_target & 0x80000000) { if (p_node_target & 0x80000000) {
@ -362,7 +347,6 @@ Node *MultiplayerAPI::_process_get_node(int p_from, const uint8_t *p_packet, uin
} }
void MultiplayerAPI::_process_rpc(Node *p_node, const uint16_t p_rpc_method_id, int p_from, const uint8_t *p_packet, int p_packet_len, int p_offset) { void MultiplayerAPI::_process_rpc(Node *p_node, const uint16_t p_rpc_method_id, int p_from, const uint8_t *p_packet, int p_packet_len, int p_offset) {
ERR_FAIL_COND_MSG(p_offset > p_packet_len, "Invalid packet received. Size too small."); ERR_FAIL_COND_MSG(p_offset > p_packet_len, "Invalid packet received. Size too small.");
// Check that remote can call the RPC on this node. // Check that remote can call the RPC on this node.
@ -415,7 +399,6 @@ void MultiplayerAPI::_process_rpc(Node *p_node, const uint16_t p_rpc_method_id,
p_offset += len; p_offset += len;
} else { } else {
for (int i = 0; i < argc; i++) { for (int i = 0; i < argc; i++) {
ERR_FAIL_COND_MSG(p_offset >= p_packet_len, "Invalid packet received. Size too small."); ERR_FAIL_COND_MSG(p_offset >= p_packet_len, "Invalid packet received. Size too small.");
int vlen; int vlen;
@ -438,7 +421,6 @@ void MultiplayerAPI::_process_rpc(Node *p_node, const uint16_t p_rpc_method_id,
} }
void MultiplayerAPI::_process_rset(Node *p_node, const uint16_t p_rpc_property_id, int p_from, const uint8_t *p_packet, int p_packet_len, int p_offset) { void MultiplayerAPI::_process_rset(Node *p_node, const uint16_t p_rpc_property_id, int p_from, const uint8_t *p_packet, int p_packet_len, int p_offset) {
ERR_FAIL_COND_MSG(p_offset >= p_packet_len, "Invalid packet received. Size too small."); ERR_FAIL_COND_MSG(p_offset >= p_packet_len, "Invalid packet received. Size too small.");
// Check that remote can call the RSET on this node. // Check that remote can call the RSET on this node.
@ -472,7 +454,6 @@ void MultiplayerAPI::_process_rset(Node *p_node, const uint16_t p_rpc_property_i
} }
void MultiplayerAPI::_process_simplify_path(int p_from, const uint8_t *p_packet, int p_packet_len) { void MultiplayerAPI::_process_simplify_path(int p_from, const uint8_t *p_packet, int p_packet_len) {
ERR_FAIL_COND_MSG(p_packet_len < 38, "Invalid packet received. Size too small."); ERR_FAIL_COND_MSG(p_packet_len < 38, "Invalid packet received. Size too small.");
int ofs = 1; int ofs = 1;
@ -521,7 +502,6 @@ void MultiplayerAPI::_process_simplify_path(int p_from, const uint8_t *p_packet,
} }
void MultiplayerAPI::_process_confirm_path(int p_from, const uint8_t *p_packet, int p_packet_len) { void MultiplayerAPI::_process_confirm_path(int p_from, const uint8_t *p_packet, int p_packet_len) {
ERR_FAIL_COND_MSG(p_packet_len < 3, "Invalid packet received. Size too small."); ERR_FAIL_COND_MSG(p_packet_len < 3, "Invalid packet received. Size too small.");
const bool valid_rpc_checksum = p_packet[1]; const bool valid_rpc_checksum = p_packet[1];
@ -548,7 +528,6 @@ bool MultiplayerAPI::_send_confirm_path(Node *p_node, NodePath p_path, PathSentC
List<int> peers_to_add; // If one is missing, take note to add it. List<int> peers_to_add; // If one is missing, take note to add it.
for (Set<int>::Element *E = connected_peers.front(); E; E = E->next()) { for (Set<int>::Element *E = connected_peers.front(); E; E = E->next()) {
if (p_target < 0 && E->get() == -p_target) if (p_target < 0 && E->get() == -p_target)
continue; // Continue, excluded. continue; // Continue, excluded.
@ -569,7 +548,6 @@ bool MultiplayerAPI::_send_confirm_path(Node *p_node, NodePath p_path, PathSentC
} }
if (peers_to_add.size() > 0) { if (peers_to_add.size() > 0) {
// Those that need to be added, send a message for this. // Those that need to be added, send a message for this.
// Encode function name. // Encode function name.
@ -594,7 +572,6 @@ bool MultiplayerAPI::_send_confirm_path(Node *p_node, NodePath p_path, PathSentC
ofs += encode_cstring(path.get_data(), &packet.write[ofs]); ofs += encode_cstring(path.get_data(), &packet.write[ofs]);
for (List<int>::Element *E = peers_to_add.front(); E; E = E->next()) { for (List<int>::Element *E = peers_to_add.front(); E; E = E->next()) {
network_peer->set_target_peer(E->get()); // To all of you. network_peer->set_target_peer(E->get()); // To all of you.
network_peer->set_transfer_mode(NetworkedMultiplayerPeer::TRANSFER_MODE_RELIABLE); network_peer->set_transfer_mode(NetworkedMultiplayerPeer::TRANSFER_MODE_RELIABLE);
network_peer->put_packet(packet.ptr(), packet.size()); network_peer->put_packet(packet.ptr(), packet.size());
@ -619,7 +596,6 @@ bool MultiplayerAPI::_send_confirm_path(Node *p_node, NodePath p_path, PathSentC
#define ENCODE_32 2 << 5 #define ENCODE_32 2 << 5
#define ENCODE_64 3 << 5 #define ENCODE_64 3 << 5
Error MultiplayerAPI::_encode_and_compress_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len) { Error MultiplayerAPI::_encode_and_compress_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len) {
// Unreachable because `VARIANT_MAX` == 27 and `ENCODE_VARIANT_MASK` == 31 // Unreachable because `VARIANT_MAX` == 27 and `ENCODE_VARIANT_MASK` == 31
CRASH_COND(p_variant.get_type() > VARIANT_META_TYPE_MASK); CRASH_COND(p_variant.get_type() > VARIANT_META_TYPE_MASK);
@ -693,7 +669,6 @@ Error MultiplayerAPI::_encode_and_compress_variant(const Variant &p_variant, uin
return OK; return OK;
} }
Error MultiplayerAPI::_decode_and_decompress_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int *r_len) { Error MultiplayerAPI::_decode_and_decompress_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int *r_len) {
const uint8_t *buf = p_buffer; const uint8_t *buf = p_buffer;
int len = p_len; int len = p_len;
@ -755,7 +730,6 @@ Error MultiplayerAPI::_decode_and_decompress_variant(Variant &r_variant, const u
} }
void MultiplayerAPI::_send_rpc(Node *p_from, int p_to, bool p_unreliable, bool p_set, const StringName &p_name, const Variant **p_arg, int p_argcount) { void MultiplayerAPI::_send_rpc(Node *p_from, int p_to, bool p_unreliable, bool p_set, const StringName &p_name, const Variant **p_arg, int p_argcount) {
ERR_FAIL_COND_MSG(network_peer.is_null(), "Attempt to remote call/set when networking is not active in SceneTree."); ERR_FAIL_COND_MSG(network_peer.is_null(), "Attempt to remote call/set when networking is not active in SceneTree.");
ERR_FAIL_COND_MSG(network_peer->get_connection_status() == NetworkedMultiplayerPeer::CONNECTION_CONNECTING, "Attempt to remote call/set when networking is not connected yet in SceneTree."); ERR_FAIL_COND_MSG(network_peer->get_connection_status() == NetworkedMultiplayerPeer::CONNECTION_CONNECTING, "Attempt to remote call/set when networking is not connected yet in SceneTree.");
@ -841,7 +815,6 @@ void MultiplayerAPI::_send_rpc(Node *p_from, int p_to, bool p_unreliable, bool p
} }
if (p_set) { if (p_set) {
// Take the rpc property ID // Take the rpc property ID
uint16_t property_id = p_from->get_node_rset_property_id(p_name); uint16_t property_id = p_from->get_node_rset_property_id(p_name);
if (property_id == UINT16_MAX && p_from->get_script_instance()) { if (property_id == UINT16_MAX && p_from->get_script_instance()) {
@ -934,7 +907,6 @@ void MultiplayerAPI::_send_rpc(Node *p_from, int p_to, bool p_unreliable, bool p
network_peer->set_transfer_mode(p_unreliable ? NetworkedMultiplayerPeer::TRANSFER_MODE_UNRELIABLE : NetworkedMultiplayerPeer::TRANSFER_MODE_RELIABLE); network_peer->set_transfer_mode(p_unreliable ? NetworkedMultiplayerPeer::TRANSFER_MODE_UNRELIABLE : NetworkedMultiplayerPeer::TRANSFER_MODE_RELIABLE);
if (has_all_peers) { if (has_all_peers) {
// They all have verified paths, so send fast. // They all have verified paths, so send fast.
network_peer->set_target_peer(p_to); // To all of you. network_peer->set_target_peer(p_to); // To all of you.
network_peer->put_packet(packet_cache.ptr(), ofs); // A message with love. network_peer->put_packet(packet_cache.ptr(), ofs); // A message with love.
@ -951,7 +923,6 @@ void MultiplayerAPI::_send_rpc(Node *p_from, int p_to, bool p_unreliable, bool p
encode_cstring(pname.get_data(), &(packet_cache.write[ofs])); encode_cstring(pname.get_data(), &(packet_cache.write[ofs]));
for (Set<int>::Element *E = connected_peers.front(); E; E = E->next()) { for (Set<int>::Element *E = connected_peers.front(); E; E = E->next()) {
if (p_to < 0 && E->get() == -p_to) if (p_to < 0 && E->get() == -p_to)
continue; // Continue, excluded. continue; // Continue, excluded.
@ -998,22 +969,18 @@ void MultiplayerAPI::_del_peer(int p_id) {
} }
void MultiplayerAPI::_connected_to_server() { void MultiplayerAPI::_connected_to_server() {
emit_signal("connected_to_server"); emit_signal("connected_to_server");
} }
void MultiplayerAPI::_connection_failed() { void MultiplayerAPI::_connection_failed() {
emit_signal("connection_failed"); emit_signal("connection_failed");
} }
void MultiplayerAPI::_server_disconnected() { void MultiplayerAPI::_server_disconnected() {
emit_signal("server_disconnected"); emit_signal("server_disconnected");
} }
void MultiplayerAPI::rpcp(Node *p_node, int p_peer_id, bool p_unreliable, const StringName &p_method, const Variant **p_arg, int p_argcount) { void MultiplayerAPI::rpcp(Node *p_node, int p_peer_id, bool p_unreliable, const StringName &p_method, const Variant **p_arg, int p_argcount) {
ERR_FAIL_COND_MSG(!network_peer.is_valid(), "Trying to call an RPC while no network peer is active."); ERR_FAIL_COND_MSG(!network_peer.is_valid(), "Trying to call an RPC while no network peer is active.");
ERR_FAIL_COND_MSG(!p_node->is_inside_tree(), "Trying to call an RPC on a node which is not inside SceneTree."); ERR_FAIL_COND_MSG(!p_node->is_inside_tree(), "Trying to call an RPC on a node which is not inside SceneTree.");
ERR_FAIL_COND_MSG(network_peer->get_connection_status() != NetworkedMultiplayerPeer::CONNECTION_CONNECTED, "Trying to call an RPC via a network peer which is not connected."); ERR_FAIL_COND_MSG(network_peer->get_connection_status() != NetworkedMultiplayerPeer::CONNECTION_CONNECTED, "Trying to call an RPC via a network peer which is not connected.");
@ -1040,7 +1007,6 @@ void MultiplayerAPI::rpcp(Node *p_node, int p_peer_id, bool p_unreliable, const
} }
if (!skip_rpc) { if (!skip_rpc) {
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
_profile_node_data("out_rpc", p_node->get_instance_id()); _profile_node_data("out_rpc", p_node->get_instance_id());
#endif #endif
@ -1081,7 +1047,6 @@ void MultiplayerAPI::rpcp(Node *p_node, int p_peer_id, bool p_unreliable, const
} }
void MultiplayerAPI::rsetp(Node *p_node, int p_peer_id, bool p_unreliable, const StringName &p_property, const Variant &p_value) { void MultiplayerAPI::rsetp(Node *p_node, int p_peer_id, bool p_unreliable, const StringName &p_property, const Variant &p_value) {
ERR_FAIL_COND_MSG(!network_peer.is_valid(), "Trying to RSET while no network peer is active."); ERR_FAIL_COND_MSG(!network_peer.is_valid(), "Trying to RSET while no network peer is active.");
ERR_FAIL_COND_MSG(!p_node->is_inside_tree(), "Trying to RSET on a node which is not inside SceneTree."); ERR_FAIL_COND_MSG(!p_node->is_inside_tree(), "Trying to RSET on a node which is not inside SceneTree.");
ERR_FAIL_COND_MSG(network_peer->get_connection_status() != NetworkedMultiplayerPeer::CONNECTION_CONNECTED, "Trying to send an RSET via a network peer which is not connected."); ERR_FAIL_COND_MSG(network_peer->get_connection_status() != NetworkedMultiplayerPeer::CONNECTION_CONNECTED, "Trying to send an RSET via a network peer which is not connected.");
@ -1146,7 +1111,6 @@ void MultiplayerAPI::rsetp(Node *p_node, int p_peer_id, bool p_unreliable, const
} }
Error MultiplayerAPI::send_bytes(Vector<uint8_t> p_data, int p_to, NetworkedMultiplayerPeer::TransferMode p_mode) { Error MultiplayerAPI::send_bytes(Vector<uint8_t> p_data, int p_to, NetworkedMultiplayerPeer::TransferMode p_mode) {
ERR_FAIL_COND_V_MSG(p_data.size() < 1, ERR_INVALID_DATA, "Trying to send an empty raw packet."); ERR_FAIL_COND_V_MSG(p_data.size() < 1, ERR_INVALID_DATA, "Trying to send an empty raw packet.");
ERR_FAIL_COND_V_MSG(!network_peer.is_valid(), ERR_UNCONFIGURED, "Trying to send a raw packet while no network peer is active."); ERR_FAIL_COND_V_MSG(!network_peer.is_valid(), ERR_UNCONFIGURED, "Trying to send a raw packet while no network peer is active.");
ERR_FAIL_COND_V_MSG(network_peer->get_connection_status() != NetworkedMultiplayerPeer::CONNECTION_CONNECTED, ERR_UNCONFIGURED, "Trying to send a raw packet via a network peer which is not connected."); ERR_FAIL_COND_V_MSG(network_peer->get_connection_status() != NetworkedMultiplayerPeer::CONNECTION_CONNECTED, ERR_UNCONFIGURED, "Trying to send a raw packet via a network peer which is not connected.");
@ -1163,7 +1127,6 @@ Error MultiplayerAPI::send_bytes(Vector<uint8_t> p_data, int p_to, NetworkedMult
} }
void MultiplayerAPI::_process_raw(int p_from, const uint8_t *p_packet, int p_packet_len) { void MultiplayerAPI::_process_raw(int p_from, const uint8_t *p_packet, int p_packet_len) {
ERR_FAIL_COND_MSG(p_packet_len < 2, "Invalid packet received. Size too small."); ERR_FAIL_COND_MSG(p_packet_len < 2, "Invalid packet received. Size too small.");
Vector<uint8_t> out; Vector<uint8_t> out;
@ -1177,32 +1140,27 @@ void MultiplayerAPI::_process_raw(int p_from, const uint8_t *p_packet, int p_pac
} }
int MultiplayerAPI::get_network_unique_id() const { int MultiplayerAPI::get_network_unique_id() const {
ERR_FAIL_COND_V_MSG(!network_peer.is_valid(), 0, "No network peer is assigned. Unable to get unique network ID."); ERR_FAIL_COND_V_MSG(!network_peer.is_valid(), 0, "No network peer is assigned. Unable to get unique network ID.");
return network_peer->get_unique_id(); return network_peer->get_unique_id();
} }
bool MultiplayerAPI::is_network_server() const { bool MultiplayerAPI::is_network_server() const {
// XXX Maybe fail silently? Maybe should actually return true to make development of both local and online multiplayer easier? // XXX Maybe fail silently? Maybe should actually return true to make development of both local and online multiplayer easier?
ERR_FAIL_COND_V_MSG(!network_peer.is_valid(), false, "No network peer is assigned. I can't be a server."); ERR_FAIL_COND_V_MSG(!network_peer.is_valid(), false, "No network peer is assigned. I can't be a server.");
return network_peer->is_server(); return network_peer->is_server();
} }
void MultiplayerAPI::set_refuse_new_network_connections(bool p_refuse) { void MultiplayerAPI::set_refuse_new_network_connections(bool p_refuse) {
ERR_FAIL_COND_MSG(!network_peer.is_valid(), "No network peer is assigned. Unable to set 'refuse_new_connections'."); ERR_FAIL_COND_MSG(!network_peer.is_valid(), "No network peer is assigned. Unable to set 'refuse_new_connections'.");
network_peer->set_refuse_new_connections(p_refuse); network_peer->set_refuse_new_connections(p_refuse);
} }
bool MultiplayerAPI::is_refusing_new_network_connections() const { bool MultiplayerAPI::is_refusing_new_network_connections() const {
ERR_FAIL_COND_V_MSG(!network_peer.is_valid(), false, "No network peer is assigned. Unable to get 'refuse_new_connections'."); ERR_FAIL_COND_V_MSG(!network_peer.is_valid(), false, "No network peer is assigned. Unable to get 'refuse_new_connections'.");
return network_peer->is_refusing_new_connections(); return network_peer->is_refusing_new_connections();
} }
Vector<int> MultiplayerAPI::get_network_connected_peers() const { Vector<int> MultiplayerAPI::get_network_connected_peers() const {
ERR_FAIL_COND_V_MSG(!network_peer.is_valid(), Vector<int>(), "No network peer is assigned. Assume no peers are connected."); ERR_FAIL_COND_V_MSG(!network_peer.is_valid(), Vector<int>(), "No network peer is assigned. Assume no peers are connected.");
Vector<int> ret; Vector<int> ret;
@ -1214,12 +1172,10 @@ Vector<int> MultiplayerAPI::get_network_connected_peers() const {
} }
void MultiplayerAPI::set_allow_object_decoding(bool p_enable) { void MultiplayerAPI::set_allow_object_decoding(bool p_enable) {
allow_object_decoding = p_enable; allow_object_decoding = p_enable;
} }
bool MultiplayerAPI::is_object_decoding_allowed() const { bool MultiplayerAPI::is_object_decoding_allowed() const {
return allow_object_decoding; return allow_object_decoding;
} }

1
core/io/multiplayer_api.h
View file

@ -35,7 +35,6 @@
#include "core/reference.h" #include "core/reference.h"
class MultiplayerAPI : public Reference { class MultiplayerAPI : public Reference {
GDCLASS(MultiplayerAPI, Reference); GDCLASS(MultiplayerAPI, Reference);
private: private:

1
core/io/net_socket.cpp
View file

@ -33,7 +33,6 @@
NetSocket *(*NetSocket::_create)() = nullptr; NetSocket *(*NetSocket::_create)() = nullptr;
NetSocket *NetSocket::create() { NetSocket *NetSocket::create() {
if (_create) if (_create)
return _create(); return _create();

1
core/io/net_socket.h
View file

@ -35,7 +35,6 @@
#include "core/reference.h" #include "core/reference.h"
class NetSocket : public Reference { class NetSocket : public Reference {
protected: protected:
static NetSocket *(*_create)(); static NetSocket *(*_create)();

1
core/io/networked_multiplayer_peer.cpp
View file

@ -31,7 +31,6 @@
#include "networked_multiplayer_peer.h" #include "networked_multiplayer_peer.h"
void NetworkedMultiplayerPeer::_bind_methods() { void NetworkedMultiplayerPeer::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_transfer_mode", "mode"), &NetworkedMultiplayerPeer::set_transfer_mode); ClassDB::bind_method(D_METHOD("set_transfer_mode", "mode"), &NetworkedMultiplayerPeer::set_transfer_mode);
ClassDB::bind_method(D_METHOD("get_transfer_mode"), &NetworkedMultiplayerPeer::get_transfer_mode); ClassDB::bind_method(D_METHOD("get_transfer_mode"), &NetworkedMultiplayerPeer::get_transfer_mode);
ClassDB::bind_method(D_METHOD("set_target_peer", "id"), &NetworkedMultiplayerPeer::set_target_peer); ClassDB::bind_method(D_METHOD("set_target_peer", "id"), &NetworkedMultiplayerPeer::set_target_peer);

1
core/io/networked_multiplayer_peer.h
View file

@ -34,7 +34,6 @@
#include "core/io/packet_peer.h" #include "core/io/packet_peer.h"
class NetworkedMultiplayerPeer : public PacketPeer { class NetworkedMultiplayerPeer : public PacketPeer {
GDCLASS(NetworkedMultiplayerPeer, PacketPeer); GDCLASS(NetworkedMultiplayerPeer, PacketPeer);
protected: protected:

24
core/io/packet_peer.cpp
View file

@ -36,7 +36,6 @@
/* helpers / binders */ /* helpers / binders */
void PacketPeer::set_encode_buffer_max_size(int p_max_size) { void PacketPeer::set_encode_buffer_max_size(int p_max_size) {
ERR_FAIL_COND_MSG(p_max_size < 1024, "Max encode buffer must be at least 1024 bytes"); ERR_FAIL_COND_MSG(p_max_size < 1024, "Max encode buffer must be at least 1024 bytes");
ERR_FAIL_COND_MSG(p_max_size > 256 * 1024 * 1024, "Max encode buffer cannot exceed 256 MiB"); ERR_FAIL_COND_MSG(p_max_size > 256 * 1024 * 1024, "Max encode buffer cannot exceed 256 MiB");
encode_buffer_max_size = next_power_of_2(p_max_size); encode_buffer_max_size = next_power_of_2(p_max_size);
@ -44,12 +43,10 @@ void PacketPeer::set_encode_buffer_max_size(int p_max_size) {
} }
int PacketPeer::get_encode_buffer_max_size() const { int PacketPeer::get_encode_buffer_max_size() const {
return encode_buffer_max_size; return encode_buffer_max_size;
} }
Error PacketPeer::get_packet_buffer(Vector<uint8_t> &r_buffer) { Error PacketPeer::get_packet_buffer(Vector<uint8_t> &r_buffer) {
const uint8_t *buffer; const uint8_t *buffer;
int buffer_size; int buffer_size;
Error err = get_packet(&buffer, buffer_size); Error err = get_packet(&buffer, buffer_size);
@ -68,7 +65,6 @@ Error PacketPeer::get_packet_buffer(Vector<uint8_t> &r_buffer) {
} }
Error PacketPeer::put_packet_buffer(const Vector<uint8_t> &p_buffer) { Error PacketPeer::put_packet_buffer(const Vector<uint8_t> &p_buffer) {
int len = p_buffer.size(); int len = p_buffer.size();
if (len == 0) if (len == 0)
return OK; return OK;
@ -78,7 +74,6 @@ Error PacketPeer::put_packet_buffer(const Vector<uint8_t> &p_buffer) {
} }
Error PacketPeer::get_var(Variant &r_variant, bool p_allow_objects) { Error PacketPeer::get_var(Variant &r_variant, bool p_allow_objects) {
const uint8_t *buffer; const uint8_t *buffer;
int buffer_size; int buffer_size;
Error err = get_packet(&buffer, buffer_size); Error err = get_packet(&buffer, buffer_size);
@ -89,7 +84,6 @@ Error PacketPeer::get_var(Variant &r_variant, bool p_allow_objects) {
} }
Error PacketPeer::put_var(const Variant &p_packet, bool p_full_objects) { Error PacketPeer::put_var(const Variant &p_packet, bool p_full_objects) {
int len; int len;
Error err = encode_variant(p_packet, nullptr, len, p_full_objects); // compute len first Error err = encode_variant(p_packet, nullptr, len, p_full_objects); // compute len first
if (err) if (err)
@ -124,19 +118,16 @@ Error PacketPeer::_put_packet(const Vector<uint8_t> &p_buffer) {
return put_packet_buffer(p_buffer); return put_packet_buffer(p_buffer);
} }
Vector<uint8_t> PacketPeer::_get_packet() { Vector<uint8_t> PacketPeer::_get_packet() {
Vector<uint8_t> raw; Vector<uint8_t> raw;
last_get_error = get_packet_buffer(raw); last_get_error = get_packet_buffer(raw);
return raw; return raw;
} }
Error PacketPeer::_get_packet_error() const { Error PacketPeer::_get_packet_error() const {
return last_get_error; return last_get_error;
} }
void PacketPeer::_bind_methods() { void PacketPeer::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_var", "allow_objects"), &PacketPeer::_bnd_get_var, DEFVAL(false)); ClassDB::bind_method(D_METHOD("get_var", "allow_objects"), &PacketPeer::_bnd_get_var, DEFVAL(false));
ClassDB::bind_method(D_METHOD("put_var", "var", "full_objects"), &PacketPeer::put_var, DEFVAL(false)); ClassDB::bind_method(D_METHOD("put_var", "var", "full_objects"), &PacketPeer::put_var, DEFVAL(false));
ClassDB::bind_method(D_METHOD("get_packet"), &PacketPeer::_get_packet); ClassDB::bind_method(D_METHOD("get_packet"), &PacketPeer::_get_packet);
@ -153,13 +144,11 @@ void PacketPeer::_bind_methods() {
/***************/ /***************/
void PacketPeerStream::_set_stream_peer(REF p_peer) { void PacketPeerStream::_set_stream_peer(REF p_peer) {
ERR_FAIL_COND_MSG(p_peer.is_null(), "It's not a reference to a valid Resource object."); ERR_FAIL_COND_MSG(p_peer.is_null(), "It's not a reference to a valid Resource object.");
set_stream_peer(p_peer); set_stream_peer(p_peer);
} }
void PacketPeerStream::_bind_methods() { void PacketPeerStream::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_stream_peer", "peer"), &PacketPeerStream::set_stream_peer); ClassDB::bind_method(D_METHOD("set_stream_peer", "peer"), &PacketPeerStream::set_stream_peer);
ClassDB::bind_method(D_METHOD("get_stream_peer"), &PacketPeerStream::get_stream_peer); ClassDB::bind_method(D_METHOD("get_stream_peer"), &PacketPeerStream::get_stream_peer);
ClassDB::bind_method(D_METHOD("set_input_buffer_max_size", "max_size_bytes"), &PacketPeerStream::set_input_buffer_max_size); ClassDB::bind_method(D_METHOD("set_input_buffer_max_size", "max_size_bytes"), &PacketPeerStream::set_input_buffer_max_size);
@ -173,7 +162,6 @@ void PacketPeerStream::_bind_methods() {
} }
Error PacketPeerStream::_poll_buffer() const { Error PacketPeerStream::_poll_buffer() const {
ERR_FAIL_COND_V(peer.is_null(), ERR_UNCONFIGURED); ERR_FAIL_COND_V(peer.is_null(), ERR_UNCONFIGURED);
int read = 0; int read = 0;
@ -191,7 +179,6 @@ Error PacketPeerStream::_poll_buffer() const {
} }
int PacketPeerStream::get_available_packet_count() const { int PacketPeerStream::get_available_packet_count() const {
_poll_buffer(); _poll_buffer();
uint32_t remaining = ring_buffer.data_left(); uint32_t remaining = ring_buffer.data_left();
@ -200,7 +187,6 @@ int PacketPeerStream::get_available_packet_count() const {
int count = 0; int count = 0;
while (remaining >= 4) { while (remaining >= 4) {
uint8_t lbuf[4]; uint8_t lbuf[4];
ring_buffer.copy(lbuf, ofs, 4); ring_buffer.copy(lbuf, ofs, 4);
uint32_t len = decode_uint32(lbuf); uint32_t len = decode_uint32(lbuf);
@ -217,7 +203,6 @@ int PacketPeerStream::get_available_packet_count() const {
} }
Error PacketPeerStream::get_packet(const uint8_t **r_buffer, int &r_buffer_size) { Error PacketPeerStream::get_packet(const uint8_t **r_buffer, int &r_buffer_size) {
ERR_FAIL_COND_V(peer.is_null(), ERR_UNCONFIGURED); ERR_FAIL_COND_V(peer.is_null(), ERR_UNCONFIGURED);
_poll_buffer(); _poll_buffer();
@ -239,7 +224,6 @@ Error PacketPeerStream::get_packet(const uint8_t **r_buffer, int &r_buffer_size)
} }
Error PacketPeerStream::put_packet(const uint8_t *p_buffer, int p_buffer_size) { Error PacketPeerStream::put_packet(const uint8_t *p_buffer, int p_buffer_size) {
ERR_FAIL_COND_V(peer.is_null(), ERR_UNCONFIGURED); ERR_FAIL_COND_V(peer.is_null(), ERR_UNCONFIGURED);
Error err = _poll_buffer(); //won't hurt to poll here too Error err = _poll_buffer(); //won't hurt to poll here too
@ -261,12 +245,10 @@ Error PacketPeerStream::put_packet(const uint8_t *p_buffer, int p_buffer_size) {
} }
int PacketPeerStream::get_max_packet_size() const { int PacketPeerStream::get_max_packet_size() const {
return output_buffer.size(); return output_buffer.size();
} }
void PacketPeerStream::set_stream_peer(const Ref<StreamPeer> &p_peer) { void PacketPeerStream::set_stream_peer(const Ref<StreamPeer> &p_peer) {
//ERR_FAIL_COND(p_peer.is_null()); //ERR_FAIL_COND(p_peer.is_null());
if (p_peer.ptr() != peer.ptr()) { if (p_peer.ptr() != peer.ptr()) {
@ -277,12 +259,10 @@ void PacketPeerStream::set_stream_peer(const Ref<StreamPeer> &p_peer) {
} }
Ref<StreamPeer> PacketPeerStream::get_stream_peer() const { Ref<StreamPeer> PacketPeerStream::get_stream_peer() const {
return peer; return peer;
} }
void PacketPeerStream::set_input_buffer_max_size(int p_max_size) { void PacketPeerStream::set_input_buffer_max_size(int p_max_size) {
ERR_FAIL_COND_MSG(p_max_size < 0, "Max size of input buffer size cannot be smaller than 0."); ERR_FAIL_COND_MSG(p_max_size < 0, "Max size of input buffer size cannot be smaller than 0.");
//warning may lose packets //warning may lose packets
ERR_FAIL_COND_MSG(ring_buffer.data_left(), "Buffer in use, resizing would cause loss of data."); ERR_FAIL_COND_MSG(ring_buffer.data_left(), "Buffer in use, resizing would cause loss of data.");
@ -291,22 +271,18 @@ void PacketPeerStream::set_input_buffer_max_size(int p_max_size) {
} }
int PacketPeerStream::get_input_buffer_max_size() const { int PacketPeerStream::get_input_buffer_max_size() const {
return input_buffer.size() - 4; return input_buffer.size() - 4;
} }
void PacketPeerStream::set_output_buffer_max_size(int p_max_size) { void PacketPeerStream::set_output_buffer_max_size(int p_max_size) {
output_buffer.resize(next_power_of_2(p_max_size + 4)); output_buffer.resize(next_power_of_2(p_max_size + 4));
} }
int PacketPeerStream::get_output_buffer_max_size() const { int PacketPeerStream::get_output_buffer_max_size() const {
return output_buffer.size() - 4; return output_buffer.size() - 4;
} }
PacketPeerStream::PacketPeerStream() { PacketPeerStream::PacketPeerStream() {
int rbsize = GLOBAL_GET("network/limits/packet_peer_stream/max_buffer_po2"); int rbsize = GLOBAL_GET("network/limits/packet_peer_stream/max_buffer_po2");
ring_buffer.resize(rbsize); ring_buffer.resize(rbsize);

2
core/io/packet_peer.h
View file

@ -36,7 +36,6 @@
#include "core/ring_buffer.h" #include "core/ring_buffer.h"
class PacketPeer : public Reference { class PacketPeer : public Reference {
GDCLASS(PacketPeer, Reference); GDCLASS(PacketPeer, Reference);
Variant _bnd_get_var(bool p_allow_objects = false); Variant _bnd_get_var(bool p_allow_objects = false);
@ -75,7 +74,6 @@ public:
}; };
class PacketPeerStream : public PacketPeer { class PacketPeerStream : public PacketPeer {
GDCLASS(PacketPeerStream, PacketPeer); GDCLASS(PacketPeerStream, PacketPeer);
//the way the buffers work sucks, will change later //the way the buffers work sucks, will change later

2
core/io/packet_peer_dtls.cpp
View file

@ -36,7 +36,6 @@ PacketPeerDTLS *(*PacketPeerDTLS::_create)() = nullptr;
bool PacketPeerDTLS::available = false; bool PacketPeerDTLS::available = false;
PacketPeerDTLS *PacketPeerDTLS::create() { PacketPeerDTLS *PacketPeerDTLS::create() {
return _create(); return _create();
} }
@ -45,7 +44,6 @@ bool PacketPeerDTLS::is_available() {
} }
void PacketPeerDTLS::_bind_methods() { void PacketPeerDTLS::_bind_methods() {
ClassDB::bind_method(D_METHOD("poll"), &PacketPeerDTLS::poll); ClassDB::bind_method(D_METHOD("poll"), &PacketPeerDTLS::poll);
ClassDB::bind_method(D_METHOD("connect_to_peer", "packet_peer", "validate_certs", "for_hostname", "valid_certificate"), &PacketPeerDTLS::connect_to_peer, DEFVAL(true), DEFVAL(String()), DEFVAL(Ref<X509Certificate>())); ClassDB::bind_method(D_METHOD("connect_to_peer", "packet_peer", "validate_certs", "for_hostname", "valid_certificate"), &PacketPeerDTLS::connect_to_peer, DEFVAL(true), DEFVAL(String()), DEFVAL(Ref<X509Certificate>()));
ClassDB::bind_method(D_METHOD("get_status"), &PacketPeerDTLS::get_status); ClassDB::bind_method(D_METHOD("get_status"), &PacketPeerDTLS::get_status);

19
core/io/packet_peer_udp.cpp
View file

@ -33,7 +33,6 @@
#include "core/io/ip.h" #include "core/io/ip.h"
void PacketPeerUDP::set_blocking_mode(bool p_enable) { void PacketPeerUDP::set_blocking_mode(bool p_enable) {
blocking = p_enable; blocking = p_enable;
} }
@ -44,7 +43,6 @@ void PacketPeerUDP::set_broadcast_enabled(bool p_enabled) {
} }
Error PacketPeerUDP::join_multicast_group(IP_Address p_multi_address, String p_if_name) { Error PacketPeerUDP::join_multicast_group(IP_Address p_multi_address, String p_if_name) {
ERR_FAIL_COND_V(!_sock.is_valid(), ERR_UNAVAILABLE); ERR_FAIL_COND_V(!_sock.is_valid(), ERR_UNAVAILABLE);
ERR_FAIL_COND_V(!p_multi_address.is_valid(), ERR_INVALID_PARAMETER); ERR_FAIL_COND_V(!p_multi_address.is_valid(), ERR_INVALID_PARAMETER);
@ -59,19 +57,16 @@ Error PacketPeerUDP::join_multicast_group(IP_Address p_multi_address, String p_i
} }
Error PacketPeerUDP::leave_multicast_group(IP_Address p_multi_address, String p_if_name) { Error PacketPeerUDP::leave_multicast_group(IP_Address p_multi_address, String p_if_name) {
ERR_FAIL_COND_V(!_sock.is_valid(), ERR_UNAVAILABLE); ERR_FAIL_COND_V(!_sock.is_valid(), ERR_UNAVAILABLE);
ERR_FAIL_COND_V(!_sock->is_open(), ERR_UNCONFIGURED); ERR_FAIL_COND_V(!_sock->is_open(), ERR_UNCONFIGURED);
return _sock->leave_multicast_group(p_multi_address, p_if_name); return _sock->leave_multicast_group(p_multi_address, p_if_name);
} }
String PacketPeerUDP::_get_packet_ip() const { String PacketPeerUDP::_get_packet_ip() const {
return get_packet_address(); return get_packet_address();
} }
Error PacketPeerUDP::_set_dest_address(const String &p_address, int p_port) { Error PacketPeerUDP::_set_dest_address(const String &p_address, int p_port) {
IP_Address ip; IP_Address ip;
if (p_address.is_valid_ip_address()) { if (p_address.is_valid_ip_address()) {
ip = p_address; ip = p_address;
@ -86,7 +81,6 @@ Error PacketPeerUDP::_set_dest_address(const String &p_address, int p_port) {
} }
int PacketPeerUDP::get_available_packet_count() const { int PacketPeerUDP::get_available_packet_count() const {
// TODO we should deprecate this, and expose poll instead! // TODO we should deprecate this, and expose poll instead!
Error err = const_cast<PacketPeerUDP *>(this)->_poll(); Error err = const_cast<PacketPeerUDP *>(this)->_poll();
if (err != OK) if (err != OK)
@ -96,7 +90,6 @@ int PacketPeerUDP::get_available_packet_count() const {
} }
Error PacketPeerUDP::get_packet(const uint8_t **r_buffer, int &r_buffer_size) { Error PacketPeerUDP::get_packet(const uint8_t **r_buffer, int &r_buffer_size) {
Error err = _poll(); Error err = _poll();
if (err != OK) if (err != OK)
return err; return err;
@ -117,7 +110,6 @@ Error PacketPeerUDP::get_packet(const uint8_t **r_buffer, int &r_buffer_size) {
} }
Error PacketPeerUDP::put_packet(const uint8_t *p_buffer, int p_buffer_size) { Error PacketPeerUDP::put_packet(const uint8_t *p_buffer, int p_buffer_size) {
ERR_FAIL_COND_V(!_sock.is_valid(), ERR_UNAVAILABLE); ERR_FAIL_COND_V(!_sock.is_valid(), ERR_UNAVAILABLE);
ERR_FAIL_COND_V(!peer_addr.is_valid(), ERR_UNCONFIGURED); ERR_FAIL_COND_V(!peer_addr.is_valid(), ERR_UNCONFIGURED);
@ -154,12 +146,10 @@ Error PacketPeerUDP::put_packet(const uint8_t *p_buffer, int p_buffer_size) {
} }
int PacketPeerUDP::get_max_packet_size() const { int PacketPeerUDP::get_max_packet_size() const {
return 512; // uhm maybe not return 512; // uhm maybe not
} }
Error PacketPeerUDP::listen(int p_port, const IP_Address &p_bind_address, int p_recv_buffer_size) { Error PacketPeerUDP::listen(int p_port, const IP_Address &p_bind_address, int p_recv_buffer_size) {
ERR_FAIL_COND_V(!_sock.is_valid(), ERR_UNAVAILABLE); ERR_FAIL_COND_V(!_sock.is_valid(), ERR_UNAVAILABLE);
ERR_FAIL_COND_V(_sock->is_open(), ERR_ALREADY_IN_USE); ERR_FAIL_COND_V(_sock->is_open(), ERR_ALREADY_IN_USE);
ERR_FAIL_COND_V(!p_bind_address.is_valid() && !p_bind_address.is_wildcard(), ERR_INVALID_PARAMETER); ERR_FAIL_COND_V(!p_bind_address.is_valid() && !p_bind_address.is_wildcard(), ERR_INVALID_PARAMETER);
@ -245,7 +235,6 @@ bool PacketPeerUDP::is_connected_to_host() const {
} }
void PacketPeerUDP::close() { void PacketPeerUDP::close() {
if (_sock.is_valid()) if (_sock.is_valid())
_sock->close(); _sock->close();
rb.resize(16); rb.resize(16);
@ -254,13 +243,11 @@ void PacketPeerUDP::close() {
} }
Error PacketPeerUDP::wait() { Error PacketPeerUDP::wait() {
ERR_FAIL_COND_V(!_sock.is_valid(), ERR_UNAVAILABLE); ERR_FAIL_COND_V(!_sock.is_valid(), ERR_UNAVAILABLE);
return _sock->poll(NetSocket::POLL_TYPE_IN, -1); return _sock->poll(NetSocket::POLL_TYPE_IN, -1);
} }
Error PacketPeerUDP::_poll() { Error PacketPeerUDP::_poll() {
ERR_FAIL_COND_V(!_sock.is_valid(), ERR_UNAVAILABLE); ERR_FAIL_COND_V(!_sock.is_valid(), ERR_UNAVAILABLE);
if (!_sock->is_open()) { if (!_sock->is_open()) {
@ -305,29 +292,24 @@ Error PacketPeerUDP::_poll() {
return OK; return OK;
} }
bool PacketPeerUDP::is_listening() const { bool PacketPeerUDP::is_listening() const {
return _sock.is_valid() && _sock->is_open(); return _sock.is_valid() && _sock->is_open();
} }
IP_Address PacketPeerUDP::get_packet_address() const { IP_Address PacketPeerUDP::get_packet_address() const {
return packet_ip; return packet_ip;
} }
int PacketPeerUDP::get_packet_port() const { int PacketPeerUDP::get_packet_port() const {
return packet_port; return packet_port;
} }
void PacketPeerUDP::set_dest_address(const IP_Address &p_address, int p_port) { void PacketPeerUDP::set_dest_address(const IP_Address &p_address, int p_port) {
ERR_FAIL_COND_MSG(connected, "Destination address cannot be set for connected sockets"); ERR_FAIL_COND_MSG(connected, "Destination address cannot be set for connected sockets");
peer_addr = p_address; peer_addr = p_address;
peer_port = p_port; peer_port = p_port;
} }
void PacketPeerUDP::_bind_methods() { void PacketPeerUDP::_bind_methods() {
ClassDB::bind_method(D_METHOD("listen", "port", "bind_address", "recv_buf_size"), &PacketPeerUDP::listen, DEFVAL("*"), DEFVAL(65536)); ClassDB::bind_method(D_METHOD("listen", "port", "bind_address", "recv_buf_size"), &PacketPeerUDP::listen, DEFVAL("*"), DEFVAL(65536));
ClassDB::bind_method(D_METHOD("close"), &PacketPeerUDP::close); ClassDB::bind_method(D_METHOD("close"), &PacketPeerUDP::close);
ClassDB::bind_method(D_METHOD("wait"), &PacketPeerUDP::wait); ClassDB::bind_method(D_METHOD("wait"), &PacketPeerUDP::wait);
@ -348,6 +330,5 @@ PacketPeerUDP::PacketPeerUDP() :
} }
PacketPeerUDP::~PacketPeerUDP() { PacketPeerUDP::~PacketPeerUDP() {
close(); close();
} }

11
core/io/pck_packer.cpp
View file

@ -35,7 +35,6 @@
#include "core/version.h" #include "core/version.h"
static uint64_t _align(uint64_t p_n, int p_alignment) { static uint64_t _align(uint64_t p_n, int p_alignment) {
if (p_alignment == 0) if (p_alignment == 0)
return p_n; return p_n;
@ -47,22 +46,18 @@ static uint64_t _align(uint64_t p_n, int p_alignment) {
}; };
static void _pad(FileAccess *p_file, int p_bytes) { static void _pad(FileAccess *p_file, int p_bytes) {
for (int i = 0; i < p_bytes; i++) { for (int i = 0; i < p_bytes; i++) {
p_file->store_8(0); p_file->store_8(0);
}; };
}; };
void PCKPacker::_bind_methods() { void PCKPacker::_bind_methods() {
ClassDB::bind_method(D_METHOD("pck_start", "pck_name", "alignment"), &PCKPacker::pck_start, DEFVAL(0)); ClassDB::bind_method(D_METHOD("pck_start", "pck_name", "alignment"), &PCKPacker::pck_start, DEFVAL(0));
ClassDB::bind_method(D_METHOD("add_file", "pck_path", "source_path"), &PCKPacker::add_file); ClassDB::bind_method(D_METHOD("add_file", "pck_path", "source_path"), &PCKPacker::add_file);
ClassDB::bind_method(D_METHOD("flush", "verbose"), &PCKPacker::flush, DEFVAL(false)); ClassDB::bind_method(D_METHOD("flush", "verbose"), &PCKPacker::flush, DEFVAL(false));
}; };
Error PCKPacker::pck_start(const String &p_file, int p_alignment) { Error PCKPacker::pck_start(const String &p_file, int p_alignment) {
if (file != nullptr) { if (file != nullptr) {
memdelete(file); memdelete(file);
} }
@ -80,7 +75,6 @@ Error PCKPacker::pck_start(const String &p_file, int p_alignment) {
file->store_32(VERSION_PATCH); file->store_32(VERSION_PATCH);
for (int i = 0; i < 16; i++) { for (int i = 0; i < 16; i++) {
file->store_32(0); // reserved file->store_32(0); // reserved
}; };
@ -90,7 +84,6 @@ Error PCKPacker::pck_start(const String &p_file, int p_alignment) {
}; };
Error PCKPacker::add_file(const String &p_file, const String &p_src) { Error PCKPacker::add_file(const String &p_file, const String &p_src) {
FileAccess *f = FileAccess::open(p_src, FileAccess::READ); FileAccess *f = FileAccess::open(p_src, FileAccess::READ);
if (!f) { if (!f) {
return ERR_FILE_CANT_OPEN; return ERR_FILE_CANT_OPEN;
@ -111,7 +104,6 @@ Error PCKPacker::add_file(const String &p_file, const String &p_src) {
}; };
Error PCKPacker::flush(bool p_verbose) { Error PCKPacker::flush(bool p_verbose) {
ERR_FAIL_COND_V_MSG(!file, ERR_INVALID_PARAMETER, "File must be opened before use."); ERR_FAIL_COND_V_MSG(!file, ERR_INVALID_PARAMETER, "File must be opened before use.");
// write the index // write the index
@ -119,7 +111,6 @@ Error PCKPacker::flush(bool p_verbose) {
file->store_32(files.size()); file->store_32(files.size());
for (int i = 0; i < files.size(); i++) { for (int i = 0; i < files.size(); i++) {
file->store_pascal_string(files[i].path); file->store_pascal_string(files[i].path);
files.write[i].offset_offset = file->get_position(); files.write[i].offset_offset = file->get_position();
file->store_64(0); // offset file->store_64(0); // offset
@ -142,11 +133,9 @@ Error PCKPacker::flush(bool p_verbose) {
int count = 0; int count = 0;
for (int i = 0; i < files.size(); i++) { for (int i = 0; i < files.size(); i++) {
FileAccess *src = FileAccess::open(files[i].src_path, FileAccess::READ); FileAccess *src = FileAccess::open(files[i].src_path, FileAccess::READ);
uint64_t to_write = files[i].size; uint64_t to_write = files[i].size;
while (to_write > 0) { while (to_write > 0) {
int read = src->get_buffer(buf, MIN(to_write, buf_max)); int read = src->get_buffer(buf, MIN(to_write, buf_max));
file->store_buffer(buf, read); file->store_buffer(buf, read);
to_write -= read; to_write -= read;

2
core/io/pck_packer.h
View file

@ -36,7 +36,6 @@
class FileAccess; class FileAccess;
class PCKPacker : public Reference { class PCKPacker : public Reference {
GDCLASS(PCKPacker, Reference); GDCLASS(PCKPacker, Reference);
FileAccess *file = nullptr; FileAccess *file = nullptr;
@ -45,7 +44,6 @@ class PCKPacker : public Reference {
static void _bind_methods(); static void _bind_methods();
struct File { struct File {
String path; String path;
String src_path; String src_path;
int size; int size;

159
core/io/resource_format_binary.cpp
View file

File diff suppressed because it is too large Load diff

3
core/io/resource_format_binary.h
View file

@ -36,7 +36,6 @@
#include "core/os/file_access.h" #include "core/os/file_access.h"
class ResourceLoaderBinary { class ResourceLoaderBinary {
bool translation_remapped = false; bool translation_remapped = false;
String local_path; String local_path;
String res_path; String res_path;
@ -114,7 +113,6 @@ public:
}; };
class ResourceFormatSaverBinaryInstance { class ResourceFormatSaverBinaryInstance {
String local_path; String local_path;
String path; String path;
@ -147,7 +145,6 @@ class ResourceFormatSaverBinaryInstance {
}; };
struct ResourceData { struct ResourceData {
String type; String type;
List<Property> properties; List<Property> properties;
}; };

32
core/io/resource_importer.cpp
View file

@ -38,7 +38,6 @@ bool ResourceFormatImporter::SortImporterByName::operator()(const Ref<ResourceIm
} }
Error ResourceFormatImporter::_get_path_and_type(const String &p_path, PathAndType &r_path_and_type, bool *r_valid) const { Error ResourceFormatImporter::_get_path_and_type(const String &p_path, PathAndType &r_path_and_type, bool *r_valid) const {
Error err; Error err;
FileAccess *f = FileAccess::open(p_path + ".import", FileAccess::READ, &err); FileAccess *f = FileAccess::open(p_path + ".import", FileAccess::READ, &err);
@ -64,7 +63,6 @@ Error ResourceFormatImporter::_get_path_and_type(const String &p_path, PathAndTy
String error_text; String error_text;
bool path_found = false; //first match must have priority bool path_found = false; //first match must have priority
while (true) { while (true) {
assign = Variant(); assign = Variant();
next_tag.fields.clear(); next_tag.fields.clear();
next_tag.name = String(); next_tag.name = String();
@ -118,12 +116,10 @@ Error ResourceFormatImporter::_get_path_and_type(const String &p_path, PathAndTy
} }
RES ResourceFormatImporter::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, bool p_no_cache) { RES ResourceFormatImporter::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, bool p_no_cache) {
PathAndType pat; PathAndType pat;
Error err = _get_path_and_type(p_path, pat); Error err = _get_path_and_type(p_path, pat);
if (err != OK) { if (err != OK) {
if (r_error) if (r_error)
*r_error = err; *r_error = err;
@ -143,7 +139,6 @@ RES ResourceFormatImporter::load(const String &p_path, const String &p_original_
} }
void ResourceFormatImporter::get_recognized_extensions(List<String> *p_extensions) const { void ResourceFormatImporter::get_recognized_extensions(List<String> *p_extensions) const {
Set<String> found; Set<String> found;
for (int i = 0; i < importers.size(); i++) { for (int i = 0; i < importers.size(); i++) {
@ -159,7 +154,6 @@ void ResourceFormatImporter::get_recognized_extensions(List<String> *p_extension
} }
void ResourceFormatImporter::get_recognized_extensions_for_type(const String &p_type, List<String> *p_extensions) const { void ResourceFormatImporter::get_recognized_extensions_for_type(const String &p_type, List<String> *p_extensions) const {
if (p_type == "") { if (p_type == "") {
get_recognized_extensions(p_extensions); get_recognized_extensions(p_extensions);
return; return;
@ -187,26 +181,21 @@ void ResourceFormatImporter::get_recognized_extensions_for_type(const String &p_
} }
bool ResourceFormatImporter::exists(const String &p_path) const { bool ResourceFormatImporter::exists(const String &p_path) const {
return FileAccess::exists(p_path + ".import"); return FileAccess::exists(p_path + ".import");
} }
bool ResourceFormatImporter::recognize_path(const String &p_path, const String &p_for_type) const { bool ResourceFormatImporter::recognize_path(const String &p_path, const String &p_for_type) const {
return FileAccess::exists(p_path + ".import"); return FileAccess::exists(p_path + ".import");
} }
bool ResourceFormatImporter::can_be_imported(const String &p_path) const { bool ResourceFormatImporter::can_be_imported(const String &p_path) const {
return ResourceFormatLoader::recognize_path(p_path); return ResourceFormatLoader::recognize_path(p_path);
} }
int ResourceFormatImporter::get_import_order(const String &p_path) const { int ResourceFormatImporter::get_import_order(const String &p_path) const {
Ref<ResourceImporter> importer; Ref<ResourceImporter> importer;
if (FileAccess::exists(p_path + ".import")) { if (FileAccess::exists(p_path + ".import")) {
PathAndType pat; PathAndType pat;
Error err = _get_path_and_type(p_path, pat); Error err = _get_path_and_type(p_path, pat);
@ -214,7 +203,6 @@ int ResourceFormatImporter::get_import_order(const String &p_path) const {
importer = get_importer_by_name(pat.importer); importer = get_importer_by_name(pat.importer);
} }
} else { } else {
importer = get_importer_by_extension(p_path.get_extension().to_lower()); importer = get_importer_by_extension(p_path.get_extension().to_lower());
} }
@ -225,9 +213,7 @@ int ResourceFormatImporter::get_import_order(const String &p_path) const {
} }
bool ResourceFormatImporter::handles_type(const String &p_type) const { bool ResourceFormatImporter::handles_type(const String &p_type) const {
for (int i = 0; i < importers.size(); i++) { for (int i = 0; i < importers.size(); i++) {
String res_type = importers[i]->get_resource_type(); String res_type = importers[i]->get_resource_type();
if (res_type == String()) if (res_type == String())
continue; continue;
@ -239,12 +225,10 @@ bool ResourceFormatImporter::handles_type(const String &p_type) const {
} }
String ResourceFormatImporter::get_internal_resource_path(const String &p_path) const { String ResourceFormatImporter::get_internal_resource_path(const String &p_path) const {
PathAndType pat; PathAndType pat;
Error err = _get_path_and_type(p_path, pat); Error err = _get_path_and_type(p_path, pat);
if (err != OK) { if (err != OK) {
return String(); return String();
} }
@ -252,7 +236,6 @@ String ResourceFormatImporter::get_internal_resource_path(const String &p_path)
} }
void ResourceFormatImporter::get_internal_resource_path_list(const String &p_path, List<String> *r_paths) { void ResourceFormatImporter::get_internal_resource_path_list(const String &p_path, List<String> *r_paths) {
Error err; Error err;
FileAccess *f = FileAccess::open(p_path + ".import", FileAccess::READ, &err); FileAccess *f = FileAccess::open(p_path + ".import", FileAccess::READ, &err);
@ -269,7 +252,6 @@ void ResourceFormatImporter::get_internal_resource_path_list(const String &p_pat
int lines = 0; int lines = 0;
String error_text; String error_text;
while (true) { while (true) {
assign = Variant(); assign = Variant();
next_tag.fields.clear(); next_tag.fields.clear();
next_tag.name = String(); next_tag.name = String();
@ -298,7 +280,6 @@ void ResourceFormatImporter::get_internal_resource_path_list(const String &p_pat
} }
String ResourceFormatImporter::get_import_group_file(const String &p_path) const { String ResourceFormatImporter::get_import_group_file(const String &p_path) const {
bool valid = true; bool valid = true;
PathAndType pat; PathAndType pat;
_get_path_and_type(p_path, pat, &valid); _get_path_and_type(p_path, pat, &valid);
@ -306,7 +287,6 @@ String ResourceFormatImporter::get_import_group_file(const String &p_path) const
} }
bool ResourceFormatImporter::is_import_valid(const String &p_path) const { bool ResourceFormatImporter::is_import_valid(const String &p_path) const {
bool valid = true; bool valid = true;
PathAndType pat; PathAndType pat;
_get_path_and_type(p_path, pat, &valid); _get_path_and_type(p_path, pat, &valid);
@ -314,12 +294,10 @@ bool ResourceFormatImporter::is_import_valid(const String &p_path) const {
} }
String ResourceFormatImporter::get_resource_type(const String &p_path) const { String ResourceFormatImporter::get_resource_type(const String &p_path) const {
PathAndType pat; PathAndType pat;
Error err = _get_path_and_type(p_path, pat); Error err = _get_path_and_type(p_path, pat);
if (err != OK) { if (err != OK) {
return ""; return "";
} }
@ -331,7 +309,6 @@ Variant ResourceFormatImporter::get_resource_metadata(const String &p_path) cons
Error err = _get_path_and_type(p_path, pat); Error err = _get_path_and_type(p_path, pat);
if (err != OK) { if (err != OK) {
return Variant(); return Variant();
} }
@ -339,12 +316,10 @@ Variant ResourceFormatImporter::get_resource_metadata(const String &p_path) cons
} }
void ResourceFormatImporter::get_dependencies(const String &p_path, List<String> *p_dependencies, bool p_add_types) { void ResourceFormatImporter::get_dependencies(const String &p_path, List<String> *p_dependencies, bool p_add_types) {
PathAndType pat; PathAndType pat;
Error err = _get_path_and_type(p_path, pat); Error err = _get_path_and_type(p_path, pat);
if (err != OK) { if (err != OK) {
return; return;
} }
@ -352,7 +327,6 @@ void ResourceFormatImporter::get_dependencies(const String &p_path, List<String>
} }
Ref<ResourceImporter> ResourceFormatImporter::get_importer_by_name(const String &p_name) const { Ref<ResourceImporter> ResourceFormatImporter::get_importer_by_name(const String &p_name) const {
for (int i = 0; i < importers.size(); i++) { for (int i = 0; i < importers.size(); i++) {
if (importers[i]->get_importer_name() == p_name) { if (importers[i]->get_importer_name() == p_name) {
return importers[i]; return importers[i];
@ -363,7 +337,6 @@ Ref<ResourceImporter> ResourceFormatImporter::get_importer_by_name(const String
} }
void ResourceFormatImporter::get_importers_for_extension(const String &p_extension, List<Ref<ResourceImporter>> *r_importers) { void ResourceFormatImporter::get_importers_for_extension(const String &p_extension, List<Ref<ResourceImporter>> *r_importers) {
for (int i = 0; i < importers.size(); i++) { for (int i = 0; i < importers.size(); i++) {
List<String> local_exts; List<String> local_exts;
importers[i]->get_recognized_extensions(&local_exts); importers[i]->get_recognized_extensions(&local_exts);
@ -376,12 +349,10 @@ void ResourceFormatImporter::get_importers_for_extension(const String &p_extensi
} }
Ref<ResourceImporter> ResourceFormatImporter::get_importer_by_extension(const String &p_extension) const { Ref<ResourceImporter> ResourceFormatImporter::get_importer_by_extension(const String &p_extension) const {
Ref<ResourceImporter> importer; Ref<ResourceImporter> importer;
float priority = 0; float priority = 0;
for (int i = 0; i < importers.size(); i++) { for (int i = 0; i < importers.size(); i++) {
List<String> local_exts; List<String> local_exts;
importers[i]->get_recognized_extensions(&local_exts); importers[i]->get_recognized_extensions(&local_exts);
for (List<String>::Element *F = local_exts.front(); F; F = F->next()) { for (List<String>::Element *F = local_exts.front(); F; F = F->next()) {
@ -396,12 +367,10 @@ Ref<ResourceImporter> ResourceFormatImporter::get_importer_by_extension(const St
} }
String ResourceFormatImporter::get_import_base_path(const String &p_for_file) const { String ResourceFormatImporter::get_import_base_path(const String &p_for_file) const {
return "res://.import/" + p_for_file.get_file() + "-" + p_for_file.md5_text(); return "res://.import/" + p_for_file.get_file() + "-" + p_for_file.md5_text();
} }
bool ResourceFormatImporter::are_import_settings_valid(const String &p_path) const { bool ResourceFormatImporter::are_import_settings_valid(const String &p_path) const {
bool valid = true; bool valid = true;
PathAndType pat; PathAndType pat;
_get_path_and_type(p_path, pat, &valid); _get_path_and_type(p_path, pat, &valid);
@ -422,7 +391,6 @@ bool ResourceFormatImporter::are_import_settings_valid(const String &p_path) con
} }
String ResourceFormatImporter::get_import_settings_hash() const { String ResourceFormatImporter::get_import_settings_hash() const {
Vector<Ref<ResourceImporter>> sorted_importers = importers; Vector<Ref<ResourceImporter>> sorted_importers = importers;
sorted_importers.sort_custom<SortImporterByName>(); sorted_importers.sort_custom<SortImporterByName>();

2
core/io/resource_importer.h
View file

@ -36,7 +36,6 @@
class ResourceImporter; class ResourceImporter;
class ResourceFormatImporter : public ResourceFormatLoader { class ResourceFormatImporter : public ResourceFormatLoader {
struct PathAndType { struct PathAndType {
String path; String path;
String type; String type;
@ -93,7 +92,6 @@ public:
}; };
class ResourceImporter : public Reference { class ResourceImporter : public Reference {
GDCLASS(ResourceImporter, Reference); GDCLASS(ResourceImporter, Reference);
public: public:

59
core/io/resource_loader.cpp
View file

@ -49,7 +49,6 @@ Ref<ResourceFormatLoader> ResourceLoader::loader[ResourceLoader::MAX_LOADERS];
int ResourceLoader::loader_count = 0; int ResourceLoader::loader_count = 0;
bool ResourceFormatLoader::recognize_path(const String &p_path, const String &p_for_type) const { bool ResourceFormatLoader::recognize_path(const String &p_path, const String &p_for_type) const {
String extension = p_path.get_extension(); String extension = p_path.get_extension();
List<String> extensions; List<String> extensions;
@ -60,7 +59,6 @@ bool ResourceFormatLoader::recognize_path(const String &p_path, const String &p_
} }
for (List<String>::Element *E = extensions.front(); E; E = E->next()) { for (List<String>::Element *E = extensions.front(); E; E = E->next()) {
if (E->get().nocasecmp_to(extension) == 0) if (E->get().nocasecmp_to(extension) == 0)
return true; return true;
} }
@ -69,7 +67,6 @@ bool ResourceFormatLoader::recognize_path(const String &p_path, const String &p_
} }
bool ResourceFormatLoader::handles_type(const String &p_type) const { bool ResourceFormatLoader::handles_type(const String &p_type) const {
if (get_script_instance() && get_script_instance()->has_method("handles_type")) { if (get_script_instance() && get_script_instance()->has_method("handles_type")) {
// I guess custom loaders for custom resources should use "Resource" // I guess custom loaders for custom resources should use "Resource"
return get_script_instance()->call("handles_type", p_type); return get_script_instance()->call("handles_type", p_type);
@ -79,7 +76,6 @@ bool ResourceFormatLoader::handles_type(const String &p_type) const {
} }
String ResourceFormatLoader::get_resource_type(const String &p_path) const { String ResourceFormatLoader::get_resource_type(const String &p_path) const {
if (get_script_instance() && get_script_instance()->has_method("get_resource_type")) { if (get_script_instance() && get_script_instance()->has_method("get_resource_type")) {
return get_script_instance()->call("get_resource_type", p_path); return get_script_instance()->call("get_resource_type", p_path);
} }
@ -88,13 +84,11 @@ String ResourceFormatLoader::get_resource_type(const String &p_path) const {
} }
void ResourceFormatLoader::get_recognized_extensions_for_type(const String &p_type, List<String> *p_extensions) const { void ResourceFormatLoader::get_recognized_extensions_for_type(const String &p_type, List<String> *p_extensions) const {
if (p_type == "" || handles_type(p_type)) if (p_type == "" || handles_type(p_type))
get_recognized_extensions(p_extensions); get_recognized_extensions(p_extensions);
} }
void ResourceLoader::get_recognized_extensions_for_type(const String &p_type, List<String> *p_extensions) { void ResourceLoader::get_recognized_extensions_for_type(const String &p_type, List<String> *p_extensions) {
for (int i = 0; i < loader_count; i++) { for (int i = 0; i < loader_count; i++) {
loader[i]->get_recognized_extensions_for_type(p_type, p_extensions); loader[i]->get_recognized_extensions_for_type(p_type, p_extensions);
} }
@ -105,7 +99,6 @@ bool ResourceFormatLoader::exists(const String &p_path) const {
} }
void ResourceFormatLoader::get_recognized_extensions(List<String> *p_extensions) const { void ResourceFormatLoader::get_recognized_extensions(List<String> *p_extensions) const {
if (get_script_instance() && get_script_instance()->has_method("get_recognized_extensions")) { if (get_script_instance() && get_script_instance()->has_method("get_recognized_extensions")) {
PackedStringArray exts = get_script_instance()->call("get_recognized_extensions"); PackedStringArray exts = get_script_instance()->call("get_recognized_extensions");
@ -119,17 +112,14 @@ void ResourceFormatLoader::get_recognized_extensions(List<String> *p_extensions)
} }
RES ResourceFormatLoader::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, bool p_no_cache) { RES ResourceFormatLoader::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, bool p_no_cache) {
if (get_script_instance() && get_script_instance()->has_method("load")) { if (get_script_instance() && get_script_instance()->has_method("load")) {
Variant res = get_script_instance()->call("load", p_path, p_original_path, p_use_sub_threads); Variant res = get_script_instance()->call("load", p_path, p_original_path, p_use_sub_threads);
if (res.get_type() == Variant::INT) { if (res.get_type() == Variant::INT) {
if (r_error) if (r_error)
*r_error = (Error)res.operator int64_t(); *r_error = (Error)res.operator int64_t();
} else { } else {
if (r_error) if (r_error)
*r_error = OK; *r_error = OK;
return res; return res;
@ -142,7 +132,6 @@ RES ResourceFormatLoader::load(const String &p_path, const String &p_original_pa
} }
void ResourceFormatLoader::get_dependencies(const String &p_path, List<String> *p_dependencies, bool p_add_types) { void ResourceFormatLoader::get_dependencies(const String &p_path, List<String> *p_dependencies, bool p_add_types) {
if (get_script_instance() && get_script_instance()->has_method("get_dependencies")) { if (get_script_instance() && get_script_instance()->has_method("get_dependencies")) {
PackedStringArray deps = get_script_instance()->call("get_dependencies", p_path, p_add_types); PackedStringArray deps = get_script_instance()->call("get_dependencies", p_path, p_add_types);
@ -156,9 +145,7 @@ void ResourceFormatLoader::get_dependencies(const String &p_path, List<String> *
} }
Error ResourceFormatLoader::rename_dependencies(const String &p_path, const Map<String, String> &p_map) { Error ResourceFormatLoader::rename_dependencies(const String &p_path, const Map<String, String> &p_map) {
if (get_script_instance() && get_script_instance()->has_method("rename_dependencies")) { if (get_script_instance() && get_script_instance()->has_method("rename_dependencies")) {
Dictionary deps_dict; Dictionary deps_dict;
for (Map<String, String>::Element *E = p_map.front(); E; E = E->next()) { for (Map<String, String>::Element *E = p_map.front(); E; E = E->next()) {
deps_dict[E->key()] = E->value(); deps_dict[E->key()] = E->value();
@ -172,7 +159,6 @@ Error ResourceFormatLoader::rename_dependencies(const String &p_path, const Map<
} }
void ResourceFormatLoader::_bind_methods() { void ResourceFormatLoader::_bind_methods() {
{ {
MethodInfo info = MethodInfo(Variant::NIL, "load", PropertyInfo(Variant::STRING, "path"), PropertyInfo(Variant::STRING, "original_path")); MethodInfo info = MethodInfo(Variant::NIL, "load", PropertyInfo(Variant::STRING, "path"), PropertyInfo(Variant::STRING, "original_path"));
info.return_val.usage |= PROPERTY_USAGE_NIL_IS_VARIANT; info.return_val.usage |= PROPERTY_USAGE_NIL_IS_VARIANT;
@ -189,12 +175,10 @@ void ResourceFormatLoader::_bind_methods() {
/////////////////////////////////// ///////////////////////////////////
RES ResourceLoader::_load(const String &p_path, const String &p_original_path, const String &p_type_hint, bool p_no_cache, Error *r_error, bool p_use_sub_threads, float *r_progress) { RES ResourceLoader::_load(const String &p_path, const String &p_original_path, const String &p_type_hint, bool p_no_cache, Error *r_error, bool p_use_sub_threads, float *r_progress) {
bool found = false; bool found = false;
// Try all loaders and pick the first match for the type hint // Try all loaders and pick the first match for the type hint
for (int i = 0; i < loader_count; i++) { for (int i = 0; i < loader_count; i++) {
if (!loader[i]->recognize_path(p_path, p_type_hint)) { if (!loader[i]->recognize_path(p_path, p_type_hint)) {
continue; continue;
} }
@ -218,7 +202,6 @@ RES ResourceLoader::_load(const String &p_path, const String &p_original_path, c
} }
void ResourceLoader::_thread_load_function(void *p_userdata) { void ResourceLoader::_thread_load_function(void *p_userdata) {
ThreadLoadTask &load_task = *(ThreadLoadTask *)p_userdata; ThreadLoadTask &load_task = *(ThreadLoadTask *)p_userdata;
load_task.loader_id = Thread::get_caller_id(); load_task.loader_id = Thread::get_caller_id();
@ -237,7 +220,6 @@ void ResourceLoader::_thread_load_function(void *p_userdata) {
load_task.status = THREAD_LOAD_LOADED; load_task.status = THREAD_LOAD_LOADED;
} }
if (load_task.semaphore) { if (load_task.semaphore) {
if (load_task.start_next && thread_waiting_count > 0) { if (load_task.start_next && thread_waiting_count > 0) {
thread_waiting_count--; thread_waiting_count--;
//thread loading count remains constant, this ends but another one begins //thread loading count remains constant, this ends but another one begins
@ -279,7 +261,6 @@ void ResourceLoader::_thread_load_function(void *p_userdata) {
thread_load_mutex->unlock(); thread_load_mutex->unlock();
} }
Error ResourceLoader::load_threaded_request(const String &p_path, const String &p_type_hint, bool p_use_sub_threads, const String &p_source_resource) { Error ResourceLoader::load_threaded_request(const String &p_path, const String &p_type_hint, bool p_use_sub_threads, const String &p_source_resource) {
String local_path; String local_path;
if (p_path.is_rel_path()) if (p_path.is_rel_path())
local_path = "res://" + p_path; local_path = "res://" + p_path;
@ -387,7 +368,6 @@ Error ResourceLoader::load_threaded_request(const String &p_path, const String &
} }
float ResourceLoader::_dependency_get_progress(const String &p_path) { float ResourceLoader::_dependency_get_progress(const String &p_path) {
if (thread_load_tasks.has(p_path)) { if (thread_load_tasks.has(p_path)) {
ThreadLoadTask &load_task = thread_load_tasks[p_path]; ThreadLoadTask &load_task = thread_load_tasks[p_path];
int dep_count = load_task.sub_tasks.size(); int dep_count = load_task.sub_tasks.size();
@ -410,7 +390,6 @@ float ResourceLoader::_dependency_get_progress(const String &p_path) {
} }
ResourceLoader::ThreadLoadStatus ResourceLoader::load_threaded_get_status(const String &p_path, float *r_progress) { ResourceLoader::ThreadLoadStatus ResourceLoader::load_threaded_get_status(const String &p_path, float *r_progress) {
String local_path; String local_path;
if (p_path.is_rel_path()) if (p_path.is_rel_path())
local_path = "res://" + p_path; local_path = "res://" + p_path;
@ -434,7 +413,6 @@ ResourceLoader::ThreadLoadStatus ResourceLoader::load_threaded_get_status(const
return status; return status;
} }
RES ResourceLoader::load_threaded_get(const String &p_path, Error *r_error) { RES ResourceLoader::load_threaded_get(const String &p_path, Error *r_error) {
String local_path; String local_path;
if (p_path.is_rel_path()) if (p_path.is_rel_path())
local_path = "res://" + p_path; local_path = "res://" + p_path;
@ -516,7 +494,6 @@ RES ResourceLoader::load_threaded_get(const String &p_path, Error *r_error) {
} }
RES ResourceLoader::load(const String &p_path, const String &p_type_hint, bool p_no_cache, Error *r_error) { RES ResourceLoader::load(const String &p_path, const String &p_type_hint, bool p_no_cache, Error *r_error) {
if (r_error) if (r_error)
*r_error = ERR_CANT_OPEN; *r_error = ERR_CANT_OPEN;
@ -527,7 +504,6 @@ RES ResourceLoader::load(const String &p_path, const String &p_type_hint, bool p
local_path = ProjectSettings::get_singleton()->localize_path(p_path); local_path = ProjectSettings::get_singleton()->localize_path(p_path);
if (!p_no_cache) { if (!p_no_cache) {
thread_load_mutex->lock(); thread_load_mutex->lock();
//Is it already being loaded? poll until done //Is it already being loaded? poll until done
@ -592,7 +568,6 @@ RES ResourceLoader::load(const String &p_path, const String &p_type_hint, bool p
return load_threaded_get(p_path, r_error); return load_threaded_get(p_path, r_error);
} else { } else {
bool xl_remapped = false; bool xl_remapped = false;
String path = _path_remap(local_path, &xl_remapped); String path = _path_remap(local_path, &xl_remapped);
@ -627,7 +602,6 @@ RES ResourceLoader::load(const String &p_path, const String &p_type_hint, bool p
} }
bool ResourceLoader::exists(const String &p_path, const String &p_type_hint) { bool ResourceLoader::exists(const String &p_path, const String &p_type_hint) {
String local_path; String local_path;
if (p_path.is_rel_path()) if (p_path.is_rel_path())
local_path = "res://" + p_path; local_path = "res://" + p_path;
@ -635,7 +609,6 @@ bool ResourceLoader::exists(const String &p_path, const String &p_type_hint) {
local_path = ProjectSettings::get_singleton()->localize_path(p_path); local_path = ProjectSettings::get_singleton()->localize_path(p_path);
if (ResourceCache::has(local_path)) { if (ResourceCache::has(local_path)) {
return true; // If cached, it probably exists return true; // If cached, it probably exists
} }
@ -644,7 +617,6 @@ bool ResourceLoader::exists(const String &p_path, const String &p_type_hint) {
// Try all loaders and pick the first match for the type hint // Try all loaders and pick the first match for the type hint
for (int i = 0; i < loader_count; i++) { for (int i = 0; i < loader_count; i++) {
if (!loader[i]->recognize_path(path, p_type_hint)) { if (!loader[i]->recognize_path(path, p_type_hint)) {
continue; continue;
} }
@ -657,7 +629,6 @@ bool ResourceLoader::exists(const String &p_path, const String &p_type_hint) {
} }
void ResourceLoader::add_resource_format_loader(Ref<ResourceFormatLoader> p_format_loader, bool p_at_front) { void ResourceLoader::add_resource_format_loader(Ref<ResourceFormatLoader> p_format_loader, bool p_at_front) {
ERR_FAIL_COND(p_format_loader.is_null()); ERR_FAIL_COND(p_format_loader.is_null());
ERR_FAIL_COND(loader_count >= MAX_LOADERS); ERR_FAIL_COND(loader_count >= MAX_LOADERS);
@ -673,7 +644,6 @@ void ResourceLoader::add_resource_format_loader(Ref<ResourceFormatLoader> p_form
} }
void ResourceLoader::remove_resource_format_loader(Ref<ResourceFormatLoader> p_format_loader) { void ResourceLoader::remove_resource_format_loader(Ref<ResourceFormatLoader> p_format_loader) {
ERR_FAIL_COND(p_format_loader.is_null()); ERR_FAIL_COND(p_format_loader.is_null());
// Find loader // Find loader
@ -694,7 +664,6 @@ void ResourceLoader::remove_resource_format_loader(Ref<ResourceFormatLoader> p_f
} }
int ResourceLoader::get_import_order(const String &p_path) { int ResourceLoader::get_import_order(const String &p_path) {
String path = _path_remap(p_path); String path = _path_remap(p_path);
String local_path; String local_path;
@ -704,7 +673,6 @@ int ResourceLoader::get_import_order(const String &p_path) {
local_path = ProjectSettings::get_singleton()->localize_path(path); local_path = ProjectSettings::get_singleton()->localize_path(path);
for (int i = 0; i < loader_count; i++) { for (int i = 0; i < loader_count; i++) {
if (!loader[i]->recognize_path(local_path)) if (!loader[i]->recognize_path(local_path))
continue; continue;
/* /*
@ -728,7 +696,6 @@ String ResourceLoader::get_import_group_file(const String &p_path) {
local_path = ProjectSettings::get_singleton()->localize_path(path); local_path = ProjectSettings::get_singleton()->localize_path(path);
for (int i = 0; i < loader_count; i++) { for (int i = 0; i < loader_count; i++) {
if (!loader[i]->recognize_path(local_path)) if (!loader[i]->recognize_path(local_path))
continue; continue;
/* /*
@ -743,7 +710,6 @@ String ResourceLoader::get_import_group_file(const String &p_path) {
} }
bool ResourceLoader::is_import_valid(const String &p_path) { bool ResourceLoader::is_import_valid(const String &p_path) {
String path = _path_remap(p_path); String path = _path_remap(p_path);
String local_path; String local_path;
@ -753,7 +719,6 @@ bool ResourceLoader::is_import_valid(const String &p_path) {
local_path = ProjectSettings::get_singleton()->localize_path(path); local_path = ProjectSettings::get_singleton()->localize_path(path);
for (int i = 0; i < loader_count; i++) { for (int i = 0; i < loader_count; i++) {
if (!loader[i]->recognize_path(local_path)) if (!loader[i]->recognize_path(local_path))
continue; continue;
/* /*
@ -768,7 +733,6 @@ bool ResourceLoader::is_import_valid(const String &p_path) {
} }
bool ResourceLoader::is_imported(const String &p_path) { bool ResourceLoader::is_imported(const String &p_path) {
String path = _path_remap(p_path); String path = _path_remap(p_path);
String local_path; String local_path;
@ -778,7 +742,6 @@ bool ResourceLoader::is_imported(const String &p_path) {
local_path = ProjectSettings::get_singleton()->localize_path(path); local_path = ProjectSettings::get_singleton()->localize_path(path);
for (int i = 0; i < loader_count; i++) { for (int i = 0; i < loader_count; i++) {
if (!loader[i]->recognize_path(local_path)) if (!loader[i]->recognize_path(local_path))
continue; continue;
/* /*
@ -793,7 +756,6 @@ bool ResourceLoader::is_imported(const String &p_path) {
} }
void ResourceLoader::get_dependencies(const String &p_path, List<String> *p_dependencies, bool p_add_types) { void ResourceLoader::get_dependencies(const String &p_path, List<String> *p_dependencies, bool p_add_types) {
String path = _path_remap(p_path); String path = _path_remap(p_path);
String local_path; String local_path;
@ -803,7 +765,6 @@ void ResourceLoader::get_dependencies(const String &p_path, List<String> *p_depe
local_path = ProjectSettings::get_singleton()->localize_path(path); local_path = ProjectSettings::get_singleton()->localize_path(path);
for (int i = 0; i < loader_count; i++) { for (int i = 0; i < loader_count; i++) {
if (!loader[i]->recognize_path(local_path)) if (!loader[i]->recognize_path(local_path))
continue; continue;
/* /*
@ -816,7 +777,6 @@ void ResourceLoader::get_dependencies(const String &p_path, List<String> *p_depe
} }
Error ResourceLoader::rename_dependencies(const String &p_path, const Map<String, String> &p_map) { Error ResourceLoader::rename_dependencies(const String &p_path, const Map<String, String> &p_map) {
String path = _path_remap(p_path); String path = _path_remap(p_path);
String local_path; String local_path;
@ -826,7 +786,6 @@ Error ResourceLoader::rename_dependencies(const String &p_path, const Map<String
local_path = ProjectSettings::get_singleton()->localize_path(path); local_path = ProjectSettings::get_singleton()->localize_path(path);
for (int i = 0; i < loader_count; i++) { for (int i = 0; i < loader_count; i++) {
if (!loader[i]->recognize_path(local_path)) if (!loader[i]->recognize_path(local_path))
continue; continue;
/* /*
@ -841,7 +800,6 @@ Error ResourceLoader::rename_dependencies(const String &p_path, const Map<String
} }
String ResourceLoader::get_resource_type(const String &p_path) { String ResourceLoader::get_resource_type(const String &p_path) {
String local_path; String local_path;
if (p_path.is_rel_path()) if (p_path.is_rel_path())
local_path = "res://" + p_path; local_path = "res://" + p_path;
@ -849,7 +807,6 @@ String ResourceLoader::get_resource_type(const String &p_path) {
local_path = ProjectSettings::get_singleton()->localize_path(p_path); local_path = ProjectSettings::get_singleton()->localize_path(p_path);
for (int i = 0; i < loader_count; i++) { for (int i = 0; i < loader_count; i++) {
String result = loader[i]->get_resource_type(local_path); String result = loader[i]->get_resource_type(local_path);
if (result != "") { if (result != "") {
return result; return result;
@ -860,7 +817,6 @@ String ResourceLoader::get_resource_type(const String &p_path) {
} }
String ResourceLoader::_path_remap(const String &p_path, bool *r_translation_remapped) { String ResourceLoader::_path_remap(const String &p_path, bool *r_translation_remapped) {
String new_path = p_path; String new_path = p_path;
if (translation_remaps.has(p_path)) { if (translation_remaps.has(p_path)) {
@ -919,7 +875,6 @@ String ResourceLoader::_path_remap(const String &p_path, bool *r_translation_rem
FileAccess *f = FileAccess::open(p_path + ".remap", FileAccess::READ, &err); FileAccess *f = FileAccess::open(p_path + ".remap", FileAccess::READ, &err);
if (f) { if (f) {
VariantParser::StreamFile stream; VariantParser::StreamFile stream;
stream.f = f; stream.f = f;
@ -930,7 +885,6 @@ String ResourceLoader::_path_remap(const String &p_path, bool *r_translation_rem
int lines = 0; int lines = 0;
String error_text; String error_text;
while (true) { while (true) {
assign = Variant(); assign = Variant();
next_tag.fields.clear(); next_tag.fields.clear();
next_tag.name = String(); next_tag.name = String();
@ -959,9 +913,7 @@ String ResourceLoader::_path_remap(const String &p_path, bool *r_translation_rem
} }
String ResourceLoader::import_remap(const String &p_path) { String ResourceLoader::import_remap(const String &p_path) {
if (ResourceFormatImporter::get_singleton()->recognize_path(p_path)) { if (ResourceFormatImporter::get_singleton()->recognize_path(p_path)) {
return ResourceFormatImporter::get_singleton()->get_internal_resource_path(p_path); return ResourceFormatImporter::get_singleton()->get_internal_resource_path(p_path);
} }
@ -973,7 +925,6 @@ String ResourceLoader::path_remap(const String &p_path) {
} }
void ResourceLoader::reload_translation_remaps() { void ResourceLoader::reload_translation_remaps() {
if (ResourceCache::lock) { if (ResourceCache::lock) {
ResourceCache::lock->read_lock(); ResourceCache::lock->read_lock();
} }
@ -998,7 +949,6 @@ void ResourceLoader::reload_translation_remaps() {
} }
void ResourceLoader::load_translation_remaps() { void ResourceLoader::load_translation_remaps() {
if (!ProjectSettings::get_singleton()->has_setting("locale/translation_remaps")) if (!ProjectSettings::get_singleton()->has_setting("locale/translation_remaps"))
return; return;
@ -1006,7 +956,6 @@ void ResourceLoader::load_translation_remaps() {
List<Variant> keys; List<Variant> keys;
remaps.get_key_list(&keys); remaps.get_key_list(&keys);
for (List<Variant>::Element *E = keys.front(); E; E = E->next()) { for (List<Variant>::Element *E = keys.front(); E; E = E->next()) {
Array langs = remaps[E->get()]; Array langs = remaps[E->get()];
Vector<String> lang_remaps; Vector<String> lang_remaps;
lang_remaps.resize(langs.size()); lang_remaps.resize(langs.size());
@ -1023,7 +972,6 @@ void ResourceLoader::clear_translation_remaps() {
} }
void ResourceLoader::load_path_remaps() { void ResourceLoader::load_path_remaps() {
if (!ProjectSettings::get_singleton()->has_setting("path_remap/remapped_paths")) if (!ProjectSettings::get_singleton()->has_setting("path_remap/remapped_paths"))
return; return;
@ -1033,13 +981,11 @@ void ResourceLoader::load_path_remaps() {
const String *r = remaps.ptr(); const String *r = remaps.ptr();
for (int i = 0; i < rc; i += 2) { for (int i = 0; i < rc; i += 2) {
path_remaps[r[i]] = r[i + 1]; path_remaps[r[i]] = r[i + 1];
} }
} }
void ResourceLoader::clear_path_remaps() { void ResourceLoader::clear_path_remaps() {
path_remaps.clear(); path_remaps.clear();
} }
@ -1059,7 +1005,6 @@ Ref<ResourceFormatLoader> ResourceLoader::_find_custom_resource_format_loader(St
} }
bool ResourceLoader::add_custom_resource_format_loader(String script_path) { bool ResourceLoader::add_custom_resource_format_loader(String script_path) {
if (_find_custom_resource_format_loader(script_path).is_valid()) if (_find_custom_resource_format_loader(script_path).is_valid())
return false; return false;
@ -1084,7 +1029,6 @@ bool ResourceLoader::add_custom_resource_format_loader(String script_path) {
} }
void ResourceLoader::remove_custom_resource_format_loader(String script_path) { void ResourceLoader::remove_custom_resource_format_loader(String script_path) {
Ref<ResourceFormatLoader> custom_loader = _find_custom_resource_format_loader(script_path); Ref<ResourceFormatLoader> custom_loader = _find_custom_resource_format_loader(script_path);
if (custom_loader.is_valid()) if (custom_loader.is_valid())
remove_resource_format_loader(custom_loader); remove_resource_format_loader(custom_loader);
@ -1099,7 +1043,6 @@ void ResourceLoader::add_custom_loaders() {
ScriptServer::get_global_class_list(&global_classes); ScriptServer::get_global_class_list(&global_classes);
for (List<StringName>::Element *E = global_classes.front(); E; E = E->next()) { for (List<StringName>::Element *E = global_classes.front(); E; E = E->next()) {
StringName class_name = E->get(); StringName class_name = E->get();
StringName base_class = ScriptServer::get_global_class_native_base(class_name); StringName base_class = ScriptServer::get_global_class_native_base(class_name);
@ -1111,7 +1054,6 @@ void ResourceLoader::add_custom_loaders() {
} }
void ResourceLoader::remove_custom_loaders() { void ResourceLoader::remove_custom_loaders() {
Vector<Ref<ResourceFormatLoader>> custom_loaders; Vector<Ref<ResourceFormatLoader>> custom_loaders;
for (int i = 0; i < loader_count; ++i) { for (int i = 0; i < loader_count; ++i) {
if (loader[i]->get_script_instance()) { if (loader[i]->get_script_instance()) {
@ -1134,7 +1076,6 @@ void ResourceLoader::initialize() {
} }
void ResourceLoader::finalize() { void ResourceLoader::finalize() {
memdelete(thread_load_mutex); memdelete(thread_load_mutex);
memdelete(thread_load_semaphore); memdelete(thread_load_semaphore);
} }

2
core/io/resource_loader.h
View file

@ -36,7 +36,6 @@
#include "core/resource.h" #include "core/resource.h"
class ResourceFormatLoader : public Reference { class ResourceFormatLoader : public Reference {
GDCLASS(ResourceFormatLoader, Reference); GDCLASS(ResourceFormatLoader, Reference);
protected: protected:
@ -67,7 +66,6 @@ typedef Error (*ResourceLoaderImport)(const String &p_path);
typedef void (*ResourceLoadedCallback)(RES p_resource, const String &p_path); typedef void (*ResourceLoadedCallback)(RES p_resource, const String &p_path);
class ResourceLoader { class ResourceLoader {
enum { enum {
MAX_LOADERS = 64 MAX_LOADERS = 64
}; };

17
core/io/resource_saver.cpp
View file

@ -41,7 +41,6 @@ bool ResourceSaver::timestamp_on_save = false;
ResourceSavedCallback ResourceSaver::save_callback = nullptr; ResourceSavedCallback ResourceSaver::save_callback = nullptr;
Error ResourceFormatSaver::save(const String &p_path, const RES &p_resource, uint32_t p_flags) { Error ResourceFormatSaver::save(const String &p_path, const RES &p_resource, uint32_t p_flags) {
if (get_script_instance() && get_script_instance()->has_method("save")) { if (get_script_instance() && get_script_instance()->has_method("save")) {
return (Error)get_script_instance()->call("save", p_path, p_resource, p_flags).operator int64_t(); return (Error)get_script_instance()->call("save", p_path, p_resource, p_flags).operator int64_t();
} }
@ -50,7 +49,6 @@ Error ResourceFormatSaver::save(const String &p_path, const RES &p_resource, uin
} }
bool ResourceFormatSaver::recognize(const RES &p_resource) const { bool ResourceFormatSaver::recognize(const RES &p_resource) const {
if (get_script_instance() && get_script_instance()->has_method("recognize")) { if (get_script_instance() && get_script_instance()->has_method("recognize")) {
return get_script_instance()->call("recognize", p_resource); return get_script_instance()->call("recognize", p_resource);
} }
@ -59,7 +57,6 @@ bool ResourceFormatSaver::recognize(const RES &p_resource) const {
} }
void ResourceFormatSaver::get_recognized_extensions(const RES &p_resource, List<String> *p_extensions) const { void ResourceFormatSaver::get_recognized_extensions(const RES &p_resource, List<String> *p_extensions) const {
if (get_script_instance() && get_script_instance()->has_method("get_recognized_extensions")) { if (get_script_instance() && get_script_instance()->has_method("get_recognized_extensions")) {
PackedStringArray exts = get_script_instance()->call("get_recognized_extensions", p_resource); PackedStringArray exts = get_script_instance()->call("get_recognized_extensions", p_resource);
@ -73,7 +70,6 @@ void ResourceFormatSaver::get_recognized_extensions(const RES &p_resource, List<
} }
void ResourceFormatSaver::_bind_methods() { void ResourceFormatSaver::_bind_methods() {
{ {
PropertyInfo arg0 = PropertyInfo(Variant::STRING, "path"); PropertyInfo arg0 = PropertyInfo(Variant::STRING, "path");
PropertyInfo arg1 = PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "Resource"); PropertyInfo arg1 = PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "Resource");
@ -86,12 +82,10 @@ void ResourceFormatSaver::_bind_methods() {
} }
Error ResourceSaver::save(const String &p_path, const RES &p_resource, uint32_t p_flags) { Error ResourceSaver::save(const String &p_path, const RES &p_resource, uint32_t p_flags) {
String extension = p_path.get_extension(); String extension = p_path.get_extension();
Error err = ERR_FILE_UNRECOGNIZED; Error err = ERR_FILE_UNRECOGNIZED;
for (int i = 0; i < saver_count; i++) { for (int i = 0; i < saver_count; i++) {
if (!saver[i]->recognize(p_resource)) if (!saver[i]->recognize(p_resource))
continue; continue;
@ -100,7 +94,6 @@ Error ResourceSaver::save(const String &p_path, const RES &p_resource, uint32_t
saver[i]->get_recognized_extensions(p_resource, &extensions); saver[i]->get_recognized_extensions(p_resource, &extensions);
for (List<String>::Element *E = extensions.front(); E; E = E->next()) { for (List<String>::Element *E = extensions.front(); E; E = E->next()) {
if (E->get().nocasecmp_to(extension) == 0) if (E->get().nocasecmp_to(extension) == 0)
recognized = true; recognized = true;
} }
@ -119,7 +112,6 @@ Error ResourceSaver::save(const String &p_path, const RES &p_resource, uint32_t
err = saver[i]->save(p_path, p_resource, p_flags); err = saver[i]->save(p_path, p_resource, p_flags);
if (err == OK) { if (err == OK) {
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
((Resource *)p_resource.ptr())->set_edited(false); ((Resource *)p_resource.ptr())->set_edited(false);
@ -144,20 +136,16 @@ Error ResourceSaver::save(const String &p_path, const RES &p_resource, uint32_t
} }
void ResourceSaver::set_save_callback(ResourceSavedCallback p_callback) { void ResourceSaver::set_save_callback(ResourceSavedCallback p_callback) {
save_callback = p_callback; save_callback = p_callback;
} }
void ResourceSaver::get_recognized_extensions(const RES &p_resource, List<String> *p_extensions) { void ResourceSaver::get_recognized_extensions(const RES &p_resource, List<String> *p_extensions) {
for (int i = 0; i < saver_count; i++) { for (int i = 0; i < saver_count; i++) {
saver[i]->get_recognized_extensions(p_resource, p_extensions); saver[i]->get_recognized_extensions(p_resource, p_extensions);
} }
} }
void ResourceSaver::add_resource_format_saver(Ref<ResourceFormatSaver> p_format_saver, bool p_at_front) { void ResourceSaver::add_resource_format_saver(Ref<ResourceFormatSaver> p_format_saver, bool p_at_front) {
ERR_FAIL_COND_MSG(p_format_saver.is_null(), "It's not a reference to a valid ResourceFormatSaver object."); ERR_FAIL_COND_MSG(p_format_saver.is_null(), "It's not a reference to a valid ResourceFormatSaver object.");
ERR_FAIL_COND(saver_count >= MAX_SAVERS); ERR_FAIL_COND(saver_count >= MAX_SAVERS);
@ -173,7 +161,6 @@ void ResourceSaver::add_resource_format_saver(Ref<ResourceFormatSaver> p_format_
} }
void ResourceSaver::remove_resource_format_saver(Ref<ResourceFormatSaver> p_format_saver) { void ResourceSaver::remove_resource_format_saver(Ref<ResourceFormatSaver> p_format_saver) {
ERR_FAIL_COND_MSG(p_format_saver.is_null(), "It's not a reference to a valid ResourceFormatSaver object."); ERR_FAIL_COND_MSG(p_format_saver.is_null(), "It's not a reference to a valid ResourceFormatSaver object.");
// Find saver // Find saver
@ -203,7 +190,6 @@ Ref<ResourceFormatSaver> ResourceSaver::_find_custom_resource_format_saver(Strin
} }
bool ResourceSaver::add_custom_resource_format_saver(String script_path) { bool ResourceSaver::add_custom_resource_format_saver(String script_path) {
if (_find_custom_resource_format_saver(script_path).is_valid()) if (_find_custom_resource_format_saver(script_path).is_valid())
return false; return false;
@ -228,7 +214,6 @@ bool ResourceSaver::add_custom_resource_format_saver(String script_path) {
} }
void ResourceSaver::remove_custom_resource_format_saver(String script_path) { void ResourceSaver::remove_custom_resource_format_saver(String script_path) {
Ref<ResourceFormatSaver> custom_saver = _find_custom_resource_format_saver(script_path); Ref<ResourceFormatSaver> custom_saver = _find_custom_resource_format_saver(script_path);
if (custom_saver.is_valid()) if (custom_saver.is_valid())
remove_resource_format_saver(custom_saver); remove_resource_format_saver(custom_saver);
@ -243,7 +228,6 @@ void ResourceSaver::add_custom_savers() {
ScriptServer::get_global_class_list(&global_classes); ScriptServer::get_global_class_list(&global_classes);
for (List<StringName>::Element *E = global_classes.front(); E; E = E->next()) { for (List<StringName>::Element *E = global_classes.front(); E; E = E->next()) {
StringName class_name = E->get(); StringName class_name = E->get();
StringName base_class = ScriptServer::get_global_class_native_base(class_name); StringName base_class = ScriptServer::get_global_class_native_base(class_name);
@ -255,7 +239,6 @@ void ResourceSaver::add_custom_savers() {
} }
void ResourceSaver::remove_custom_savers() { void ResourceSaver::remove_custom_savers() {
Vector<Ref<ResourceFormatSaver>> custom_savers; Vector<Ref<ResourceFormatSaver>> custom_savers;
for (int i = 0; i < saver_count; ++i) { for (int i = 0; i < saver_count; ++i) {
if (saver[i]->get_script_instance()) { if (saver[i]->get_script_instance()) {

1
core/io/resource_saver.h
View file

@ -50,7 +50,6 @@ public:
typedef void (*ResourceSavedCallback)(Ref<Resource> p_resource, const String &p_path); typedef void (*ResourceSavedCallback)(Ref<Resource> p_resource, const String &p_path);
class ResourceSaver { class ResourceSaver {
enum { enum {
MAX_SAVERS = 64 MAX_SAVERS = 64
}; };

Some files were not shown because too many files have changed in this diff Show more