Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 16:41:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1805 from birarda/master

Browse source 
remove unused UUID from OctreeQuery
This commit is contained in:
ZappoMan 2014-01-31 13:48:49 -08:00
commit 7a3ce7c89d
2 changed files with 0 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libraries/octree/src/OctreeQuery.cpp
View file

@ -24,7 +24,6 @@ static const float fingerVectorRadix = 4; // bits of precision when converting f
OctreeQuery::OctreeQuery() : OctreeQuery::OctreeQuery() :
NodeData(), NodeData(),
_uuid(),
_cameraPosition(0,0,0), _cameraPosition(0,0,0),
_cameraOrientation(), _cameraOrientation(),
_cameraFov(0.0f), _cameraFov(0.0f),
@ -53,11 +52,6 @@ int OctreeQuery::getBroadcastData(unsigned char* destinationBuffer) {
// that can pack any type given the number of bytes // that can pack any type given the number of bytes
// and return the number of bytes to push the pointer // and return the number of bytes to push the pointer
// UUID
QByteArray uuidByteArray = _uuid.toRfc4122();
memcpy(destinationBuffer, uuidByteArray.constData(), uuidByteArray.size());
destinationBuffer += uuidByteArray.size();
// camera details // camera details
memcpy(destinationBuffer, &_cameraPosition, sizeof(_cameraPosition)); memcpy(destinationBuffer, &_cameraPosition, sizeof(_cameraPosition));
destinationBuffer += sizeof(_cameraPosition); destinationBuffer += sizeof(_cameraPosition);
@ -103,10 +97,6 @@ int OctreeQuery::parseData(const QByteArray& packet) {
const unsigned char* startPosition = reinterpret_cast<const unsigned char*>(packet.data()); const unsigned char* startPosition = reinterpret_cast<const unsigned char*>(packet.data());
const unsigned char* sourceBuffer = startPosition + numBytesPacketHeader; const unsigned char* sourceBuffer = startPosition + numBytesPacketHeader;
// user UUID
_uuid = QUuid::fromRfc4122(QByteArray((char*) sourceBuffer, NUM_BYTES_RFC4122_UUID));
sourceBuffer += NUM_BYTES_RFC4122_UUID;
// camera details // camera details
memcpy(&_cameraPosition, sourceBuffer, sizeof(_cameraPosition)); memcpy(&_cameraPosition, sourceBuffer, sizeof(_cameraPosition));
sourceBuffer += sizeof(_cameraPosition); sourceBuffer += sizeof(_cameraPosition);

5
libraries/octree/src/OctreeQuery.h
View file

@ -57,9 +57,6 @@ public:
int getBroadcastData(unsigned char* destinationBuffer); int getBroadcastData(unsigned char* destinationBuffer);
int parseData(const QByteArray& packet); int parseData(const QByteArray& packet);
QUuid& getUUID() { return _uuid; }
void setUUID(const QUuid& uuid) { _uuid = uuid; }
// getters for camera details // getters for camera details
const glm::vec3& getCameraPosition() const { return _cameraPosition; } const glm::vec3& getCameraPosition() const { return _cameraPosition; }
const glm::quat& getCameraOrientation() const { return _cameraOrientation; } const glm::quat& getCameraOrientation() const { return _cameraOrientation; }
@ -101,8 +98,6 @@ public slots:
void setBoundaryLevelAdjust(int boundaryLevelAdjust) { _boundaryLevelAdjust = boundaryLevelAdjust; } void setBoundaryLevelAdjust(int boundaryLevelAdjust) { _boundaryLevelAdjust = boundaryLevelAdjust; }
protected: protected:
QUuid _uuid;
// camera details for the avatar // camera details for the avatar
glm::vec3 _cameraPosition; glm::vec3 _cameraPosition;
glm::quat _cameraOrientation; glm::quat _cameraOrientation;