From first frame

This commit is contained in:
luiscuenca 2018-09-17 13:53:57 -07:00
parent f339bbdd7f
commit b39391ca7a

View file

@ -114,14 +114,15 @@ void Avatar::setShowNamesAboveHeads(bool show) {
} }
bool AvatarTransit::update(const glm::vec3& avatarPosition, int totalFrames, int framesPerMeter, bool isDistanceBased, float maxDistance) { bool AvatarTransit::update(const glm::vec3& avatarPosition, int totalFrames, int framesPerMeter, bool isDistanceBased, float maxDistance) {
bool starting = false;
glm::vec3 currentPosition = _isTransiting ? _currentPosition : avatarPosition; glm::vec3 currentPosition = _isTransiting ? _currentPosition : avatarPosition;
float oneFrameDistance = glm::length(currentPosition - _lastPosition); float oneFrameDistance = glm::length(currentPosition - _lastPosition);
if (oneFrameDistance > maxDistance && !_isTransiting) { if (oneFrameDistance > maxDistance && !_isTransiting) {
start(_lastPosition, currentPosition, totalFrames, framesPerMeter, isDistanceBased); start(_lastPosition, currentPosition, totalFrames, framesPerMeter, isDistanceBased);
return true; starting = true;
} }
updatePosition(avatarPosition); updatePosition(avatarPosition);
return false; return starting;
} }
void AvatarTransit::start(const glm::vec3& startPosition, const glm::vec3& endPosition, int totalFrames, int framesPerMeter, bool isDistanceBased) { void AvatarTransit::start(const glm::vec3& startPosition, const glm::vec3& endPosition, int totalFrames, int framesPerMeter, bool isDistanceBased) {