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

Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels

Browse source
This commit is contained in:
Andrzej Kapolka 2014-01-23 11:21:07 -08:00
commit b5cba2786e
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/Menu.cpp
View file

@ -355,6 +355,7 @@ Menu::Menu() :
addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::DisplayHandTargets, 0, false); addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::DisplayHandTargets, 0, false);
addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::VoxelDrumming, 0, false); addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::VoxelDrumming, 0, false);
addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::PlaySlaps, 0, false); addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::PlaySlaps, 0, false);
addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::HandsCollideWithSelf, 0, false);
addDisabledActionAndSeparator(developerMenu, "Testing"); addDisabledActionAndSeparator(developerMenu, "Testing");

1
interface/src/Menu.h
View file

@ -192,6 +192,7 @@ namespace MenuOption {
const QString ExportVoxels = "Export Voxels"; const QString ExportVoxels = "Export Voxels";
const QString DontFadeOnVoxelServerChanges = "Don't Fade In/Out on Voxel Server Changes"; const QString DontFadeOnVoxelServerChanges = "Don't Fade In/Out on Voxel Server Changes";
const QString HeadMouse = "Head Mouse"; const QString HeadMouse = "Head Mouse";
const QString HandsCollideWithSelf = "Collide With Self";
const QString FaceshiftTCP = "Faceshift (TCP)"; const QString FaceshiftTCP = "Faceshift (TCP)";
const QString FalseColorByDistance = "FALSE Color By Distance"; const QString FalseColorByDistance = "FALSE Color By Distance";
const QString FalseColorBySource = "FALSE Color By Source"; const QString FalseColorBySource = "FALSE Color By Source";

18
interface/src/avatar/Hand.cpp
View file

@ -231,14 +231,16 @@ void Hand::updateCollisions() {
} }
} }
// and the current avatar (ignoring everything below the parent of the parent of the last free joint) if (Menu::getInstance()->isOptionChecked(MenuOption::HandsCollideWithSelf)) {
glm::vec3 owningPenetration; // and the current avatar (ignoring everything below the parent of the parent of the last free joint)
const Model& skeletonModel = _owningAvatar->getSkeletonModel(); glm::vec3 owningPenetration;
int skipIndex = skeletonModel.getParentJointIndex(skeletonModel.getParentJointIndex( const Model& skeletonModel = _owningAvatar->getSkeletonModel();
skeletonModel.getLastFreeJointIndex((i == leftPalmIndex) ? skeletonModel.getLeftHandJointIndex() : int skipIndex = skeletonModel.getParentJointIndex(skeletonModel.getParentJointIndex(
(i == rightPalmIndex) ? skeletonModel.getRightHandJointIndex() : -1))); skeletonModel.getLastFreeJointIndex((i == leftPalmIndex) ? skeletonModel.getLeftHandJointIndex() :
if (_owningAvatar->findSpherePenetration(palm.getPosition(), scaledPalmRadius, owningPenetration, skipIndex)) { (i == rightPalmIndex) ? skeletonModel.getRightHandJointIndex() : -1)));
totalPenetration = addPenetrations(totalPenetration, owningPenetration); if (_owningAvatar->findSpherePenetration(palm.getPosition(), scaledPalmRadius, owningPenetration, skipIndex)) {
totalPenetration = addPenetrations(totalPenetration, owningPenetration);
}
} }
// un-penetrate // un-penetrate