Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 15:43:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

AvatarData now stores sessionUUID

Browse source
This commit is contained in:
Andrew Meadows 2014-04-09 08:11:15 -07:00
parent 79670563d4
commit b8232b5dfd
4 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/Application.cpp
View file

@ -1205,7 +1205,10 @@ void Application::timer() {
// ask the node list to check in with the domain server
NodeList::getInstance()->sendDomainServerCheckIn();
// as soon as we have a valid sessionUUID, store it in the avatar for reference
if (_myAvatar->getSessionUUID().isNull()) {
_myAvatar->setSessionUUID(NodeList::getInstance()->getSessionUUID());
}
}
void Application::idle() {

1
libraries/avatars/src/AvatarData.cpp
View file

@ -32,6 +32,7 @@ using namespace std;
QNetworkAccessManager* AvatarData::networkAccessManager = NULL;
AvatarData::AvatarData() :
_sessionUUID(),
_handPosition(0,0,0),
_bodyYaw(-90.f),
_bodyPitch(0.0f),

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

@ -94,12 +94,14 @@ class AvatarData : public QObject {
Q_PROPERTY(QString faceModelURL READ getFaceModelURLFromScript WRITE setFaceModelURLFromScript)
Q_PROPERTY(QString skeletonModelURL READ getSkeletonModelURLFromScript WRITE setSkeletonModelURLFromScript)
Q_PROPERTY(QString billboardURL READ getBillboardURL WRITE setBillboardFromURL)
Q_PROPERTY(QUuid sessionUUID READ getSessionUUID);
public:
AvatarData();
virtual ~AvatarData();
const QUuid& getSessionID() { return _sessionID; }
void setSessionID(const QUuid& id) { _sessionID = id; }
const QUuid& getSessionUUID() { return _sessionUUID; }
void setSessionUUID(const QUuid& id) { _sessionUUID = id; }
const glm::vec3& getPosition() const { return _position; }
void setPosition(const glm::vec3 position) { _position = position; }
@ -222,7 +224,7 @@ public slots:
void sendBillboardPacket();
void setBillboardFromNetworkReply();
protected:
QUuid _sessionID;
QUuid _sessionUUID;
glm::vec3 _position;
glm::vec3 _handPosition;

2
libraries/avatars/src/AvatarHashMap.cpp
View file

@ -15,7 +15,7 @@ AvatarHashMap::AvatarHashMap() :
void AvatarHashMap::insert(const QUuid& id, AvatarSharedPointer avatar) {
_avatarHash.insert(id, avatar);
avatar->setSessionID(id);
avatar->setSessionUUID(id);
}
AvatarHash::iterator AvatarHashMap::erase(const AvatarHash::iterator& iterator) {