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

-Integers and Float should interpolate on animation, maybe fixes #1891, please test

Browse Source
This commit is contained in:
Juan Linietsky
2015-05-16 18:16:11 -03:00
parent bbe9a37f1d
commit adb709aa91
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/variant_op.cpp
View File

@@ -3388,7 +3388,15 @@ Variant Variant::iter_get(const Variant& r_iter,bool &r_valid) const {
void Variant::interpolate(const Variant& a, const Variant& b, float c,Variant &r_dst) { void Variant::interpolate(const Variant& a, const Variant& b, float c,Variant &r_dst) {
if (a.type!=b.type) { if (a.type!=b.type) {
if (a.is_num() && b.is_num()) {
//not as efficient but..
real_t va=a;
real_t vb=b;
r_dst=(1.0-c) * va + vb * c;
} else {
r_dst=a; r_dst=a;
}
return; return;
} }