Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 06:38:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed avatar lighting, head scaling, removed some extra log messages

Browse source
This commit is contained in:
Philip Rosedale 2013-04-08 21:13:20 -07:00
parent 492ea68741
commit 87fd0f7a91
6 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interface/src/Audio.cpp
View file

@ -231,19 +231,19 @@ int audioCallback (const void *inputBuffer,
if (ringBuffer->getEndOfLastWrite() != NULL) { if (ringBuffer->getEndOfLastWrite() != NULL) {
if (!ringBuffer->isStarted() && ringBuffer->diffLastWriteNextOutput() < PACKET_LENGTH_SAMPLES + JITTER_BUFFER_SAMPLES) { 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) { } else if (ringBuffer->diffLastWriteNextOutput() < PACKET_LENGTH_SAMPLES) {
ringBuffer->setStarted(false); ringBuffer->setStarted(false);
starve_counter++; starve_counter++;
packetsReceivedThisPlayback = 0; 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. data->wasStarved = 10; // Frames to render the indication that the system was starved.
} else { } else {
if (!ringBuffer->isStarted()) { if (!ringBuffer->isStarted()) {
ringBuffer->setStarted(true); 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 { } else {
//printf("pushing buffer\n"); //printf("pushing buffer\n");
} }
@ -396,7 +396,7 @@ void *receiveAudioViaUDP(void *args) {
if (totalPacketsReceived > 3) stdev.addValue(tDiff); if (totalPacketsReceived > 3) stdev.addValue(tDiff);
if (stdev.getSamples() > 500) { if (stdev.getSamples() > 500) {
sharedAudioData->measuredJitter = stdev.getStDev(); 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(); stdev.reset();
} }
@ -404,7 +404,7 @@ void *receiveAudioViaUDP(void *args) {
if (!ringBuffer->isStarted()) { if (!ringBuffer->isStarted()) {
printf("Audio packet %d received at %6.0f\n", ++packetsReceivedThisPlayback, usecTimestampNow()/1000); packetsReceivedThisPlayback++;
} }
else { else {
//printf("Audio packet received at %6.0f\n", usecTimestampNow()/1000); //printf("Audio packet received at %6.0f\n", usecTimestampNow()/1000);

9
interface/src/Head.cpp
View file

@ -550,6 +550,8 @@ void Head::renderHead( int faceToFace, int isMine )
// Always render own hand, but don't render head unless showing face2face // Always render own hand, but don't render head unless showing face2face
glEnable(GL_DEPTH_TEST); glEnable(GL_DEPTH_TEST);
glEnable(GL_RESCALE_NORMAL);
glPushMatrix(); glPushMatrix();
//glScalef(scale, scale, scale); //glScalef(scale, scale, scale);
@ -580,17 +582,14 @@ void Head::renderHead( int faceToFace, int isMine )
glRotatef(Roll, 0, 0, 1); glRotatef(Roll, 0, 0, 1);
// Overall scale of head // 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); else glScalef(0.75, 1.0, 1.0);
glColor3fv(skinColor); glColor3fv(skinColor);
// Head // Head
glutSolidSphere(1, 30, 30); glutSolidSphere(1, 30, 30);
//std::cout << distanceToCamera << "\n";
// Ears // Ears
glPushMatrix(); glPushMatrix();
glTranslatef(1.0, 0, 0); glTranslatef(1.0, 0, 0);

4
interface/src/main.cpp
View file

@ -609,7 +609,7 @@ void display(void)
{ {
myCamera.setYaw ( - myHead.getAvatarYaw() ); myCamera.setYaw ( - myHead.getAvatarYaw() );
myCamera.setUp ( 0.4 ); myCamera.setUp ( 0.4 );
myCamera.setDistance( 0.08 ); myCamera.setDistance( 0.08 );
myCamera.update(); myCamera.update();
} }
else else
@ -619,7 +619,7 @@ void display(void)
{ {
myCamera.setYaw ( 180.0 - myHead.getAvatarYaw() ); myCamera.setYaw ( 180.0 - myHead.getAvatarYaw() );
myCamera.setUp ( 0.15 ); myCamera.setUp ( 0.15 );
myCamera.setDistance( 0.08 ); myCamera.setDistance( 0.08 );
myCamera.update(); myCamera.update();
} }

2
mixer/src/main.cpp
View file

@ -287,7 +287,7 @@ int main(int argc, const char * argv[])
stdev.addValue(tDiff); stdev.addValue(tDiff);
if (stdev.getSamples() > 500) { 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(); stdev.reset();
} }
} }

4
shared/src/AgentList.cpp
View file

@ -74,7 +74,7 @@ void AgentList::processAgentData(sockaddr *senderAddress, void *packetData, size
updateList((unsigned char *)packetData, dataBytes); updateList((unsigned char *)packetData, dataBytes);
break; break;
} }
case PACKET_HEADER_HEAD: { case PACKET_HEADER_HEAD_DATA: {
// head data from another agent // head data from another agent
updateAgentWithData(senderAddress, packetData, dataBytes); updateAgentWithData(senderAddress, packetData, dataBytes);
break; break;
@ -324,7 +324,7 @@ void *checkInWithDomainServer(void *args) {
sockaddr_in tempAddress; sockaddr_in tempAddress;
memcpy(&tempAddress.sin_addr, pHostInfo->h_addr_list[0], pHostInfo->h_length); memcpy(&tempAddress.sin_addr, pHostInfo->h_addr_list[0], pHostInfo->h_length);
strcpy(DOMAIN_IP, inet_ntoa(tempAddress.sin_addr)); 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 { } else {
printf("Failed lookup domainserver\n"); printf("Failed lookup domainserver\n");

8
shared/src/PacketHeaders.h
View file

@ -15,6 +15,12 @@
const char PACKET_HEADER_DOMAIN = 'D'; const char PACKET_HEADER_DOMAIN = 'D';
const char PACKET_HEADER_PING = 'P'; const char PACKET_HEADER_PING = 'P';
const char PACKET_HEADER_PING_REPLY = 'R'; 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 #endif