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

Merge pull request #5553 from howard-stearns/remove-obsolete-avatar-mixer-data

Browse source 
Warning: protocol change - Remove obsolete AvatarMixer wire data
This commit is contained in:
Seth Alves 2015-08-12 16:01:42 -07:00
commit 2dbbc5c184
3 changed files with 7 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -161,16 +161,6 @@ QByteArray AvatarData::toByteArray() {
// Body scale // Body scale
destinationBuffer += packFloatRatioToTwoByte(destinationBuffer, _targetScale); destinationBuffer += packFloatRatioToTwoByte(destinationBuffer, _targetScale);
// Head rotation
destinationBuffer += packFloatAngleToTwoByte(destinationBuffer, _headData->getFinalPitch());
destinationBuffer += packFloatAngleToTwoByte(destinationBuffer, _headData->getFinalYaw());
destinationBuffer += packFloatAngleToTwoByte(destinationBuffer, _headData->getFinalRoll());
// Body lean
destinationBuffer += packFloatAngleToTwoByte(destinationBuffer, _headData->_leanForward);
destinationBuffer += packFloatAngleToTwoByte(destinationBuffer, _headData->_leanSideways);
destinationBuffer += packFloatAngleToTwoByte(destinationBuffer, _headData->_torsoTwist);
// Lookat Position // Lookat Position
memcpy(destinationBuffer, &_headData->_lookAtPosition, sizeof(_headData->_lookAtPosition)); memcpy(destinationBuffer, &_headData->_lookAtPosition, sizeof(_headData->_lookAtPosition));
destinationBuffer += sizeof(_headData->_lookAtPosition); destinationBuffer += sizeof(_headData->_lookAtPosition);
@ -278,25 +268,20 @@ int AvatarData::parseDataFromBuffer(const QByteArray& buffer) {
quint64 now = usecTimestampNow(); quint64 now = usecTimestampNow();
// The absolute minimum size of the update data is as follows: // The absolute minimum size of the update data is as follows:
// 50 bytes of "plain old data" { // 36 bytes of "plain old data" {
// position = 12 bytes // position = 12 bytes
// bodyYaw = 2 (compressed float) // bodyYaw = 2 (compressed float)
// bodyPitch = 2 (compressed float) // bodyPitch = 2 (compressed float)
// bodyRoll = 2 (compressed float) // bodyRoll = 2 (compressed float)
// targetScale = 2 (compressed float) // targetScale = 2 (compressed float)
// headPitch = 2 (compressed float)
// headYaw = 2 (compressed float)
// headRoll = 2 (compressed float)
// leanForward = 2 (compressed float)
// leanSideways = 2 (compressed float)
// torsoTwist = 2 (compressed float)
// lookAt = 12 // lookAt = 12
// audioLoudness = 4 // audioLoudness = 4
// } // }
// + 1 byte for varying data
// + 1 byte for pupilSize // + 1 byte for pupilSize
// + 1 byte for numJoints (0) // + 1 byte for numJoints (0)
// = 51 bytes // = 39 bytes
int minPossibleSize = 51; int minPossibleSize = 39;
int maxAvailableSize = buffer.size(); int maxAvailableSize = buffer.size();
if (minPossibleSize > maxAvailableSize) { if (minPossibleSize > maxAvailableSize) {
@ -354,39 +339,6 @@ int AvatarData::parseDataFromBuffer(const QByteArray& buffer) {
_targetScale = scale; _targetScale = scale;
} // 20 bytes } // 20 bytes
{ // Head rotation
//(NOTE: This needs to become a quaternion to save two bytes)
float headYaw, headPitch, headRoll;
sourceBuffer += unpackFloatAngleFromTwoByte((uint16_t*) sourceBuffer, &headPitch);
sourceBuffer += unpackFloatAngleFromTwoByte((uint16_t*) sourceBuffer, &headYaw);
sourceBuffer += unpackFloatAngleFromTwoByte((uint16_t*) sourceBuffer, &headRoll);
if (glm::isnan(headYaw) || glm::isnan(headPitch) || glm::isnan(headRoll)) {
if (shouldLogError(now)) {
qCDebug(avatars) << "Discard nan AvatarData::headYaw,headPitch,headRoll; displayName = '" << _displayName << "'";
}
return maxAvailableSize;
}
_headData->setBasePitch(headPitch);
_headData->setBaseYaw(headYaw);
_headData->setBaseRoll(headRoll);
} // 6 bytes
{ // Head lean (relative to pelvis)
float leanForward, leanSideways, torsoTwist;
sourceBuffer += unpackFloatAngleFromTwoByte((uint16_t*)sourceBuffer, &leanForward);
sourceBuffer += unpackFloatAngleFromTwoByte((uint16_t*)sourceBuffer, &leanSideways);
sourceBuffer += unpackFloatAngleFromTwoByte((uint16_t*)sourceBuffer, &torsoTwist);
if (glm::isnan(leanForward) || glm::isnan(leanSideways)) {
if (shouldLogError(now)) {
qCDebug(avatars) << "Discard nan AvatarData::leanForward,leanSideways,torsoTwise; displayName = '" << _displayName << "'";
}
return maxAvailableSize;
}
_headData->_leanForward = leanForward;
_headData->_leanSideways = leanSideways;
_headData->_torsoTwist = torsoTwist;
} // 6 bytes
{ // Lookat Position { // Lookat Position
glm::vec3 lookAt; glm::vec3 lookAt;
memcpy(&lookAt, sourceBuffer, sizeof(lookAt)); memcpy(&lookAt, sourceBuffer, sizeof(lookAt));

2
libraries/networking/src/udt/PacketHeaders.cpp
View file

@ -68,6 +68,8 @@ PacketVersion versionForPacketType(PacketType::Value packetType) {
case EntityEdit: case EntityEdit:
case EntityData: case EntityData:
return VERSION_ENTITIES_POLYLINE; return VERSION_ENTITIES_POLYLINE;
case AvatarData:
return VERSION_AVATAR_NO_LEAN;
default: default:
return 11; return 11;
} }

1
libraries/networking/src/udt/PacketHeaders.h
View file

@ -142,5 +142,6 @@ const PacketVersion VERSION_ENTITIES_HAVE_SIMULATION_OWNER_AND_ACTIONS_OVER_WIRE
const PacketVersion VERSION_ENTITIES_NEW_PROTOCOL_LAYER = 35; const PacketVersion VERSION_ENTITIES_NEW_PROTOCOL_LAYER = 35;
const PacketVersion VERSION_POLYVOX_TEXTURES = 36; const PacketVersion VERSION_POLYVOX_TEXTURES = 36;
const PacketVersion VERSION_ENTITIES_POLYLINE = 37; const PacketVersion VERSION_ENTITIES_POLYLINE = 37;
const PacketVersion VERSION_AVATAR_NO_LEAN = 38;
#endif // hifi_PacketHeaders_h #endif // hifi_PacketHeaders_h