소스 검색

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

Nathan Warden 10 년 전
부모
커밋
bfad392387
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      doc/base/classes.xml
  2. 1 1
      modules/gdscript/gd_functions.cpp

+ 1 - 1
doc/base/classes.xml

@@ -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.

+ 1 - 1
modules/gdscript/gd_functions.cpp

@@ -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;