From c3b222cfc218ff09784869eabf211a52c197b910 Mon Sep 17 00:00:00 2001 From: Leonardo Murillo Date: Thu, 19 Dec 2013 11:23:55 -0600 Subject: [PATCH 1/2] Print assignment request details to log --- domain-server/src/DomainServer.cpp | 6 ++++-- interface/src/avatar/Avatar.cpp | 4 ---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index ec955f5fb4..47b0295941 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -220,12 +220,12 @@ void DomainServer::readAvailableDatagrams() { } } else if (packetData[0] == PACKET_TYPE_REQUEST_ASSIGNMENT) { - qDebug("Received a request for assignment.\n"); - if (_assignmentQueue.size() > 0) { // construct the requested assignment from the packet data Assignment requestAssignment(packetData, receivedBytes); + qDebug("Received a request for assignment type %i from %s.\n", requestAssignment.getType() ,qPrintable(senderSockAddr.getAddress().toString())); + Assignment* assignmentToDeploy = deployableAssignmentForRequest(requestAssignment); if (assignmentToDeploy) { @@ -243,6 +243,8 @@ void DomainServer::readAvailableDatagrams() { } } + } else { + qDebug("Received an invalid assignment request from %s.\n", qPrintable(senderSockAddr.getAddress().toString())); } } } diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp index f4a09ad069..7762f5afbc 100755 --- a/interface/src/avatar/Avatar.cpp +++ b/interface/src/avatar/Avatar.cpp @@ -338,8 +338,6 @@ void Avatar::render(bool forceRenderHead) { } } - - // returns true if the Leap controls any of the avatar's hands. bool Avatar::updateLeapHandPositions() { bool returnValue = false; @@ -443,8 +441,6 @@ glm::quat Avatar::computeRotationFromBodyToWorldUp(float proportion) const { return glm::angleAxis(angle * proportion, axis); } - - void Avatar::renderBody(bool forceRenderHead) { if (_head.getVideoFace().isFullFrame()) { From 57bf31e1a6c22b7bc3049d48660efd644c01de7e Mon Sep 17 00:00:00 2001 From: Leonardo Murillo Date: Thu, 19 Dec 2013 11:25:51 -0600 Subject: [PATCH 2/2] Wrong spacing --- domain-server/src/DomainServer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index 47b0295941..ee6caaaf9b 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -224,7 +224,7 @@ void DomainServer::readAvailableDatagrams() { // construct the requested assignment from the packet data Assignment requestAssignment(packetData, receivedBytes); - qDebug("Received a request for assignment type %i from %s.\n", requestAssignment.getType() ,qPrintable(senderSockAddr.getAddress().toString())); + qDebug("Received a request for assignment type %i from %s.\n", requestAssignment.getType(), qPrintable(senderSockAddr.getAddress().toString())); Assignment* assignmentToDeploy = deployableAssignmentForRequest(requestAssignment);