Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 20:44:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

removed incomplete code snippet in Avatar.h

Browse source
This commit is contained in:
Jeffrey Ventrella 2013-04-26 13:21:49 -07:00
parent e9592f9360
commit 59ef9e5d7e
2 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
interface/src/Avatar.cpp
View file

@ -592,6 +592,7 @@ void Avatar::updateAvatarCollisionDetectionAndResponse(glm::vec3 collisionPositi
}
void Avatar::render(bool lookingInMirror) {
/*
// show avatar position
glColor4f( 0.5f, 0.5f, 0.5f, 0.6 );
@ -958,11 +959,11 @@ void Avatar::initializeSkeleton() {
calculateBoneLengths();
_pelvisStandingHeight =
_bone[ AVATAR_BONE_PELVIS_SPINE ].length +
_bone[ AVATAR_BONE_LEFT_THIGH ].length +
_bone[ AVATAR_BONE_LEFT_SHIN ].length +
_bone[ AVATAR_BONE_LEFT_FOOT ].length +
_bone[ AVATAR_BONE_RIGHT_FOOT ].radius;
_bone[ AVATAR_BONE_PELVIS_SPINE ].length +
_bone[ AVATAR_BONE_LEFT_THIGH ].length +
_bone[ AVATAR_BONE_LEFT_SHIN ].length +
_bone[ AVATAR_BONE_LEFT_FOOT ].length +
_bone[ AVATAR_BONE_RIGHT_FOOT ].radius;
// generate world positions
updateSkeleton();

10
interface/src/Avatar.h
View file

@ -89,16 +89,6 @@ enum AvatarBoneID
NUM_AVATAR_BONES
};
/*
static glm::vec3 avatarDefaultPose[NUM_AVATAR_BONES] =
{
glm::vec3( 0.0f, 0.0f, 0.0f ),
glm::vec3( 0.0f, 0.0f, 0.0f )
};
*/
struct AvatarCollisionElipsoid
{
bool colliding;