Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 12:37:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #14351 from luiscuenca/tweakTransitAnimations

Browse source 
Tweak transit animations
This commit is contained in:
John Conklin II 2018-11-12 10:39:56 -08:00 committed by GitHub
commit 33da88f174
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 219 additions and 148 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
interface/resources/avatar/animations/teleport.fbx Normal file
View file

Binary file not shown.

88
interface/resources/avatar/network-animation.json
View file

@ -1,7 +1,43 @@
{ {
"version": "1.1", "version": "1.1",
"root": { "root": {
"id": "userAnimStateMachine", "id": "networkAnimStateMachine",
"type": "stateMachine",
"data": {
"currentState": "transitAnimStateMachine",
"states": [
{
"id": "transitAnimStateMachine",
"interpTarget": 6,
"interpDuration": 6,
"transitions": [
{ "var": "userNetworkAnimA", "state": "userNetworkAnimA" },
{ "var": "userNetworkAnimB", "state": "userNetworkAnimB" }
]
},
{
"id": "userNetworkAnimA",
"interpTarget": 6,
"interpDuration": 6,
"transitions": [
{ "var": "transitAnimStateMachine", "state": "transitAnimStateMachine" },
{ "var": "userNetworkAnimB", "state": "userNetworkAnimB" }
]
},
{
"id": "userNetworkAnimB",
"interpTarget": 6,
"interpDuration": 6,
"transitions": [
{ "var": "transitAnimStateMachine", "state": "transitAnimStateMachine" },
{ "var": "userNetworkAnimA", "state": "userNetworkAnimA" }
]
}
]
},
"children": [
{
"id": "transitAnimStateMachine",
"type": "stateMachine", "type": "stateMachine",
"data": { "data": {
"currentState": "idleAnim", "currentState": "idleAnim",
@ -17,8 +53,8 @@
}, },
{ {
"id": "preTransitAnim", "id": "preTransitAnim",
"interpTarget": 6, "interpTarget": 4,
"interpDuration": 6, "interpDuration": 4,
"transitions": [ "transitions": [
{ "var": "idleAnim", "state": "idleAnim" }, { "var": "idleAnim", "state": "idleAnim" },
{ "var": "transitAnim", "state": "transitAnim" } { "var": "transitAnim", "state": "transitAnim" }
@ -26,8 +62,8 @@
}, },
{ {
"id": "transitAnim", "id": "transitAnim",
"interpTarget": 6, "interpTarget": 2,
"interpDuration": 6, "interpDuration": 2,
"transitions": [ "transitions": [
{ "var": "preTransitAnim", "state": "preTransitAnim" }, { "var": "preTransitAnim", "state": "preTransitAnim" },
{ "var": "postTransitAnim", "state": "postTransitAnim" } { "var": "postTransitAnim", "state": "postTransitAnim" }
@ -35,30 +71,12 @@
}, },
{ {
"id": "postTransitAnim", "id": "postTransitAnim",
"interpTarget": 6, "interpTarget": 4,
"interpDuration": 6, "interpDuration": 4,
"transitions": [ "transitions": [
{ "var": "transitAnim", "state": "transitAnim" }, { "var": "transitAnim", "state": "transitAnim" },
{ "var": "idleAnim", "state": "idleAnim" } { "var": "idleAnim", "state": "idleAnim" }
] ]
},
{
"id": "userAnimA",
"interpTarget": 6,
"interpDuration": 6,
"transitions": [
{ "var": "idleAnim", "state": "idleAnim" },
{ "var": "userAnimB", "state": "userAnimB" }
]
},
{
"id": "userAnimB",
"interpTarget": 6,
"interpDuration": 6,
"transitions": [
{ "var": "idleAnim", "state": "idleAnim" },
{ "var": "userAnimA", "state": "userAnimA" }
]
} }
] ]
}, },
@ -79,7 +97,7 @@
"id": "preTransitAnim", "id": "preTransitAnim",
"type": "clip", "type": "clip",
"data": { "data": {
"url": "https://hifi-content.s3.amazonaws.com/luis/test_scripts/transitApp/animations/teleport01_warp.fbx", "url": "qrc:///avatar/animations/teleport.fbx",
"startFrame": 0.0, "startFrame": 0.0,
"endFrame": 10.0, "endFrame": 10.0,
"timeScale": 1.0, "timeScale": 1.0,
@ -91,11 +109,11 @@
"id": "transitAnim", "id": "transitAnim",
"type": "clip", "type": "clip",
"data": { "data": {
"url": "https://hifi-content.s3.amazonaws.com/luis/test_scripts/transitApp/animations/teleport01_warp.fbx", "url": "qrc:///avatar/animations/teleport.fbx",
"startFrame": 11.0, "startFrame": 11.0,
"endFrame": 11.0, "endFrame": 18.0,
"timeScale": 1.0, "timeScale": 1.0,
"loopFlag": true "loopFlag": false
}, },
"children": [] "children": []
}, },
@ -103,16 +121,18 @@
"id": "postTransitAnim", "id": "postTransitAnim",
"type": "clip", "type": "clip",
"data": { "data": {
"url": "https://hifi-content.s3.amazonaws.com/luis/test_scripts/transitApp/animations/teleport01_warp.fbx", "url": "qrc:///avatar/animations/teleport.fbx",
"startFrame": 22.0, "startFrame": 19.0,
"endFrame": 49.0, "endFrame": 44.0,
"timeScale": 1.0, "timeScale": 1.0,
"loopFlag": false "loopFlag": false
}, },
"children": [] "children": []
}
]
}, },
{ {
"id": "userAnimA", "id": "userNetworkAnimA",
"type": "clip", "type": "clip",
"data": { "data": {
"url": "qrc:///avatar/animations/idle.fbx", "url": "qrc:///avatar/animations/idle.fbx",
@ -124,7 +144,7 @@
"children": [] "children": []
}, },
{ {
"id": "userAnimB", "id": "userNetworkAnimB",
"type": "clip", "type": "clip",
"data": { "data": {
"url": "qrc:///avatar/animations/idle.fbx", "url": "qrc:///avatar/animations/idle.fbx",

8
interface/src/avatar/AvatarManager.cpp
View file

@ -127,16 +127,16 @@ void AvatarManager::setSpace(workload::SpacePointer& space ) {
void AvatarManager::handleTransitAnimations(AvatarTransit::Status status) { void AvatarManager::handleTransitAnimations(AvatarTransit::Status status) {
switch (status) { switch (status) {
case AvatarTransit::Status::STARTED: case AvatarTransit::Status::STARTED:
_myAvatar->getSkeletonModel()->getRig().triggerNetworkAnimation("preTransitAnim"); _myAvatar->getSkeletonModel()->getRig().triggerNetworkRole("preTransitAnim");
break; break;
case AvatarTransit::Status::START_TRANSIT: case AvatarTransit::Status::START_TRANSIT:
_myAvatar->getSkeletonModel()->getRig().triggerNetworkAnimation("transitAnim"); _myAvatar->getSkeletonModel()->getRig().triggerNetworkRole("transitAnim");
break; break;
case AvatarTransit::Status::END_TRANSIT: case AvatarTransit::Status::END_TRANSIT:
_myAvatar->getSkeletonModel()->getRig().triggerNetworkAnimation("postTransitAnim"); _myAvatar->getSkeletonModel()->getRig().triggerNetworkRole("postTransitAnim");
break; break;
case AvatarTransit::Status::ENDED: case AvatarTransit::Status::ENDED:
_myAvatar->getSkeletonModel()->getRig().triggerNetworkAnimation("idleAnim"); _myAvatar->getSkeletonModel()->getRig().triggerNetworkRole("idleAnim");
break; break;
case AvatarTransit::Status::PRE_TRANSIT: case AvatarTransit::Status::PRE_TRANSIT:
break; break;

141
libraries/animation/src/Rig.cpp
View file

@ -135,30 +135,6 @@ void Rig::overrideAnimation(const QString& url, float fps, bool loop, float firs
_animVars.set("userAnimB", clipNodeEnum == UserAnimState::B); _animVars.set("userAnimB", clipNodeEnum == UserAnimState::B);
} }
void Rig::triggerNetworkAnimation(const QString& animName) {
_networkVars.set("idleAnim", false);
_networkVars.set("preTransitAnim", false);
_networkVars.set("transitAnim", false);
_networkVars.set("postTransitAnim", false);
_sendNetworkNode = true;
if (animName == "idleAnim") {
_networkVars.set("idleAnim", true);
_networkAnimState.clipNodeEnum = NetworkAnimState::Idle;
_sendNetworkNode = false;
} else if (animName == "preTransitAnim") {
_networkVars.set("preTransitAnim", true);
_networkAnimState.clipNodeEnum = NetworkAnimState::PreTransit;
} else if (animName == "transitAnim") {
_networkVars.set("transitAnim", true);
_networkAnimState.clipNodeEnum = NetworkAnimState::Transit;
} else if (animName == "postTransitAnim") {
_networkVars.set("postTransitAnim", true);
_networkAnimState.clipNodeEnum = NetworkAnimState::PostTransit;
}
}
void Rig::restoreAnimation() { void Rig::restoreAnimation() {
if (_userAnimState.clipNodeEnum != UserAnimState::None) { if (_userAnimState.clipNodeEnum != UserAnimState::None) {
_userAnimState.clipNodeEnum = UserAnimState::None; _userAnimState.clipNodeEnum = UserAnimState::None;
@ -170,13 +146,87 @@ void Rig::restoreAnimation() {
} }
} }
void Rig::restoreNetworkAnimation() { void Rig::overrideNetworkAnimation(const QString& url, float fps, bool loop, float firstFrame, float lastFrame) {
if (_networkAnimState.clipNodeEnum != NetworkAnimState::Idle) {
_networkAnimState.clipNodeEnum = NetworkAnimState::Idle; NetworkAnimState::ClipNodeEnum clipNodeEnum = NetworkAnimState::None;
_networkVars.set("idleAnim", true); if (_networkAnimState.clipNodeEnum == NetworkAnimState::None || _networkAnimState.clipNodeEnum == NetworkAnimState::B) {
clipNodeEnum = NetworkAnimState::A;
} else if (_networkAnimState.clipNodeEnum == NetworkAnimState::A) {
clipNodeEnum = NetworkAnimState::B;
}
if (_networkNode) {
// find an unused AnimClip clipNode
std::shared_ptr<AnimClip> clip;
if (clipNodeEnum == NetworkAnimState::A) {
clip = std::dynamic_pointer_cast<AnimClip>(_networkNode->findByName("userNetworkAnimA"));
} else {
clip = std::dynamic_pointer_cast<AnimClip>(_networkNode->findByName("userNetworkAnimB"));
}
if (clip) {
// set parameters
clip->setLoopFlag(loop);
clip->setStartFrame(firstFrame);
clip->setEndFrame(lastFrame);
const float REFERENCE_FRAMES_PER_SECOND = 30.0f;
float timeScale = fps / REFERENCE_FRAMES_PER_SECOND;
clip->setTimeScale(timeScale);
clip->loadURL(url);
}
}
// store current user anim state.
_networkAnimState = { clipNodeEnum, url, fps, loop, firstFrame, lastFrame };
// notify the userAnimStateMachine the desired state.
_networkVars.set("transitAnimStateMachine", false);
_networkVars.set("userNetworkAnimA", clipNodeEnum == NetworkAnimState::A);
_networkVars.set("userNetworkAnimB", clipNodeEnum == NetworkAnimState::B);
if (!_computeNetworkAnimation) {
_networkAnimState.blendTime = 0.0f;
_computeNetworkAnimation = true;
}
}
void Rig::triggerNetworkRole(const QString& role) {
_networkVars.set("transitAnimStateMachine", false);
_networkVars.set("idleAnim", false);
_networkVars.set("userNetworkAnimA", false);
_networkVars.set("userNetworkAnimB", false);
_networkVars.set("preTransitAnim", false);
_networkVars.set("preTransitAnim", false); _networkVars.set("preTransitAnim", false);
_networkVars.set("transitAnim", false); _networkVars.set("transitAnim", false);
_networkVars.set("postTransitAnim", false); _networkVars.set("postTransitAnim", false);
_computeNetworkAnimation = true;
if (role == "idleAnim") {
_networkVars.set("idleAnim", true);
_networkAnimState.clipNodeEnum = NetworkAnimState::None;
_computeNetworkAnimation = false;
_networkAnimState.blendTime = 0.0f;
} else if (role == "preTransitAnim") {
_networkVars.set("preTransitAnim", true);
_networkAnimState.clipNodeEnum = NetworkAnimState::PreTransit;
_networkAnimState.blendTime = 0.0f;
} else if (role == "transitAnim") {
_networkVars.set("transitAnim", true);
_networkAnimState.clipNodeEnum = NetworkAnimState::Transit;
} else if (role == "postTransitAnim") {
_networkVars.set("postTransitAnim", true);
_networkAnimState.clipNodeEnum = NetworkAnimState::PostTransit;
}
}
void Rig::restoreNetworkAnimation() {
if (_networkAnimState.clipNodeEnum != NetworkAnimState::None) {
if (_computeNetworkAnimation) {
_networkAnimState.blendTime = 0.0f;
_computeNetworkAnimation = false;
}
_networkAnimState.clipNodeEnum = NetworkAnimState::None;
_networkVars.set("transitAnimStateMachine", true);
_networkVars.set("userNetworkAnimA", false);
_networkVars.set("userNetworkAnimB", false);
} }
} }
@ -1131,24 +1181,19 @@ void Rig::updateAnimations(float deltaTime, const glm::mat4& rootTransform, cons
AnimVariantMap networkTriggersOut; AnimVariantMap networkTriggersOut;
_internalPoseSet._relativePoses = _animNode->evaluate(_animVars, context, deltaTime, triggersOut); _internalPoseSet._relativePoses = _animNode->evaluate(_animVars, context, deltaTime, triggersOut);
if (_networkNode) { if (_networkNode) {
_networkPoseSet._relativePoses = _networkNode->evaluate(_networkVars, context, deltaTime, networkTriggersOut); // Manually blending networkPoseSet with internalPoseSet.
const float NETWORK_ANIMATION_BLEND_FRAMES = 6.0f;
float alpha = 1.0f; float alpha = 1.0f;
std::shared_ptr<AnimClip> clip; const float FRAMES_PER_SECOND = 30.0f;
if (_networkAnimState.clipNodeEnum == NetworkAnimState::PreTransit) { const float TOTAL_BLEND_FRAMES = 6.0f;
clip = std::dynamic_pointer_cast<AnimClip>(_networkNode->findByName("preTransitAnim")); const float TOTAL_BLEND_TIME = TOTAL_BLEND_FRAMES / FRAMES_PER_SECOND;
if (clip) { _sendNetworkNode = _computeNetworkAnimation || _networkAnimState.blendTime < TOTAL_BLEND_TIME;
alpha = (clip->getFrame() - clip->getStartFrame()) / NETWORK_ANIMATION_BLEND_FRAMES;
}
} else if (_networkAnimState.clipNodeEnum == NetworkAnimState::PostTransit) {
clip = std::dynamic_pointer_cast<AnimClip>(_networkNode->findByName("postTransitAnim"));
if (clip) {
alpha = (clip->getEndFrame() - clip->getFrame()) / NETWORK_ANIMATION_BLEND_FRAMES;
}
}
if (_sendNetworkNode) { if (_sendNetworkNode) {
_networkPoseSet._relativePoses = _networkNode->evaluate(_networkVars, context, deltaTime, networkTriggersOut);
_networkAnimState.blendTime += deltaTime;
alpha = _computeNetworkAnimation ? (_networkAnimState.blendTime / TOTAL_BLEND_TIME) : (1.0f - (_networkAnimState.blendTime / TOTAL_BLEND_TIME));
alpha = glm::clamp(alpha, 0.0f, 1.0f);
for (size_t i = 0; i < _networkPoseSet._relativePoses.size(); i++) { for (size_t i = 0; i < _networkPoseSet._relativePoses.size(); i++) {
_networkPoseSet._relativePoses[i].blend(_internalPoseSet._relativePoses[i], (alpha > 1.0f ? 1.0f : alpha)); _networkPoseSet._relativePoses[i].blend(_internalPoseSet._relativePoses[i], alpha);
} }
} }
} }
@ -1840,16 +1885,16 @@ void Rig::initAnimGraph(const QUrl& url) {
return; return;
} }
_networkNode->setSkeleton(sharedSkeletonPtr); _networkNode->setSkeleton(sharedSkeletonPtr);
if (_networkAnimState.clipNodeEnum != NetworkAnimState::Idle) { if (_networkAnimState.clipNodeEnum != NetworkAnimState::None) {
// restore the user animation we had before reset. // restore the user animation we had before reset.
NetworkAnimState origState = _networkAnimState; NetworkAnimState origState = _networkAnimState;
_networkAnimState = { NetworkAnimState::Idle, "", 30.0f, false, 0.0f, 0.0f }; _networkAnimState = { NetworkAnimState::None, "", 30.0f, false, 0.0f, 0.0f };
if (_networkAnimState.clipNodeEnum == NetworkAnimState::PreTransit) { if (_networkAnimState.clipNodeEnum == NetworkAnimState::PreTransit) {
triggerNetworkAnimation("preTransitAnim"); triggerNetworkRole("preTransitAnim");
} else if (_networkAnimState.clipNodeEnum == NetworkAnimState::Transit) { } else if (_networkAnimState.clipNodeEnum == NetworkAnimState::Transit) {
triggerNetworkAnimation("transitAnim"); triggerNetworkRole("transitAnim");
} else if (_networkAnimState.clipNodeEnum == NetworkAnimState::PostTransit) { } else if (_networkAnimState.clipNodeEnum == NetworkAnimState::PostTransit) {
triggerNetworkAnimation("postTransitAnim"); triggerNetworkRole("postTransitAnim");
} }
} }

14
libraries/animation/src/Rig.h
View file

@ -114,8 +114,10 @@ public:
void destroyAnimGraph(); void destroyAnimGraph();
void overrideAnimation(const QString& url, float fps, bool loop, float firstFrame, float lastFrame); void overrideAnimation(const QString& url, float fps, bool loop, float firstFrame, float lastFrame);
void triggerNetworkAnimation(const QString& animName);
void restoreAnimation(); void restoreAnimation();
void overrideNetworkAnimation(const QString& url, float fps, bool loop, float firstFrame, float lastFrame);
void triggerNetworkRole(const QString& role);
void restoreNetworkAnimation(); void restoreNetworkAnimation();
QStringList getAnimationRoles() const; QStringList getAnimationRoles() const;
@ -327,12 +329,14 @@ protected:
struct NetworkAnimState { struct NetworkAnimState {
enum ClipNodeEnum { enum ClipNodeEnum {
Idle = 0, None = 0,
PreTransit, PreTransit,
Transit, Transit,
PostTransit PostTransit,
A,
B
}; };
NetworkAnimState() : clipNodeEnum(NetworkAnimState::Idle) {} NetworkAnimState() : clipNodeEnum(NetworkAnimState::None) {}
NetworkAnimState(ClipNodeEnum clipNodeEnumIn, const QString& urlIn, float fpsIn, bool loopIn, float firstFrameIn, float lastFrameIn) : NetworkAnimState(ClipNodeEnum clipNodeEnumIn, const QString& urlIn, float fpsIn, bool loopIn, float firstFrameIn, float lastFrameIn) :
clipNodeEnum(clipNodeEnumIn), url(urlIn), fps(fpsIn), loop(loopIn), firstFrame(firstFrameIn), lastFrame(lastFrameIn) {} clipNodeEnum(clipNodeEnumIn), url(urlIn), fps(fpsIn), loop(loopIn), firstFrame(firstFrameIn), lastFrame(lastFrameIn) {}
@ -342,6 +346,7 @@ protected:
bool loop; bool loop;
float firstFrame; float firstFrame;
float lastFrame; float lastFrame;
float blendTime;
}; };
struct UserAnimState { struct UserAnimState {
@ -411,6 +416,7 @@ protected:
int _rigId; int _rigId;
bool _headEnabled { false }; bool _headEnabled { false };
bool _computeNetworkAnimation { false };
bool _sendNetworkNode { false }; bool _sendNetworkNode { false };
AnimContext _lastContext; AnimContext _lastContext;

4
libraries/avatars/src/AvatarData.h
View file

@ -341,10 +341,10 @@ const glm::vec3 START_LOCATION(6270, 211, 6000);
// Avatar Transit Constants // Avatar Transit Constants
const float AVATAR_TRANSIT_MIN_TRIGGER_DISTANCE = 1.0f; const float AVATAR_TRANSIT_MIN_TRIGGER_DISTANCE = 1.0f;
const float AVATAR_TRANSIT_MAX_TRIGGER_DISTANCE = 30.0f; const float AVATAR_TRANSIT_MAX_TRIGGER_DISTANCE = 30.0f;
const int AVATAR_TRANSIT_FRAME_COUNT = 11; const int AVATAR_TRANSIT_FRAME_COUNT = 5;
const float AVATAR_TRANSIT_FRAMES_PER_METER = 0.5f; const float AVATAR_TRANSIT_FRAMES_PER_METER = 0.5f;
const float AVATAR_TRANSIT_ABORT_DISTANCE = 0.1f; const float AVATAR_TRANSIT_ABORT_DISTANCE = 0.1f;
const bool AVATAR_TRANSIT_DISTANCE_BASED = true; const bool AVATAR_TRANSIT_DISTANCE_BASED = false;
const float AVATAR_TRANSIT_FRAMES_PER_SECOND = 30.0f; const float AVATAR_TRANSIT_FRAMES_PER_SECOND = 30.0f;
const float AVATAR_PRE_TRANSIT_FRAME_COUNT = 10.0f; const float AVATAR_PRE_TRANSIT_FRAME_COUNT = 10.0f;
const float AVATAR_POST_TRANSIT_FRAME_COUNT = 27.0f; const float AVATAR_POST_TRANSIT_FRAME_COUNT = 27.0f;