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

Removed joints from avatar state messages.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-01-16 15:07:09 -08:00
parent aa3c18c0ed
commit a16d38ced6
5 changed files with 2 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
assignment-client/src/avatars/AvatarMixer.cpp
View file

@ -137,8 +137,7 @@ void AvatarMixer::processDatagram(const QByteArray& dataByteArray, const HifiSoc
} }
} }
case PACKET_TYPE_KILL_NODE: case PACKET_TYPE_KILL_NODE:
case PACKET_TYPE_AVATAR_URLS: case PACKET_TYPE_AVATAR_URLS: {
case PACKET_TYPE_AVATAR_FACE_VIDEO: {
QUuid nodeUUID = QUuid::fromRfc4122(dataByteArray.mid(numBytesForPacketHeader((unsigned char*) dataByteArray.data()), QUuid nodeUUID = QUuid::fromRfc4122(dataByteArray.mid(numBytesForPacketHeader((unsigned char*) dataByteArray.data()),
NUM_BYTES_RFC4122_UUID)); NUM_BYTES_RFC4122_UUID));
// let everyone else know about the update // let everyone else know about the update

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

@ -146,13 +146,6 @@ int AvatarData::getBroadcastData(unsigned char* destinationBuffer) {
// leap hand data // leap hand data
destinationBuffer += _handData->encodeRemoteData(destinationBuffer); destinationBuffer += _handData->encodeRemoteData(destinationBuffer);
// skeleton joints
*destinationBuffer++ = (unsigned char)_joints.size();
for (vector<JointData>::iterator it = _joints.begin(); it != _joints.end(); it++) {
*destinationBuffer++ = (unsigned char)it->jointID;
destinationBuffer += packOrientationQuatToBytes(destinationBuffer, it->rotation);
}
return destinationBuffer - bufferStart; return destinationBuffer - bufferStart;
} }
@ -273,16 +266,6 @@ int AvatarData::parseData(unsigned char* sourceBuffer, int numBytes) {
// check passed, bytes match // check passed, bytes match
sourceBuffer += _handData->decodeRemoteData(sourceBuffer); sourceBuffer += _handData->decodeRemoteData(sourceBuffer);
} }
// skeleton joints
if (sourceBuffer - startPosition < numBytes) {
// check passed, bytes match
_joints.resize(*sourceBuffer++);
for (vector<JointData>::iterator it = _joints.begin(); it != _joints.end(); it++) {
it->jointID = *sourceBuffer++;
sourceBuffer += unpackOrientationQuatFromBytes(sourceBuffer, it->rotation);
}
}
return sourceBuffer - startPosition; return sourceBuffer - startPosition;
} }

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

@ -60,8 +60,6 @@ enum KeyState
const glm::vec3 vec3Zero(0.0f); const glm::vec3 vec3Zero(0.0f);
class JointData;
class AvatarData : public NodeData { class AvatarData : public NodeData {
Q_OBJECT Q_OBJECT
@ -161,8 +159,6 @@ protected:
bool _isChatCirclingEnabled; bool _isChatCirclingEnabled;
std::vector<JointData> _joints;
HeadData* _headData; HeadData* _headData;
HandData* _handData; HandData* _handData;
@ -172,11 +168,4 @@ private:
AvatarData& operator= (const AvatarData&); AvatarData& operator= (const AvatarData&);
}; };
class JointData {
public:
int jointID;
glm::quat rotation;
};
#endif /* defined(__hifi__AvatarData__) */ #endif /* defined(__hifi__AvatarData__) */

5
libraries/shared/src/PacketHeaders.cpp
View file

@ -20,13 +20,10 @@ PACKET_VERSION versionForPacketType(PACKET_TYPE type) {
return 2; return 2;
case PACKET_TYPE_HEAD_DATA: case PACKET_TYPE_HEAD_DATA:
return 13; return 14;
case PACKET_TYPE_AVATAR_URLS: case PACKET_TYPE_AVATAR_URLS:
return 2; return 2;
case PACKET_TYPE_AVATAR_FACE_VIDEO:
return 2;
case PACKET_TYPE_OCTREE_STATS: case PACKET_TYPE_OCTREE_STATS:
return 2; return 2;

1
libraries/shared/src/PacketHeaders.h
View file

@ -26,7 +26,6 @@ const PACKET_TYPE PACKET_TYPE_MICROPHONE_AUDIO_NO_ECHO = 'M';
const PACKET_TYPE PACKET_TYPE_MICROPHONE_AUDIO_WITH_ECHO = 'm'; const PACKET_TYPE PACKET_TYPE_MICROPHONE_AUDIO_WITH_ECHO = 'm';
const PACKET_TYPE PACKET_TYPE_BULK_AVATAR_DATA = 'X'; const PACKET_TYPE PACKET_TYPE_BULK_AVATAR_DATA = 'X';
const PACKET_TYPE PACKET_TYPE_AVATAR_URLS = 'U'; const PACKET_TYPE PACKET_TYPE_AVATAR_URLS = 'U';
const PACKET_TYPE PACKET_TYPE_AVATAR_FACE_VIDEO = 'F';
const PACKET_TYPE PACKET_TYPE_TRANSMITTER_DATA_V2 = 'T'; const PACKET_TYPE PACKET_TYPE_TRANSMITTER_DATA_V2 = 'T';
const PACKET_TYPE PACKET_TYPE_ENVIRONMENT_DATA = 'e'; const PACKET_TYPE PACKET_TYPE_ENVIRONMENT_DATA = 'e';
const PACKET_TYPE PACKET_TYPE_DOMAIN_LIST_REQUEST = 'L'; const PACKET_TYPE PACKET_TYPE_DOMAIN_LIST_REQUEST = 'L';