godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Add support for Vector2i, Rect2i and Vector3i to Variant

Browse Source 
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.
This commit is contained in:
Juan Linietsky
2020-02-22 00:26:41 -03:00
committed by Juan Linietsky
parent a7891b9d12
commit 6da0eef9e6
11 changed files with 1026 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gdscript/gdscript_functions.cpp
View File

@@ -365,7 +365,7 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
r_ret = ((Vector2)*p_args[0]).linear_interpolate((Vector2)*p_args[1], t);
} break;
case Variant::VECTOR3: {
r_ret = ((Vector3)*p_args[0]).linear_interpolate((Vector3)*p_args[1], t);
r_ret = (p_args[0]->operator Vector3()).linear_interpolate(p_args[1]->operator Vector3(), t);
} break;
case Variant::COLOR: {
r_ret = ((Color)*p_args[0]).linear_interpolate((Color)*p_args[1], t);