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

Code review fixes.

Browse source
This commit is contained in:
Andrzej Kapolka 2013-10-23 11:39:30 -07:00
parent 665551d690
commit e8885332f2
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
interface/src/DataServerClient.cpp
View file

@ -131,8 +131,8 @@ void DataServerClient::processSendFromDataServer(unsigned char* packetData, int
if (keyList[i] == DataServerKey::FaceMeshURL) { if (keyList[i] == DataServerKey::FaceMeshURL) {
if (userUUID.isNull() || userUUID == Application::getInstance()->getProfile()->getUUID()) { if (userUUID.isNull() || userUUID == Application::getInstance()->getProfile()->getUUID()) {
qDebug("Changing user's face model URL to %s\n", valueList[0].toLocal8Bit().constData()); qDebug("Changing user's face model URL to %s\n", valueList[i].toLocal8Bit().constData());
Application::getInstance()->getProfile()->setFaceModelURL(QUrl(valueList[0])); Application::getInstance()->getProfile()->setFaceModelURL(QUrl(valueList[i]));
} else { } else {
// mesh URL for a UUID, find avatar in our list // mesh URL for a UUID, find avatar in our list
NodeList* nodeList = NodeList::getInstance(); NodeList* nodeList = NodeList::getInstance();
@ -142,7 +142,7 @@ void DataServerClient::processSendFromDataServer(unsigned char* packetData, int
if (avatar->getUUID() == userUUID) { if (avatar->getUUID() == userUUID) {
QMetaObject::invokeMethod(&avatar->getHead().getFaceModel(), QMetaObject::invokeMethod(&avatar->getHead().getFaceModel(),
"setURL", Q_ARG(QUrl, QUrl(valueList[0]))); "setURL", Q_ARG(QUrl, QUrl(valueList[i])));
} }
} }
} }
@ -150,8 +150,8 @@ void DataServerClient::processSendFromDataServer(unsigned char* packetData, int
} else if (keyList[i] == DataServerKey::SkeletonURL) { } else if (keyList[i] == DataServerKey::SkeletonURL) {
if (userUUID.isNull() || userUUID == Application::getInstance()->getProfile()->getUUID()) { if (userUUID.isNull() || userUUID == Application::getInstance()->getProfile()->getUUID()) {
qDebug("Changing user's skeleton URL to %s\n", valueList[0].toLocal8Bit().constData()); qDebug("Changing user's skeleton URL to %s\n", valueList[i].toLocal8Bit().constData());
Application::getInstance()->getProfile()->setSkeletonModelURL(QUrl(valueList[0])); Application::getInstance()->getProfile()->setSkeletonModelURL(QUrl(valueList[i]));
} else { } else {
// skeleton URL for a UUID, find avatar in our list // skeleton URL for a UUID, find avatar in our list
NodeList* nodeList = NodeList::getInstance(); NodeList* nodeList = NodeList::getInstance();
@ -161,7 +161,7 @@ void DataServerClient::processSendFromDataServer(unsigned char* packetData, int
if (avatar->getUUID() == userUUID) { if (avatar->getUUID() == userUUID) {
QMetaObject::invokeMethod(&avatar->getSkeletonModel(), "setURL", QMetaObject::invokeMethod(&avatar->getSkeletonModel(), "setURL",
Q_ARG(QUrl, QUrl(valueList[0]))); Q_ARG(QUrl, QUrl(valueList[i])));
} }
} }
} }
@ -187,7 +187,7 @@ void DataServerClient::processSendFromDataServer(unsigned char* packetData, int
} else if (keyList[i] == DataServerKey::UUID) { } else if (keyList[i] == DataServerKey::UUID) {
// this is the user's UUID - set it on the profile // this is the user's UUID - set it on the profile
Application::getInstance()->getProfile()->setUUID(valueList[0]); Application::getInstance()->getProfile()->setUUID(valueList[i]);
} }
} }
} }

3
interface/src/avatar/SkeletonModel.cpp
View file

@ -12,8 +12,7 @@
#include "SkeletonModel.h" #include "SkeletonModel.h"
SkeletonModel::SkeletonModel(Avatar* owningAvatar) : SkeletonModel::SkeletonModel(Avatar* owningAvatar) :
_owningAvatar(owningAvatar) _owningAvatar(owningAvatar) {
{
} }
void SkeletonModel::simulate(float deltaTime) { void SkeletonModel::simulate(float deltaTime) {