godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3991 from JoshuaGrams/issue-3711 

Issue 3711
This commit is contained in:
Rémi Verschelde 2016-03-08 23:54:46 +01:00
parent a3d6768199 2fa200ff53
commit 1dad6eca81
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/variant_op.cpp
View File

@ -3461,12 +3461,18 @@ void Variant::blend(const Variant& a, const Variant& b, float c, Variant &r_dst)
const Rect2 *rb = reinterpret_cast<const Rect2*>(b._data._mem); const Rect2 *rb = reinterpret_cast<const Rect2*>(b._data._mem);
r_dst=Rect2(ra->pos + rb->pos * c, ra->size + rb->size * c); r_dst=Rect2(ra->pos + rb->pos * c, ra->size + rb->size * c);
} return; } return;
case VECTOR3:{ r_dst=*reinterpret_cast<const Vector2*>(a._data._mem)+*reinterpret_cast<const Vector2*>(b._data._mem)*c; } return; case VECTOR3:{ r_dst=*reinterpret_cast<const Vector3*>(a._data._mem)+*reinterpret_cast<const Vector3*>(b._data._mem)*c; } return;
case _AABB:{ case _AABB:{
const AABB *ra = reinterpret_cast<const AABB*>(a._data._mem); const AABB *ra = reinterpret_cast<const AABB*>(a._data._mem);
const AABB *rb = reinterpret_cast<const AABB*>(b._data._mem); const AABB *rb = reinterpret_cast<const AABB*>(b._data._mem);
r_dst=AABB(ra->pos + rb->pos * c, ra->size + rb->size * c); r_dst=AABB(ra->pos + rb->pos * c, ra->size + rb->size * c);
} return; } return;
case QUAT:{
Quat empty_rot;
const Quat *qa = reinterpret_cast<const Quat*>(a._data._mem);
const Quat *qb = reinterpret_cast<const Quat*>(b._data._mem);
r_dst=*qa * empty_rot.slerp(*qb,c);
} return;
case COLOR:{ case COLOR:{
const Color *ca = reinterpret_cast<const Color*>(a._data._mem); const Color *ca = reinterpret_cast<const Color*>(a._data._mem);
const Color *cb = reinterpret_cast<const Color*>(b._data._mem); const Color *cb = reinterpret_cast<const Color*>(b._data._mem);

5
scene/animation/animation_tree_player.cpp
View File

@ -861,8 +861,9 @@ void AnimationTreePlayer::_process_animation(float p_delta) {
if (!t.node) if (!t.node)
continue; continue;
//if (E->get()->t.type!=Animation::TYPE_TRANSFORM)
// continue; if(t.property) // value track; was applied in step 2
continue;
Transform xform; Transform xform;
xform.basis=t.rot; xform.basis=t.rot;