Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 31 additions & 19 deletions engine/src/components/animator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ void Animator::sampleVector4(float dt, TargetProperties &target) {
Vector4 vec4;

float factor = 0.0f;
bool updated = false;

auto playbackIt = target.playbacks.begin();
while(playbackIt != target.playbacks.end()) {
Expand All @@ -92,6 +93,7 @@ void Animator::sampleVector4(float dt, TargetProperties &target) {
}

vec4 += playback.motion->valueVector4(playback.currentPosition) * playback.weight;
updated = true;
}

if(endOfPlayback) {
Expand All @@ -101,27 +103,30 @@ void Animator::sampleVector4(float dt, TargetProperties &target) {
}
}

switch(target.defaultValue.type()) {
case MetaType::BOOLEAN: target.property.write(target.object, (bool)vec4.x); break;
case MetaType::INTEGER: target.property.write(target.object, (int)vec4.x); break;
case MetaType::FLOAT: target.property.write(target.object, vec4.x); break;
case MetaType::VECTOR2: target.property.write(target.object, Vector2(vec4)); break;
case MetaType::VECTOR3: {
switch(target.flag) {
case TransformFlags::Position: static_cast<Transform *>(target.object)->setPosition(vec4); break;
case TransformFlags::Rotation: static_cast<Transform *>(target.object)->setRotation(vec4); break;
case TransformFlags::Scale: static_cast<Transform *>(target.object)->setScale(vec4); break;
default: target.property.write(target.object, Vector3(vec4)); break;
}
} break;
default: target.property.write(target.object, vec4); break;
if(updated) {
switch(target.defaultValue.type()) {
case MetaType::BOOLEAN: target.property.write(target.object, (bool)vec4.x); break;
case MetaType::INTEGER: target.property.write(target.object, (int)vec4.x); break;
case MetaType::FLOAT: target.property.write(target.object, vec4.x); break;
case MetaType::VECTOR2: target.property.write(target.object, Vector2(vec4)); break;
case MetaType::VECTOR3: {
switch(target.flag) {
case TransformFlags::Position: static_cast<Transform *>(target.object)->setPosition(vec4); break;
case TransformFlags::Rotation: static_cast<Transform *>(target.object)->setRotation(vec4); break;
case TransformFlags::Scale: static_cast<Transform *>(target.object)->setScale(vec4); break;
default: target.property.write(target.object, Vector3(vec4)); break;
}
} break;
default: target.property.write(target.object, vec4); break;
}
}
}

void Animator::sampleQuaternion(float dt, TargetProperties &target) {
Quaternion quat;

float factor = 0.0f;
bool updated = false;

auto playbackIt = target.playbacks.begin();
while(playbackIt != target.playbacks.end()) {
Expand All @@ -139,6 +144,7 @@ void Animator::sampleQuaternion(float dt, TargetProperties &target) {
}

quat.mix(quat, playback.motion->valueQuaternion(playback.currentPosition), playback.weight);
updated = true;
}

if(endOfPlayback) {
Expand All @@ -148,17 +154,20 @@ void Animator::sampleQuaternion(float dt, TargetProperties &target) {
}
}

if(target.flag == TransformFlags::Quat) {
static_cast<Transform *>(target.object)->setQuaternion(quat);
} else {
target.property.write(target.object, quat);
if(updated) {
if(target.flag == TransformFlags::Quat) {
static_cast<Transform *>(target.object)->setQuaternion(quat);
} else {
target.property.write(target.object, quat);
}
}
}

void Animator::sampleString(float dt, TargetProperties &target) {
TString str;

float factor = 0.0f;
bool updated = false;

auto playbackIt = target.playbacks.begin();
while(playbackIt != target.playbacks.end()) {
Expand All @@ -176,6 +185,7 @@ void Animator::sampleString(float dt, TargetProperties &target) {
}

str = playback.motion->valueString(playback.currentPosition);
updated = true;
}

if(endOfPlayback) {
Expand All @@ -185,7 +195,9 @@ void Animator::sampleString(float dt, TargetProperties &target) {
}
}

target.property.write(target.object, str);
if(updated) {
target.property.write(target.object, str);
}
}

/*!
Expand Down
10 changes: 7 additions & 3 deletions thirdparty/next/src/anim/animationcurve.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,16 @@ Quaternion AnimationCurve::valueQuaternion(float pos) const {
Quaternion result;
if(a != -1 && b != -1) {
const KeyFrame &keyA = m_keys[a];
const KeyFrame &keyB = m_keys[b];
Quaternion qA(keyA.m_value[0], keyA.m_value[1], keyA.m_value[2], keyA.m_value[3]);

float factor = (pos - keyA.m_position) / (keyB.m_position - keyA.m_position);
if(a == b) {
return qA;
}

Quaternion qA(keyA.m_value[0], keyA.m_value[1], keyA.m_value[2], keyA.m_value[3]);
const KeyFrame &keyB = m_keys[b];
Quaternion qB(keyB.m_value[0], keyB.m_value[1], keyB.m_value[2], keyB.m_value[3]);

float factor = (pos - keyA.m_position) / (keyB.m_position - keyA.m_position);
result.mix(qA, qB, factor);
}
return result;
Expand Down
Loading