diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-25 18:14:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-25 18:14:49 +0100 |
| commit | f708ab55530e47b2f9ad761b922f86363b27e9f7 (patch) | |
| tree | 1f0d43004fe59f9ad28d8b10ce9317bc360583b0 /core/variant.h | |
| parent | dace1ec9126c752792a0566cfd9485a8ad40c0d1 (diff) | |
| parent | 6c8f2ae53a1921aa8589cf4da735f5cd443ff706 (diff) | |
Merge pull request #36510 from akien-mga/int-vectors-doc-bindings
Update docs and bindings for new integer vector types
Diffstat (limited to 'core/variant.h')
| -rw-r--r-- | core/variant.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/core/variant.h b/core/variant.h index 9ab25b9406..614d39e84a 100644 --- a/core/variant.h +++ b/core/variant.h @@ -78,7 +78,6 @@ class Variant { public: // If this changes the table in variant_op must be updated enum Type { - NIL, // atomic types @@ -88,8 +87,7 @@ public: STRING, // math types - - VECTOR2, // 5 + VECTOR2, VECTOR2I, RECT2, RECT2I, @@ -97,7 +95,7 @@ public: VECTOR3I, TRANSFORM2D, PLANE, - QUAT, // 10 + QUAT, AABB, BASIS, TRANSFORM, @@ -105,26 +103,26 @@ public: // misc types COLOR, STRING_NAME, - NODE_PATH, // 15 + NODE_PATH, _RID, OBJECT, CALLABLE, SIGNAL, DICTIONARY, ARRAY, - // arrays - PACKED_BYTE_ARRAY, // 20 + + // typed arrays + PACKED_BYTE_ARRAY, PACKED_INT32_ARRAY, PACKED_INT64_ARRAY, PACKED_FLOAT32_ARRAY, PACKED_FLOAT64_ARRAY, PACKED_STRING_ARRAY, PACKED_VECTOR2_ARRAY, - PACKED_VECTOR3_ARRAY, // 25 + PACKED_VECTOR3_ARRAY, PACKED_COLOR_ARRAY, VARIANT_MAX - }; private: |