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

cleaned up some code spacing

Browse source
This commit is contained in:
Jeffrey Ventrella 2013-05-13 14:53:05 -07:00
parent 6f1000447b
commit 6c3de00bcd
1 changed files with 3 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
interface/src/Avatar.cpp
View file

@ -467,8 +467,8 @@ void Avatar::checkForMouseRayTouching() {
glm::vec3 directionToBodySphere = glm::normalize(_joint[b].springyPosition - _mouseRayOrigin);
float dot = glm::dot(directionToBodySphere, _mouseRayDirection);
if (dot > (1.0f-JOINT_TOUCH_RANGE)) {
_joint[b].touchForce = (dot - (1.0f-JOINT_TOUCH_RANGE)) / JOINT_TOUCH_RANGE;
if (dot > (1.0f - JOINT_TOUCH_RANGE)) {
_joint[b].touchForce = (dot - (1.0f - JOINT_TOUCH_RANGE)) / JOINT_TOUCH_RANGE;
} else {
_joint[b].touchForce = 0.0;
}
@ -1308,22 +1308,7 @@ void Avatar::renderBody(bool lookingInMirror) {
glPopMatrix();
}
}
/*
// highlight the joint that has the mouse cursor hovering over it.
if (_jointTouched != AVATAR_JOINT_NULL ) {
float r = _joint[_jointTouched].radius * 1.2f + 0.005f;
glColor4f(0.5f, 0.2f, 0.2f, 0.3);
glPushMatrix();
glTranslatef(_joint[_jointTouched].springyPosition.x, _joint[_jointTouched].springyPosition.y, _joint[_jointTouched].springyPosition.z);
glScalef(r, r, r);
glutSolidSphere(1, 20, 20);
glPopMatrix();
}
*/
// Render lines connecting the joint positions
glColor3f(0.4f, 0.5f, 0.6f);
glLineWidth(3.0);