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

Remove logs and magic numbers

Browse source
This commit is contained in:
luiscuenca 2018-10-23 11:47:50 -07:00
parent e1c760b566
commit fa67e1b269
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -127,19 +127,15 @@ 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:
qDebug() << "START_FRAME";
_myAvatar->getSkeletonModel()->getRig().triggerNetworkAnimation("preTransitAnim"); _myAvatar->getSkeletonModel()->getRig().triggerNetworkAnimation("preTransitAnim");
break; break;
case AvatarTransit::Status::START_TRANSIT: case AvatarTransit::Status::START_TRANSIT:
qDebug() << "START_TRANSIT";
_myAvatar->getSkeletonModel()->getRig().triggerNetworkAnimation("transitAnim"); _myAvatar->getSkeletonModel()->getRig().triggerNetworkAnimation("transitAnim");
break; break;
case AvatarTransit::Status::END_TRANSIT: case AvatarTransit::Status::END_TRANSIT:
qDebug() << "END_TRANSIT";
_myAvatar->getSkeletonModel()->getRig().triggerNetworkAnimation("postTransitAnim"); _myAvatar->getSkeletonModel()->getRig().triggerNetworkAnimation("postTransitAnim");
break; break;
case AvatarTransit::Status::ENDED: case AvatarTransit::Status::ENDED:
qDebug() << "END_FRAME";
_myAvatar->getSkeletonModel()->getRig().triggerNetworkAnimation("idleAnim"); _myAvatar->getSkeletonModel()->getRig().triggerNetworkAnimation("idleAnim");
break; break;
case AvatarTransit::Status::PRE_TRANSIT: case AvatarTransit::Status::PRE_TRANSIT:

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

@ -1124,17 +1124,18 @@ void Rig::updateAnimations(float deltaTime, const glm::mat4& rootTransform, cons
_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); _networkPoseSet._relativePoses = _networkNode->evaluate(_networkVars, context, deltaTime, networkTriggersOut);
const float NETWORK_ANIMATION_BLEND_FRAMES = 6.0f;
float alpha = 1.0f; float alpha = 1.0f;
std::shared_ptr<AnimClip> clip; std::shared_ptr<AnimClip> clip;
if (_networkAnimState.clipNodeEnum == NetworkAnimState::PreTransit) { if (_networkAnimState.clipNodeEnum == NetworkAnimState::PreTransit) {
clip = std::dynamic_pointer_cast<AnimClip>(_networkNode->findByName("preTransitAnim")); clip = std::dynamic_pointer_cast<AnimClip>(_networkNode->findByName("preTransitAnim"));
if (clip) { if (clip) {
alpha = (clip->getFrame() - clip->getStartFrame()) / 6.0f; alpha = (clip->getFrame() - clip->getStartFrame()) / NETWORK_ANIMATION_BLEND_FRAMES;
} }
} else if (_networkAnimState.clipNodeEnum == NetworkAnimState::PostTransit) { } else if (_networkAnimState.clipNodeEnum == NetworkAnimState::PostTransit) {
clip = std::dynamic_pointer_cast<AnimClip>(_networkNode->findByName("postTransitAnim")); clip = std::dynamic_pointer_cast<AnimClip>(_networkNode->findByName("postTransitAnim"));
if (clip) { if (clip) {
alpha = (clip->getEndFrame() - clip->getFrame()) / 6.0f; alpha = (clip->getEndFrame() - clip->getFrame()) / NETWORK_ANIMATION_BLEND_FRAMES;
} }
} }
if (_sendNetworkNode) { if (_sendNetworkNode) {