Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 13:24:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Clean-up & other small changes

Browse source
This commit is contained in:
Simon Walton 2018-09-25 12:07:59 -07:00
parent 07bdaeede7
commit f95ab1b040
3 changed files with 29 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assignment-client/src/avatars/AvatarMixerSlave.cpp
View file

@ -244,7 +244,7 @@ void AvatarMixerSlave::broadcastAvatarDataToAgent(const SharedNodePointer& node)
// reset the internal state for correct random number distribution // reset the internal state for correct random number distribution
distribution.reset(); distribution.reset();
// Estimate number to sort on number sent last frame. // Estimate number to sort on number sent last frame (with min. of 20).
const int numToSendEst = std::max(nodeData->getNumAvatarsSentLastFrame() * 2, 20); const int numToSendEst = std::max(nodeData->getNumAvatarsSentLastFrame() * 2, 20);
// reset the number of sent avatars // reset the number of sent avatars
@ -464,7 +464,7 @@ void AvatarMixerSlave::broadcastAvatarDataToAgent(const SharedNodePointer& node)
avatarPacket->write(bytes); avatarPacket->write(bytes);
avatarSpaceAvailable -= bytes.size(); avatarSpaceAvailable -= bytes.size();
numAvatarDataBytes += bytes.size(); numAvatarDataBytes += bytes.size();
if (sendStatus.itemFlags != 0 || avatarSpaceAvailable < (int)AvatarDataPacket::MIN_BULK_PACKET_SIZE) { if (!sendStatus || avatarSpaceAvailable < (int)AvatarDataPacket::MIN_BULK_PACKET_SIZE) {
// Weren't able to fit everything. // Weren't able to fit everything.
nodeList->sendPacket(std::move(avatarPacket), *destinationNode); nodeList->sendPacket(std::move(avatarPacket), *destinationNode);
++numPacketsSent; ++numPacketsSent;

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

@ -245,13 +245,17 @@ QByteArray AvatarData::toByteArray(AvatarDataDetail dataDetail, quint64 lastSent
lazyInitHeadData(); lazyInitHeadData();
ASSERT(maxDataSize == 0 || (size_t)maxDataSize >= AvatarDataPacket::MIN_BULK_PACKET_SIZE); ASSERT(maxDataSize == 0 || (size_t)maxDataSize >= AvatarDataPacket::MIN_BULK_PACKET_SIZE);
// Leading flags, to indicate how much data is actually included in the packet...
AvatarDataPacket::HasFlags wantedFlags = 0;
AvatarDataPacket::HasFlags includedFlags = 0;
AvatarDataPacket::HasFlags extraReturnedFlags = 0; // For partial joint data.
// special case, if we were asked for no data, then just include the flags all set to nothing // special case, if we were asked for no data, then just include the flags all set to nothing
if (dataDetail == NoData) { if (dataDetail == NoData) {
AvatarDataPacket::HasFlags packetStateFlags = 0; sendStatus.itemFlags = wantedFlags;
sendStatus.itemFlags = packetStateFlags;
QByteArray avatarDataByteArray(getSessionUUID().toRfc4122().data(), NUM_BYTES_RFC4122_UUID + sizeof(packetStateFlags)); QByteArray avatarDataByteArray(getSessionUUID().toRfc4122().data(), NUM_BYTES_RFC4122_UUID + sizeof wantedFlags);
avatarDataByteArray.append((char*) &packetStateFlags, sizeof packetStateFlags); avatarDataByteArray.append((char*) &wantedFlags, sizeof wantedFlags);
return avatarDataByteArray; return avatarDataByteArray;
} }
@ -280,10 +284,8 @@ QByteArray AvatarData::toByteArray(AvatarDataDetail dataDetail, quint64 lastSent
glm::mat4 rightFarGrabMatrix; glm::mat4 rightFarGrabMatrix;
glm::mat4 mouseFarGrabMatrix; glm::mat4 mouseFarGrabMatrix;
// Leading flags, to indicate how much data is actually included in the packet...
AvatarDataPacket::HasFlags packetStateFlags = 0;
if (sendStatus.itemFlags == 0) { if (sendStatus.itemFlags == 0) {
// New avatar ...
bool hasAvatarGlobalPosition = true; // always include global position bool hasAvatarGlobalPosition = true; // always include global position
bool hasAvatarOrientation = false; bool hasAvatarOrientation = false;
bool hasAvatarBoundingBox = false; bool hasAvatarBoundingBox = false;
@ -324,7 +326,7 @@ QByteArray AvatarData::toByteArray(AvatarDataDetail dataDetail, quint64 lastSent
hasJointDefaultPoseFlags = hasJointData; hasJointDefaultPoseFlags = hasJointData;
} }
packetStateFlags = wantedFlags =
(hasAvatarGlobalPosition ? AvatarDataPacket::PACKET_HAS_AVATAR_GLOBAL_POSITION : 0) (hasAvatarGlobalPosition ? AvatarDataPacket::PACKET_HAS_AVATAR_GLOBAL_POSITION : 0)
| (hasAvatarBoundingBox ? AvatarDataPacket::PACKET_HAS_AVATAR_BOUNDING_BOX : 0) | (hasAvatarBoundingBox ? AvatarDataPacket::PACKET_HAS_AVATAR_BOUNDING_BOX : 0)
| (hasAvatarOrientation ? AvatarDataPacket::PACKET_HAS_AVATAR_ORIENTATION : 0) | (hasAvatarOrientation ? AvatarDataPacket::PACKET_HAS_AVATAR_ORIENTATION : 0)
@ -340,17 +342,18 @@ QByteArray AvatarData::toByteArray(AvatarDataDetail dataDetail, quint64 lastSent
| (hasJointDefaultPoseFlags ? AvatarDataPacket::PACKET_HAS_JOINT_DEFAULT_POSE_FLAGS : 0) | (hasJointDefaultPoseFlags ? AvatarDataPacket::PACKET_HAS_JOINT_DEFAULT_POSE_FLAGS : 0)
| (hasJointData ? AvatarDataPacket::PACKET_HAS_GRAB_JOINTS : 0); | (hasJointData ? AvatarDataPacket::PACKET_HAS_GRAB_JOINTS : 0);
sendStatus.itemFlags = packetStateFlags; sendStatus.itemFlags = wantedFlags;
sendStatus.rotationsSent = 0; sendStatus.rotationsSent = 0;
sendStatus.translationsSent = 0; sendStatus.translationsSent = 0;
} else { } else { // Continuing avatar ...
packetStateFlags = sendStatus.itemFlags; wantedFlags = sendStatus.itemFlags;
if (packetStateFlags & AvatarDataPacket::PACKET_HAS_GRAB_JOINTS) { if (wantedFlags & AvatarDataPacket::PACKET_HAS_GRAB_JOINTS) {
packetStateFlags |= AvatarDataPacket::PACKET_HAS_JOINT_DATA; // Must send joints for grab joints -
wantedFlags |= AvatarDataPacket::PACKET_HAS_JOINT_DATA;
} }
} }
if (packetStateFlags & AvatarDataPacket::PACKET_HAS_GRAB_JOINTS) { if (wantedFlags & AvatarDataPacket::PACKET_HAS_GRAB_JOINTS) {
bool leftValid; bool leftValid;
leftFarGrabMatrix = _farGrabLeftMatrixCache.get(leftValid); leftFarGrabMatrix = _farGrabLeftMatrixCache.get(leftValid);
if (!leftValid) { if (!leftValid) {
@ -367,10 +370,10 @@ QByteArray AvatarData::toByteArray(AvatarDataDetail dataDetail, quint64 lastSent
mouseFarGrabMatrix = glm::mat4(); mouseFarGrabMatrix = glm::mat4();
} }
if (!(leftValid || rightValid || mouseValid)) { if (!(leftValid || rightValid || mouseValid)) {
packetStateFlags &= ~AvatarDataPacket::PACKET_HAS_GRAB_JOINTS; wantedFlags &= ~AvatarDataPacket::PACKET_HAS_GRAB_JOINTS;
} }
} }
if (packetStateFlags & (AvatarDataPacket::PACKET_HAS_ADDITIONAL_FLAGS | AvatarDataPacket::PACKET_HAS_PARENT_INFO)) { if (wantedFlags & (AvatarDataPacket::PACKET_HAS_ADDITIONAL_FLAGS | AvatarDataPacket::PACKET_HAS_PARENT_INFO)) {
parentID = getParentID(); parentID = getParentID();
} }
@ -388,24 +391,22 @@ QByteArray AvatarData::toByteArray(AvatarDataDetail dataDetail, quint64 lastSent
const unsigned char* const startPosition = destinationBuffer; const unsigned char* const startPosition = destinationBuffer;
const unsigned char* const packetEnd = destinationBuffer + maxDataSize; const unsigned char* const packetEnd = destinationBuffer + maxDataSize;
AvatarDataPacket::HasFlags includedFlags = 0;
AvatarDataPacket::HasFlags extraReturnedFlags = 0;
// Packets always have UUID. // Packets always have UUID.
memcpy(destinationBuffer, getSessionUUID().toRfc4122(), NUM_BYTES_RFC4122_UUID); memcpy(destinationBuffer, getSessionUUID().toRfc4122(), NUM_BYTES_RFC4122_UUID);
destinationBuffer += NUM_BYTES_RFC4122_UUID; destinationBuffer += NUM_BYTES_RFC4122_UUID;
unsigned char * packetFlagsLocation = destinationBuffer; unsigned char * packetFlagsLocation = destinationBuffer;
destinationBuffer += sizeof(packetStateFlags); destinationBuffer += sizeof(wantedFlags);
#define AVATAR_MEMCPY(src) \ #define AVATAR_MEMCPY(src) \
memcpy(destinationBuffer, &(src), sizeof(src)); \ memcpy(destinationBuffer, &(src), sizeof(src)); \
destinationBuffer += sizeof(src); destinationBuffer += sizeof(src);
// If we want an item and there's sufficient space: // If we want an item and there's sufficient space:
#define IF_AVATAR_SPACE(flag, space) \ #define IF_AVATAR_SPACE(flag, space) \
if ((packetStateFlags & AvatarDataPacket::flag) && (size_t)(packetEnd - destinationBuffer) >= (size_t)(space) \ if ((wantedFlags & AvatarDataPacket::flag) \
&& (includedFlags |= AvatarDataPacket::flag)) && (size_t)(packetEnd - destinationBuffer) >= (size_t)(space) \
&& (includedFlags |= AvatarDataPacket::flag))
IF_AVATAR_SPACE(PACKET_HAS_AVATAR_GLOBAL_POSITION, sizeof _globalPosition) { IF_AVATAR_SPACE(PACKET_HAS_AVATAR_GLOBAL_POSITION, sizeof _globalPosition) {
auto startSection = destinationBuffer; auto startSection = destinationBuffer;
@ -589,7 +590,7 @@ QByteArray AvatarData::toByteArray(AvatarDataDetail dataDetail, quint64 lastSent
} }
QVector<JointData> jointData; QVector<JointData> jointData;
if (packetStateFlags & (AvatarDataPacket::PACKET_HAS_JOINT_DATA | AvatarDataPacket::PACKET_HAS_JOINT_DEFAULT_POSE_FLAGS)) { if (wantedFlags & (AvatarDataPacket::PACKET_HAS_JOINT_DATA | AvatarDataPacket::PACKET_HAS_JOINT_DEFAULT_POSE_FLAGS)) {
QReadLocker readLock(&_jointDataLock); QReadLocker readLock(&_jointDataLock);
jointData = _jointData; jointData = _jointData;
} }
@ -802,7 +803,7 @@ QByteArray AvatarData::toByteArray(AvatarDataDetail dataDetail, quint64 lastSent
memcpy(packetFlagsLocation, &includedFlags, sizeof(includedFlags)); memcpy(packetFlagsLocation, &includedFlags, sizeof(includedFlags));
// Return dropped items. // Return dropped items.
sendStatus.itemFlags = (packetStateFlags & ~includedFlags) | extraReturnedFlags; sendStatus.itemFlags = (wantedFlags & ~includedFlags) | extraReturnedFlags;
int avatarDataSize = destinationBuffer - startPosition; int avatarDataSize = destinationBuffer - startPosition;

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

@ -302,7 +302,7 @@ namespace AvatarDataPacket {
struct SendStatus { struct SendStatus {
HasFlags itemFlags { 0 }; HasFlags itemFlags { 0 };
int rotationsSent { 0 }; int rotationsSent { 0 }; // ie: index of next unsent joint
int translationsSent { 0 }; int translationsSent { 0 };
operator bool() { return itemFlags == 0; } operator bool() { return itemFlags == 0; }
}; };