diff options
author | Juan Linietsky <juan@godotengine.org> | 2020-02-22 00:26:41 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2020-02-22 23:16:44 +0100 |
commit | 6da0eef9e6695e0da17953d80a1e6b0b673b4678 (patch) | |
tree | 1b08291b93a47f81c2a810f58996e1135777672a /modules/gdscript/gdscript_tokenizer.cpp | |
parent | a7891b9d120e1cb49bcdcffc1107f692ed481d86 (diff) | |
download | redot-engine-6da0eef9e6695e0da17953d80a1e6b0b673b4678.tar.gz |
Add support for Vector2i, Rect2i and Vector3i to Variant
WARNING: Requires C++17 'guaranteed copy elision' to fix ambiguous
operator problems in Variant.
This was added for this commit (and future C++17 uses) in #36457.
Diffstat (limited to 'modules/gdscript/gdscript_tokenizer.cpp')
-rw-r--r-- | modules/gdscript/gdscript_tokenizer.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/modules/gdscript/gdscript_tokenizer.cpp b/modules/gdscript/gdscript_tokenizer.cpp index a39a778c82..adcdbdc4a4 100644 --- a/modules/gdscript/gdscript_tokenizer.cpp +++ b/modules/gdscript/gdscript_tokenizer.cpp @@ -149,9 +149,12 @@ static const _bit _type_list[] = { { Variant::REAL, "float" }, { Variant::STRING, "String" }, { Variant::VECTOR2, "Vector2" }, + { Variant::VECTOR2I, "Vector2i" }, { Variant::RECT2, "Rect2" }, + { Variant::RECT2I, "Rect2i" }, { Variant::TRANSFORM2D, "Transform2D" }, { Variant::VECTOR3, "Vector3" }, + { Variant::VECTOR3I, "Vector3i" }, { Variant::AABB, "AABB" }, { Variant::PLANE, "Plane" }, { Variant::QUAT, "Quat" }, |