From ba4235c175581cfc27776db21bd169753596736a Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 22 Apr 2013 16:04:46 -0700 Subject: [PATCH 1/4] don't render agents that are not of type avatar --- interface/src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/main.cpp b/interface/src/main.cpp index 675a7d8614..a43a2f0c0f 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -915,7 +915,7 @@ void display(void) for(std::vector::iterator agent = agentList->getAgents().begin(); agent != agentList->getAgents().end(); agent++) { - if (agent->getLinkedData() != NULL) { + if (agent->getLinkedData() != NULL && agent->getType() == AGENT_TYPE_AVATAR) { Head *avatar = (Head *)agent->getLinkedData(); //glPushMatrix(); From 2d8997003a692523c0ca94b0de1cd6187ad68bbd Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 22 Apr 2013 16:16:06 -0700 Subject: [PATCH 2/4] include avatar ID on log output --- libraries/shared/src/Agent.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libraries/shared/src/Agent.cpp b/libraries/shared/src/Agent.cpp index 819e4c185f..637a1bc58a 100644 --- a/libraries/shared/src/Agent.cpp +++ b/libraries/shared/src/Agent.cpp @@ -249,9 +249,14 @@ void Agent::printLog(Agent const& agent) { sockaddr_in *agentPublicSocket = (sockaddr_in *) agent.publicSocket; sockaddr_in *agentLocalSocket = (sockaddr_in *) agent.localSocket; - ::printLog("T: %s (%c) PA: %s:%d LA: %s:%d\n", agent.getTypeName(), agent.type, - inet_ntoa(agentPublicSocket->sin_addr), ntohs(agentPublicSocket->sin_port), - inet_ntoa(agentLocalSocket->sin_addr), ntohs(agentLocalSocket->sin_port)); + ::printLog("ID: %d T: %s (%c) PA: %s:%d LA: %s:%d\n", + agent.agentId, + agent.getTypeName(), + agent.type, + inet_ntoa(agentPublicSocket->sin_addr), + ntohs(agentPublicSocket->sin_port), + inet_ntoa(agentLocalSocket->sin_addr), + ntohs(agentLocalSocket->sin_port)); } std::ostream& operator<<(std::ostream& os, const Agent* agent) { From ea5a247f931dde627e05051c1da3125f661892e8 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 22 Apr 2013 16:22:06 -0700 Subject: [PATCH 3/4] view frustum additions means there are now 94 bytes per avatar --- libraries/avatars/src/AvatarData.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h index df7aa137e5..819333d558 100644 --- a/libraries/avatars/src/AvatarData.h +++ b/libraries/avatars/src/AvatarData.h @@ -13,7 +13,7 @@ #include -const int BYTES_PER_AVATAR = 30; +const int BYTES_PER_AVATAR = 94; class AvatarData : public AgentData { public: From fb703171f2aa278b41a6e3c242d935a487c7476e Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 22 Apr 2013 16:30:45 -0700 Subject: [PATCH 4/4] make other heads the same color and same size --- interface/src/Head.cpp | 32 ++++++++------------------------ 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/interface/src/Head.cpp b/interface/src/Head.cpp index 6c4b4a9d35..d75a3012fd 100644 --- a/interface/src/Head.cpp +++ b/interface/src/Head.cpp @@ -718,41 +718,25 @@ void Head::renderHead(int faceToFace) { glPushMatrix(); if (_usingBodySprings) { - glTranslatef - ( - _bone[ AVATAR_BONE_HEAD ].springyPosition.x, - _bone[ AVATAR_BONE_HEAD ].springyPosition.y, - _bone[ AVATAR_BONE_HEAD ].springyPosition.z - ); + glTranslatef(_bone[ AVATAR_BONE_HEAD ].springyPosition.x, + _bone[ AVATAR_BONE_HEAD ].springyPosition.y, + _bone[ AVATAR_BONE_HEAD ].springyPosition.z); } else { - glTranslatef - ( - _bone[ AVATAR_BONE_HEAD ].position.x, - _bone[ AVATAR_BONE_HEAD ].position.y, - _bone[ AVATAR_BONE_HEAD ].position.z - ); + glTranslatef(_bone[ AVATAR_BONE_HEAD ].position.x, + _bone[ AVATAR_BONE_HEAD ].position.y, + _bone[ AVATAR_BONE_HEAD ].position.z); } - glScalef( 0.03, 0.03, 0.03 ); glRotatef(_head.yaw, 0, 1, 0); glRotatef(_head.pitch, 1, 0, 0); glRotatef(_head.roll, 0, 0, 1); - // Overall scale of head - if (faceToFace) glScalef(2.0, 2.0, 2.0); - else glScalef(0.75, 1.0, 1.0); + glScalef(2.0, 2.0, 2.0); + glColor3fv(skinColor); - - // Head - if (_isMine) { - glColor3fv(skinColor); - } - else { - glColor3f(0,0,1); // Temp: Other people are BLUE - } glutSolidSphere(1, 30, 30); // Ears