Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 16:14:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

init frames per meter

Browse source
This commit is contained in:
luiscuenca 2018-09-12 10:15:00 -07:00
parent 4d381b9d04
commit b9fbcce403
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -81,9 +81,11 @@ AvatarManager::AvatarManager(QObject* parent) :
const float AVATAR_TRANSIT_MAX_DISTANCE = 1.0f;
const int AVATAR_TRANSIT_FRAME_COUNT = 20;
const int AVATAR_TRANSIT_FRAMES_PER_METER = 5;
_avatarTransitMaxDistance = AVATAR_TRANSIT_MAX_DISTANCE;
_avatarTransitFrameCount = AVATAR_TRANSIT_FRAME_COUNT;
_avatarTransitFramesPerMeter = AVATAR_TRANSIT_FRAMES_PER_METER;
}
AvatarSharedPointer AvatarManager::addAvatar(const QUuid& sessionUUID, const QWeakPointer<Node>& mixerWeakPointer) {
@ -260,7 +262,7 @@ void AvatarManager::updateOtherAvatars(float deltaTime) {
{
float oneFrameDistance = glm::length(avatar->_globalPosition - avatar->_lastPosition);
if (oneFrameDistance > _avatarTransitMaxDistance) {
avatar->_transit.start(avatar->_lastPosition, avatar->_globalPosition, _avatarTransitFrameCount, _avatarTransitFramePerMeter, _avatarTransitDistanceBased);
avatar->_transit.start(avatar->_lastPosition, avatar->_globalPosition, _avatarTransitFrameCount, _avatarTransitFramesPerMeter, _avatarTransitDistanceBased);
}
if (avatar->_transit.isTransiting()) {
glm::vec3 nextPosition;

6
interface/src/avatar/AvatarManager.h
View file

@ -181,11 +181,11 @@ public:
Q_INVOKABLE void setAvatarTransitDistanceBased(bool isDistanceBased) { _avatarTransitDistanceBased = isDistanceBased; }
Q_INVOKABLE void setAvatarTransitMaxDistance(float maxDistance) { _avatarTransitMaxDistance = maxDistance; }
Q_INVOKABLE void setAvatarTransitFrameCount(int frameCount) { _avatarTransitFrameCount = frameCount; }
Q_INVOKABLE void setAvatarTransitFramePerMeter(int frameCount) { _avatarTransitFramePerMeter = frameCount; }
Q_INVOKABLE void setAvatarTransitFramesPerMeter(int frameCount) { _avatarTransitFramesPerMeter = frameCount; }
Q_INVOKABLE bool getAvatarTransitDistanceBased() { return _avatarTransitDistanceBased; }
Q_INVOKABLE float getAvatarTransitMaxDistance() { return _avatarTransitMaxDistance; }
Q_INVOKABLE int getAvatarTransitFrameCount() { return _avatarTransitFrameCount; }
Q_INVOKABLE int getAvatarTransitFramePerMeter() { return _avatarTransitFramePerMeter; }
Q_INVOKABLE int getAvatarTransitFramesPerMeter() { return _avatarTransitFramesPerMeter; }
float getMyAvatarSendRate() const { return _myAvatarSendRate.rate(); }
int getIdentityRequestsSent() const { return _identityRequestsSent; }
@ -240,7 +240,7 @@ private:
bool _avatarTransitDistanceBased { false };
float _avatarTransitMaxDistance;
int _avatarTransitFrameCount;
int _avatarTransitFramePerMeter;
int _avatarTransitFramesPerMeter;
};