Andrew/redot-engine
1
0
Fork 0
mirror of https://github.com/Redot-Engine/redot-engine.git synced 2025-12-06 15:21:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #105231 from Ivorforce/ptr-to-arg-nomacro

Browse Source 
Convert `PtrToArg` macros to regular C++ structs.
This commit is contained in:
Thaddeus Crews
2025-06-09 12:31:25 -05:00
parent 8f87e60307 78ae5919af
commit 01ef1c0eae
1 changed files with 209 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

439
core/variant/method_ptrcall.h
View File

@@ -35,113 +35,215 @@
#include "core/typedefs.h" #include "core/typedefs.h"
#include "core/variant/variant.h" #include "core/variant/variant.h"
namespace Internal {
template <typename T>
struct PtrToArgDirect {
_FORCE_INLINE_ static const T &convert(const void *p_ptr) {
return *reinterpret_cast<const T *>(p_ptr);
}
typedef T EncodeT;
_FORCE_INLINE_ static void encode(T p_val, void *p_ptr) {
*((T *)p_ptr) = p_val;
}
};
template <typename T, typename S>
struct PtrToArgConvert {
_FORCE_INLINE_ static T convert(const void *p_ptr) {
return static_cast<T>(*reinterpret_cast<const S *>(p_ptr));
}
typedef S EncodeT;
_FORCE_INLINE_ static void encode(T p_val, void *p_ptr) {
*((S *)p_ptr) = static_cast<S>(p_val);
}
};
template <typename T>
struct PtrToArgByReference {
_FORCE_INLINE_ static const T &convert(const void *p_ptr) {
return *reinterpret_cast<const T *>(p_ptr);
}
typedef T EncodeT;
_FORCE_INLINE_ static void encode(const T &p_val, void *p_ptr) {
*((T *)p_ptr) = p_val;
}
};
template <typename T, typename TAlt>
struct PtrToArgVectorConvert {
_FORCE_INLINE_ static Vector<TAlt> convert(const void *p_ptr) {
const Vector<T> *dvs = reinterpret_cast<const Vector<T> *>(p_ptr);
Vector<TAlt> ret;
int len = dvs->size();
ret.resize(len);
{
const T *r = dvs->ptr();
for (int i = 0; i < len; i++) {
ret.write[i] = r[i];
}
}
return ret;
}
// No EncodeT because direct pointer conversion not possible.
_FORCE_INLINE_ static void encode(const Vector<TAlt> &p_vec, void *p_ptr) {
Vector<T> *dv = reinterpret_cast<Vector<T> *>(p_ptr);
int len = p_vec.size();
dv->resize(len);
{
T *w = dv->ptrw();
for (int i = 0; i < len; i++) {
w[i] = p_vec[i];
}
}
}
};
template <typename T>
struct PtrToArgVectorFromArray {
_FORCE_INLINE_ static Vector<T> convert(const void *p_ptr) {
const Array *arr = reinterpret_cast<const Array *>(p_ptr);
Vector<T> ret;
int len = arr->size();
ret.resize(len);
for (int i = 0; i < len; i++) {
ret.write[i] = (*arr)[i];
}
return ret;
}
// No EncodeT because direct pointer conversion not possible.
_FORCE_INLINE_ static void encode(const Vector<T> &p_vec, void *p_ptr) {
Array *arr = reinterpret_cast<Array *>(p_ptr);
int len = p_vec.size();
arr->resize(len);
for (int i = 0; i < len; i++) {
(*arr)[i] = p_vec[i];
}
}
};
template <typename T>
struct PtrToArgStringConvertByReference {
_FORCE_INLINE_ static T convert(const void *p_ptr) {
T s = *reinterpret_cast<const String *>(p_ptr);
return s;
}
// No EncodeT because direct pointer conversion not possible.
_FORCE_INLINE_ static void encode(const T &p_vec, void *p_ptr) {
String *arr = reinterpret_cast<String *>(p_ptr);
*arr = p_vec;
}
};
} //namespace Internal
template <typename T, typename = void> template <typename T, typename = void>
struct PtrToArg; struct PtrToArg;
template <typename T> template <typename T>
struct PtrToArg<T, std::enable_if_t<!std::is_same_v<T, GetSimpleTypeT<T>>>> : PtrToArg<GetSimpleTypeT<T>> {}; struct PtrToArg<T, std::enable_if_t<!std::is_same_v<T, GetSimpleTypeT<T>>>> : PtrToArg<GetSimpleTypeT<T>> {};
#define MAKE_PTRARG(m_type) \ template <>
template <> \ struct PtrToArg<bool> : Internal::PtrToArgConvert<bool, uint8_t> {};
struct PtrToArg<m_type> { \
_FORCE_INLINE_ static const m_type &convert(const void *p_ptr) { \
return *reinterpret_cast<const m_type *>(p_ptr); \
} \
typedef m_type EncodeT; \
_FORCE_INLINE_ static void encode(m_type p_val, void *p_ptr) { \
*((m_type *)p_ptr) = p_val; \
} \
};
#define MAKE_PTRARGCONV(m_type, m_conv) \
template <> \
struct PtrToArg<m_type> { \
_FORCE_INLINE_ static m_type convert(const void *p_ptr) { \
return static_cast<m_type>(*reinterpret_cast<const m_conv *>(p_ptr)); \
} \
typedef m_conv EncodeT; \
_FORCE_INLINE_ static void encode(m_type p_val, void *p_ptr) { \
*((m_conv *)p_ptr) = static_cast<m_conv>(p_val); \
} \
};
#define MAKE_PTRARG_BY_REFERENCE(m_type) \
template <> \
struct PtrToArg<m_type> { \
_FORCE_INLINE_ static const m_type &convert(const void *p_ptr) { \
return *reinterpret_cast<const m_type *>(p_ptr); \
} \
typedef m_type EncodeT; \
_FORCE_INLINE_ static void encode(const m_type &p_val, void *p_ptr) { \
*((m_type *)p_ptr) = p_val; \
} \
};
#define MAKE_PTRARGCONV_CONDITIONAL(m_type, m_conv, m_conditional) \
template <typename T> \
struct PtrToArg<m_type, std::enable_if_t<m_conditional>> { \
_FORCE_INLINE_ static m_type convert(const void *p_ptr) { \
return static_cast<m_type>(*reinterpret_cast<const m_conv *>(p_ptr)); \
} \
typedef m_conv EncodeT; \
_FORCE_INLINE_ static void encode(m_type p_val, void *p_ptr) { \
*((m_conv *)p_ptr) = static_cast<m_conv>(p_val); \
} \
};
MAKE_PTRARGCONV(bool, uint8_t);
// Integer types. // Integer types.
MAKE_PTRARGCONV(uint8_t, int64_t); template <>
MAKE_PTRARGCONV(int8_t, int64_t); struct PtrToArg<uint8_t> : Internal::PtrToArgConvert<uint8_t, int64_t> {};
MAKE_PTRARGCONV(uint16_t, int64_t); template <>
MAKE_PTRARGCONV(int16_t, int64_t); struct PtrToArg<int8_t> : Internal::PtrToArgConvert<int8_t, int64_t> {};
MAKE_PTRARGCONV(uint32_t, int64_t); template <>
MAKE_PTRARGCONV(int32_t, int64_t); struct PtrToArg<uint16_t> : Internal::PtrToArgConvert<uint16_t, int64_t> {};
MAKE_PTRARG(int64_t); template <>
MAKE_PTRARG(uint64_t); struct PtrToArg<int16_t> : Internal::PtrToArgConvert<int16_t, int64_t> {};
template <>
struct PtrToArg<uint32_t> : Internal::PtrToArgConvert<uint32_t, int64_t> {};
template <>
struct PtrToArg<int32_t> : Internal::PtrToArgConvert<int32_t, int64_t> {};
template <>
struct PtrToArg<int64_t> : Internal::PtrToArgDirect<int64_t> {};
template <>
struct PtrToArg<uint64_t> : Internal::PtrToArgDirect<uint64_t> {};
// Float types // Float types
MAKE_PTRARGCONV(float, double); template <>
MAKE_PTRARG(double); struct PtrToArg<float> : Internal::PtrToArgConvert<float, double> {};
template <>
struct PtrToArg<double> : Internal::PtrToArgDirect<double> {};
MAKE_PTRARG(String); template <>
MAKE_PTRARG(Vector2); struct PtrToArg<String> : Internal::PtrToArgDirect<String> {};
MAKE_PTRARG(Vector2i); template <>
MAKE_PTRARG(Rect2); struct PtrToArg<Vector2> : Internal::PtrToArgDirect<Vector2> {};
MAKE_PTRARG(Rect2i); template <>
MAKE_PTRARG_BY_REFERENCE(Vector3); struct PtrToArg<Vector2i> : Internal::PtrToArgDirect<Vector2i> {};
MAKE_PTRARG_BY_REFERENCE(Vector3i); template <>
MAKE_PTRARG_BY_REFERENCE(Vector4); struct PtrToArg<Rect2> : Internal::PtrToArgDirect<Rect2> {};
MAKE_PTRARG_BY_REFERENCE(Vector4i); template <>
MAKE_PTRARG(Transform2D); struct PtrToArg<Rect2i> : Internal::PtrToArgDirect<Rect2i> {};
MAKE_PTRARG(Projection); template <>
MAKE_PTRARG_BY_REFERENCE(Plane); struct PtrToArg<Vector3> : Internal::PtrToArgByReference<Vector3> {};
MAKE_PTRARG(Quaternion); template <>
MAKE_PTRARG_BY_REFERENCE(AABB); struct PtrToArg<Vector3i> : Internal::PtrToArgByReference<Vector3i> {};
MAKE_PTRARG_BY_REFERENCE(Basis); template <>
MAKE_PTRARG_BY_REFERENCE(Transform3D); struct PtrToArg<Vector4> : Internal::PtrToArgByReference<Vector4> {};
MAKE_PTRARG_BY_REFERENCE(Color); template <>
MAKE_PTRARG(StringName); struct PtrToArg<Vector4i> : Internal::PtrToArgByReference<Vector4i> {};
MAKE_PTRARG(NodePath); template <>
MAKE_PTRARG(RID); struct PtrToArg<Transform2D> : Internal::PtrToArgDirect<Transform2D> {};
template <>
struct PtrToArg<Projection> : Internal::PtrToArgDirect<Projection> {};
template <>
struct PtrToArg<Plane> : Internal::PtrToArgByReference<Plane> {};
template <>
struct PtrToArg<Quaternion> : Internal::PtrToArgDirect<Quaternion> {};
template <>
struct PtrToArg<AABB> : Internal::PtrToArgByReference<AABB> {};
template <>
struct PtrToArg<Basis> : Internal::PtrToArgByReference<Basis> {};
template <>
struct PtrToArg<Transform3D> : Internal::PtrToArgByReference<Transform3D> {};
template <>
struct PtrToArg<Color> : Internal::PtrToArgByReference<Color> {};
template <>
struct PtrToArg<StringName> : Internal::PtrToArgDirect<StringName> {};
template <>
struct PtrToArg<NodePath> : Internal::PtrToArgDirect<NodePath> {};
template <>
struct PtrToArg<RID> : Internal::PtrToArgDirect<RID> {};
// Object doesn't need this. // Object doesn't need this.
MAKE_PTRARG(Callable); template <>
MAKE_PTRARG(Signal); struct PtrToArg<Callable> : Internal::PtrToArgDirect<Callable> {};
MAKE_PTRARG(Dictionary); template <>
MAKE_PTRARG(Array); struct PtrToArg<Signal> : Internal::PtrToArgDirect<Signal> {};
MAKE_PTRARG(PackedByteArray); template <>
MAKE_PTRARG(PackedInt32Array); struct PtrToArg<Dictionary> : Internal::PtrToArgDirect<Dictionary> {};
MAKE_PTRARG(PackedInt64Array); template <>
MAKE_PTRARG(PackedFloat32Array); struct PtrToArg<Array> : Internal::PtrToArgDirect<Array> {};
MAKE_PTRARG(PackedFloat64Array); template <>
MAKE_PTRARG(PackedStringArray); struct PtrToArg<PackedByteArray> : Internal::PtrToArgDirect<PackedByteArray> {};
MAKE_PTRARG(PackedVector2Array); template <>
MAKE_PTRARG(PackedVector3Array); struct PtrToArg<PackedInt32Array> : Internal::PtrToArgDirect<PackedInt32Array> {};
MAKE_PTRARG(PackedColorArray); template <>
MAKE_PTRARG(PackedVector4Array); struct PtrToArg<PackedInt64Array> : Internal::PtrToArgDirect<PackedInt64Array> {};
MAKE_PTRARG_BY_REFERENCE(Variant); template <>
struct PtrToArg<PackedFloat32Array> : Internal::PtrToArgDirect<PackedFloat32Array> {};
template <>
struct PtrToArg<PackedFloat64Array> : Internal::PtrToArgDirect<PackedFloat64Array> {};
template <>
struct PtrToArg<PackedStringArray> : Internal::PtrToArgDirect<PackedStringArray> {};
template <>
struct PtrToArg<PackedVector2Array> : Internal::PtrToArgDirect<PackedVector2Array> {};
template <>
struct PtrToArg<PackedVector3Array> : Internal::PtrToArgDirect<PackedVector3Array> {};
template <>
struct PtrToArg<PackedColorArray> : Internal::PtrToArgDirect<PackedColorArray> {};
template <>
struct PtrToArg<PackedVector4Array> : Internal::PtrToArgDirect<PackedVector4Array> {};
template <>
struct PtrToArg<Variant> : Internal::PtrToArgByReference<Variant> {};
MAKE_PTRARGCONV_CONDITIONAL(T, int64_t, std::is_enum_v<T>); template <typename T>
MAKE_PTRARGCONV_CONDITIONAL(BitField<T>, int64_t, std::is_enum_v<T>); struct PtrToArg<T, std::enable_if_t<std::is_enum_v<T>>> : Internal::PtrToArgConvert<T, int64_t> {};
template <typename T>
struct PtrToArg<BitField<T>, std::enable_if_t<std::is_enum_v<T>>> : Internal::PtrToArgConvert<BitField<T>, int64_t> {};
// This is for Object. // This is for Object.
@@ -182,147 +284,23 @@ struct PtrToArg<ObjectID> {
// This is for the special cases used by Variant. // This is for the special cases used by Variant.
// No EncodeT because direct pointer conversion not possible. template <>
#define MAKE_VECARG(m_type) \ struct PtrToArg<Vector<StringName>> : Internal::PtrToArgVectorConvert<String, StringName> {};
template <> \
struct PtrToArg<Vector<m_type>> { \
_FORCE_INLINE_ static Vector<m_type> convert(const void *p_ptr) { \
const Vector<m_type> *dvs = reinterpret_cast<const Vector<m_type> *>(p_ptr); \
Vector<m_type> ret; \
int len = dvs->size(); \
ret.resize(len); \
{ \
const m_type *r = dvs->ptr(); \
for (int i = 0; i < len; i++) { \
ret.write[i] = r[i]; \
} \
} \
return ret; \
} \
_FORCE_INLINE_ static void encode(const Vector<m_type> &p_vec, void *p_ptr) { \
Vector<m_type> *dv = reinterpret_cast<Vector<m_type> *>(p_ptr); \
int len = p_vec.size(); \
dv->resize(len); \
{ \
m_type *w = dv->ptrw(); \
for (int i = 0; i < len; i++) { \
w[i] = p_vec[i]; \
} \
} \
} \
};
// No EncodeT because direct pointer conversion not possible.
#define MAKE_VECARG_ALT(m_type, m_type_alt) \
template <> \
struct PtrToArg<Vector<m_type_alt>> { \
_FORCE_INLINE_ static Vector<m_type_alt> convert(const void *p_ptr) { \
const Vector<m_type> *dvs = reinterpret_cast<const Vector<m_type> *>(p_ptr); \
Vector<m_type_alt> ret; \
int len = dvs->size(); \
ret.resize(len); \
{ \
const m_type *r = dvs->ptr(); \
for (int i = 0; i < len; i++) { \
ret.write[i] = r[i]; \
} \
} \
return ret; \
} \
_FORCE_INLINE_ static void encode(const Vector<m_type_alt> &p_vec, void *p_ptr) { \
Vector<m_type> *dv = reinterpret_cast<Vector<m_type> *>(p_ptr); \
int len = p_vec.size(); \
dv->resize(len); \
{ \
m_type *w = dv->ptrw(); \
for (int i = 0; i < len; i++) { \
w[i] = p_vec[i]; \
} \
} \
} \
};
MAKE_VECARG_ALT(String, StringName);
// For stuff that gets converted to Array vectors. // For stuff that gets converted to Array vectors.
// No EncodeT because direct pointer conversion not possible. template <>
#define MAKE_VECARR(m_type) \ struct PtrToArg<Vector<Variant>> : Internal::PtrToArgVectorFromArray<Variant> {};
template <> \ template <>
struct PtrToArg<Vector<m_type>> { \ struct PtrToArg<Vector<RID>> : Internal::PtrToArgVectorFromArray<RID> {};
_FORCE_INLINE_ static Vector<m_type> convert(const void *p_ptr) { \ template <>
const Array *arr = reinterpret_cast<const Array *>(p_ptr); \ struct PtrToArg<Vector<Plane>> : Internal::PtrToArgVectorFromArray<Plane> {};
Vector<m_type> ret; \
int len = arr->size(); \
ret.resize(len); \
for (int i = 0; i < len; i++) { \
ret.write[i] = (*arr)[i]; \
} \
return ret; \
} \
_FORCE_INLINE_ static void encode(const Vector<m_type> &p_vec, void *p_ptr) { \
Array *arr = reinterpret_cast<Array *>(p_ptr); \
int len = p_vec.size(); \
arr->resize(len); \
for (int i = 0; i < len; i++) { \
(*arr)[i] = p_vec[i]; \
} \
} \
};
MAKE_VECARR(Variant);
MAKE_VECARR(RID);
MAKE_VECARR(Plane);
// No EncodeT because direct pointer conversion not possible.
#define MAKE_DVECARR(m_type) \
template <> \
struct PtrToArg<Vector<m_type>> { \
_FORCE_INLINE_ static Vector<m_type> convert(const void *p_ptr) { \
const Array *arr = reinterpret_cast<const Array *>(p_ptr); \
Vector<m_type> ret; \
int len = arr->size(); \
ret.resize(len); \
{ \
m_type *w = ret.ptrw(); \
for (int i = 0; i < len; i++) { \
w[i] = (*arr)[i]; \
} \
} \
return ret; \
} \
_FORCE_INLINE_ static void encode(const Vector<m_type> &p_vec, void *p_ptr) { \
Array *arr = reinterpret_cast<Array *>(p_ptr); \
int len = p_vec.size(); \
arr->resize(len); \
{ \
const m_type *r = p_vec.ptr(); \
for (int i = 0; i < len; i++) { \
(*arr)[i] = r[i]; \
} \
} \
} \
};
// Special case for IPAddress. // Special case for IPAddress.
// No EncodeT because direct pointer conversion not possible. template <>
#define MAKE_STRINGCONV_BY_REFERENCE(m_type) \ struct PtrToArg<IPAddress> : Internal::PtrToArgStringConvertByReference<IPAddress> {};
template <> \
struct PtrToArg<m_type> { \
_FORCE_INLINE_ static m_type convert(const void *p_ptr) { \
m_type s = *reinterpret_cast<const String *>(p_ptr); \
return s; \
} \
_FORCE_INLINE_ static void encode(const m_type &p_vec, void *p_ptr) { \
String *arr = reinterpret_cast<String *>(p_ptr); \
*arr = p_vec; \
} \
};
MAKE_STRINGCONV_BY_REFERENCE(IPAddress);
// No EncodeT because direct pointer conversion not possible.
template <> template <>
struct PtrToArg<Vector<Face3>> { struct PtrToArg<Vector<Face3>> {
_FORCE_INLINE_ static Vector<Face3> convert(const void *p_ptr) { _FORCE_INLINE_ static Vector<Face3> convert(const void *p_ptr) {
@@ -341,6 +319,7 @@ struct PtrToArg<Vector<Face3>> {
} }
return ret; return ret;
} }
// No EncodeT because direct pointer conversion not possible.
_FORCE_INLINE_ static void encode(const Vector<Face3> &p_vec, void *p_ptr) { _FORCE_INLINE_ static void encode(const Vector<Face3> &p_vec, void *p_ptr) {
Vector<Vector3> *arr = reinterpret_cast<Vector<Vector3> *>(p_ptr); Vector<Vector3> *arr = reinterpret_cast<Vector<Vector3> *>(p_ptr);
int len = p_vec.size(); int len = p_vec.size();