godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-16 14:00:40 +00:00
Code Releases Wiki Activity

Updated the variable in the lerp function to be weight instead of percent.

Browse Source
This commit is contained in:
Nathan Warden
2015-02-20 16:28:48 -05:00
parent 071b2ea4f2
commit bfad392387
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/base/classes.xml
View File

@@ -261,7 +261,7 @@
</argument> </argument>
<argument index="1" name="to" type="float"> <argument index="1" name="to" type="float">
</argument> </argument>
<argument index="2" name="percent" type="float"> <argument index="2" name="weight" type="float">
</argument> </argument>
<description> <description>
Linear interpolates between two values by a normalized value. Linear interpolates between two values by a normalized value.

2
modules/gdscript/gd_functions.cpp
View File

@@ -1101,7 +1101,7 @@ MethodInfo GDFunctions::get_info(Function p_func) {
return mi; return mi;
} break; } break;
case MATH_LERP: { case MATH_LERP: {
MethodInfo mi("lerp",PropertyInfo(Variant::REAL,"a"),PropertyInfo(Variant::REAL,"b"), PropertyInfo(Variant::REAL,"c")); MethodInfo mi("lerp",PropertyInfo(Variant::REAL,"from"),PropertyInfo(Variant::REAL,"to"), PropertyInfo(Variant::REAL,"weight"));
mi.return_val.type=Variant::REAL; mi.return_val.type=Variant::REAL;
return mi; return mi;
} break; } break;