From 87fd0f7a9141df044265e0add72d878447bd79db Mon Sep 17 00:00:00 2001 From: Philip Rosedale Date: Mon, 8 Apr 2013 21:13:20 -0700 Subject: [PATCH] Fixed avatar lighting, head scaling, removed some extra log messages --- interface/src/Audio.cpp | 10 +++++----- interface/src/Head.cpp | 9 ++++----- interface/src/main.cpp | 4 ++-- mixer/src/main.cpp | 2 +- shared/src/AgentList.cpp | 4 ++-- shared/src/PacketHeaders.h | 8 +++++++- 6 files changed, 21 insertions(+), 16 deletions(-) diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp index e717d707a9..d003de98cb 100644 --- a/interface/src/Audio.cpp +++ b/interface/src/Audio.cpp @@ -231,19 +231,19 @@ int audioCallback (const void *inputBuffer, if (ringBuffer->getEndOfLastWrite() != NULL) { if (!ringBuffer->isStarted() && ringBuffer->diffLastWriteNextOutput() < PACKET_LENGTH_SAMPLES + JITTER_BUFFER_SAMPLES) { - printf("Held back, buffer has %d of %d samples required.\n", ringBuffer->diffLastWriteNextOutput(), PACKET_LENGTH_SAMPLES + JITTER_BUFFER_SAMPLES); + //printf("Held back, buffer has %d of %d samples required.\n", ringBuffer->diffLastWriteNextOutput(), PACKET_LENGTH_SAMPLES + JITTER_BUFFER_SAMPLES); } else if (ringBuffer->diffLastWriteNextOutput() < PACKET_LENGTH_SAMPLES) { ringBuffer->setStarted(false); starve_counter++; packetsReceivedThisPlayback = 0; - printf("Starved #%d\n", starve_counter); + //printf("Starved #%d\n", starve_counter); data->wasStarved = 10; // Frames to render the indication that the system was starved. } else { if (!ringBuffer->isStarted()) { ringBuffer->setStarted(true); - printf("starting playback %3.1f msecs delayed, \n", (usecTimestampNow() - usecTimestamp(&firstPlaybackTimer))/1000.0); + printf("starting playback %3.1f msecs delayed \n", (usecTimestampNow() - usecTimestamp(&firstPlaybackTimer))/1000.0); } else { //printf("pushing buffer\n"); } @@ -396,7 +396,7 @@ void *receiveAudioViaUDP(void *args) { if (totalPacketsReceived > 3) stdev.addValue(tDiff); if (stdev.getSamples() > 500) { sharedAudioData->measuredJitter = stdev.getStDev(); - printf("Avg: %4.2f, Stdev: %4.2f\n", stdev.getAverage(), sharedAudioData->measuredJitter); + //printf("Avg: %4.2f, Stdev: %4.2f\n", stdev.getAverage(), sharedAudioData->measuredJitter); stdev.reset(); } @@ -404,7 +404,7 @@ void *receiveAudioViaUDP(void *args) { if (!ringBuffer->isStarted()) { - printf("Audio packet %d received at %6.0f\n", ++packetsReceivedThisPlayback, usecTimestampNow()/1000); + packetsReceivedThisPlayback++; } else { //printf("Audio packet received at %6.0f\n", usecTimestampNow()/1000); diff --git a/interface/src/Head.cpp b/interface/src/Head.cpp index 2b1222c09d..1bad6e2021 100755 --- a/interface/src/Head.cpp +++ b/interface/src/Head.cpp @@ -550,6 +550,8 @@ void Head::renderHead( int faceToFace, int isMine ) // Always render own hand, but don't render head unless showing face2face glEnable(GL_DEPTH_TEST); + glEnable(GL_RESCALE_NORMAL); + glPushMatrix(); //glScalef(scale, scale, scale); @@ -580,17 +582,14 @@ void Head::renderHead( int faceToFace, int isMine ) glRotatef(Roll, 0, 0, 1); // Overall scale of head - if (faceToFace) glScalef(1.5, 2.0, 2.0); + if (faceToFace) glScalef(2.0, 2.0, 2.0); else glScalef(0.75, 1.0, 1.0); glColor3fv(skinColor); - // Head glutSolidSphere(1, 30, 30); - - //std::cout << distanceToCamera << "\n"; - + // Ears glPushMatrix(); glTranslatef(1.0, 0, 0); diff --git a/interface/src/main.cpp b/interface/src/main.cpp index e7f794e0b7..3967e16842 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -609,7 +609,7 @@ void display(void) { myCamera.setYaw ( - myHead.getAvatarYaw() ); myCamera.setUp ( 0.4 ); - myCamera.setDistance( 0.08 ); + myCamera.setDistance( 0.08 ); myCamera.update(); } else @@ -619,7 +619,7 @@ void display(void) { myCamera.setYaw ( 180.0 - myHead.getAvatarYaw() ); myCamera.setUp ( 0.15 ); - myCamera.setDistance( 0.08 ); + myCamera.setDistance( 0.08 ); myCamera.update(); } diff --git a/mixer/src/main.cpp b/mixer/src/main.cpp index 80c2452e2f..7a8705b645 100644 --- a/mixer/src/main.cpp +++ b/mixer/src/main.cpp @@ -287,7 +287,7 @@ int main(int argc, const char * argv[]) stdev.addValue(tDiff); if (stdev.getSamples() > 500) { - printf("Avg: %4.2f, Stdev: %4.2f\n", stdev.getAverage(), stdev.getStDev()); + //printf("Avg: %4.2f, Stdev: %4.2f\n", stdev.getAverage(), stdev.getStDev()); stdev.reset(); } } diff --git a/shared/src/AgentList.cpp b/shared/src/AgentList.cpp index c3f4183fcd..1e01487348 100644 --- a/shared/src/AgentList.cpp +++ b/shared/src/AgentList.cpp @@ -74,7 +74,7 @@ void AgentList::processAgentData(sockaddr *senderAddress, void *packetData, size updateList((unsigned char *)packetData, dataBytes); break; } - case PACKET_HEADER_HEAD: { + case PACKET_HEADER_HEAD_DATA: { // head data from another agent updateAgentWithData(senderAddress, packetData, dataBytes); break; @@ -324,7 +324,7 @@ void *checkInWithDomainServer(void *args) { sockaddr_in tempAddress; memcpy(&tempAddress.sin_addr, pHostInfo->h_addr_list[0], pHostInfo->h_length); strcpy(DOMAIN_IP, inet_ntoa(tempAddress.sin_addr)); - printf("Domain server %s: %s\n", DOMAIN_HOSTNAME, DOMAIN_IP); + printf("Domain server %s: \n", DOMAIN_HOSTNAME); } else { printf("Failed lookup domainserver\n"); diff --git a/shared/src/PacketHeaders.h b/shared/src/PacketHeaders.h index bc13cc625b..280aa69d70 100644 --- a/shared/src/PacketHeaders.h +++ b/shared/src/PacketHeaders.h @@ -15,6 +15,12 @@ const char PACKET_HEADER_DOMAIN = 'D'; const char PACKET_HEADER_PING = 'P'; const char PACKET_HEADER_PING_REPLY = 'R'; -const char PACKET_HEADER_HEAD = 'H'; +const char PACKET_HEADER_HEAD_DATA = 'H'; +const char PACKET_HEADER_Z_COMMAND = 'Z'; +const char PACKET_HEADER_INJECT_AUDIO = 'I'; +const char PACKET_HEADER_SET_VOXEL = 'S'; +const char PACKET_HEADER_ERASE_VOXEL = 'E'; +const char PACKET_HEADER_VOXEL_DATA = 'V'; +const char PACKET_HEADER_TRANSMITTER_DATA = 't'; #endif