diff options
author | George Marques <george@gmarqu.es> | 2020-12-15 17:02:50 -0300 |
---|---|---|
committer | George Marques <george@gmarqu.es> | 2020-12-15 17:02:50 -0300 |
commit | b3f452b1d2e3a02a1e9b3926cb0039ce7257ae8a (patch) | |
tree | cab4154fea1f658aca6ca301dbd25948f38220e6 | |
parent | 35e7490c9583f5fed9c419666be7451d1a4f035c (diff) |
Change template order in method_ptrcall.h
To be consistent with the enum in Variant so missing types can be more
easily spotted.
-rw-r--r-- | core/variant/method_ptrcall.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/core/variant/method_ptrcall.h b/core/variant/method_ptrcall.h index 40fa3543dc..b00455f8ad 100644 --- a/core/variant/method_ptrcall.h +++ b/core/variant/method_ptrcall.h @@ -100,6 +100,7 @@ struct PtrToArg {}; } MAKE_PTRARG(bool); +// Integer types. MAKE_PTRARGCONV(uint8_t, int64_t); MAKE_PTRARGCONV(int8_t, int64_t); MAKE_PTRARGCONV(uint16_t, int64_t); @@ -108,15 +109,16 @@ MAKE_PTRARGCONV(uint32_t, int64_t); MAKE_PTRARGCONV(int32_t, int64_t); MAKE_PTRARG(int64_t); MAKE_PTRARG(uint64_t); +// Float types MAKE_PTRARGCONV(float, double); MAKE_PTRARG(double); MAKE_PTRARG(String); MAKE_PTRARG(Vector2); -MAKE_PTRARG(Rect2); -MAKE_PTRARG_BY_REFERENCE(Vector3); MAKE_PTRARG(Vector2i); +MAKE_PTRARG(Rect2); MAKE_PTRARG(Rect2i); +MAKE_PTRARG_BY_REFERENCE(Vector3); MAKE_PTRARG_BY_REFERENCE(Vector3i); MAKE_PTRARG(Transform2D); MAKE_PTRARG_BY_REFERENCE(Plane); @@ -128,9 +130,10 @@ MAKE_PTRARG_BY_REFERENCE(Color); MAKE_PTRARG(StringName); MAKE_PTRARG(NodePath); MAKE_PTRARG(RID); -MAKE_PTRARG(Dictionary); +// Object doesn't need this. MAKE_PTRARG(Callable); MAKE_PTRARG(Signal); +MAKE_PTRARG(Dictionary); MAKE_PTRARG(Array); MAKE_PTRARG(PackedByteArray); MAKE_PTRARG(PackedInt32Array); |