use "visible joint positions" for MyAvatar only

Andrew Meadows committed 12 years ago

Commit ca4a23e1 parent ee0d0a11 file · +2 −1Browse files

Showing the changes to interface/src/avatar/SkeletonModel.cpp (1 of 1 file). Show all

Unified · Split

interface/src/avatar/SkeletonModel.cpp+2−1

@@ -432,7 +432,8 @@ bool SkeletonModel::getHeadPosition(glm::vec3& headPosition) const { · 431 unmodified lines
432	}	432	}
433		433
434	bool SkeletonModel::getNeckPosition(glm::vec3& neckPosition) const {	434	bool SkeletonModel::getNeckPosition(glm::vec3& neckPosition) const {
435	if (Menu::getInstance()->isOptionChecked(MenuOption::CollideAsRagdoll)) {	435	if (_owningAvatar->isMyAvatar() &&
		436	Menu::getInstance()->isOptionChecked(MenuOption::CollideAsRagdoll)) {
436	return isActive() && getVisibleJointPositionInWorldFrame(_geometry->getFBXGeometry().neckJointIndex, neckPosition);	437	return isActive() && getVisibleJointPositionInWorldFrame(_geometry->getFBXGeometry().neckJointIndex, neckPosition);
437	}	438	}
438	return isActive() && getJointPositionInWorldFrame(_geometry->getFBXGeometry().neckJointIndex, neckPosition);	439	return isActive() && getJointPositionInWorldFrame(_geometry->getFBXGeometry().neckJointIndex, neckPosition);