From 59ef9e5d7ef6583bc23ca6036a2882c788a610dc Mon Sep 17 00:00:00 2001 From: Jeffrey Ventrella Date: Fri, 26 Apr 2013 13:21:49 -0700 Subject: [PATCH] removed incomplete code snippet in Avatar.h --- interface/src/Avatar.cpp | 11 ++++++----- interface/src/Avatar.h | 10 ---------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/interface/src/Avatar.cpp b/interface/src/Avatar.cpp index d2e53c3fbf..3de87186f2 100644 --- a/interface/src/Avatar.cpp +++ b/interface/src/Avatar.cpp @@ -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(); diff --git a/interface/src/Avatar.h b/interface/src/Avatar.h index 20c02eee84..6afb65c904 100644 --- a/interface/src/Avatar.h +++ b/interface/src/Avatar.h @@ -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;