From eb991b60ce735c35ec2cbab11efa3ef1ecb325c2 Mon Sep 17 00:00:00 2001 From: Philip Rosedale Date: Sat, 3 May 2014 09:08:26 -0700 Subject: [PATCH] =?UTF-8?q?Remove=20dead=20=E2=80=98play=20slaps=E2=80=99?= =?UTF-8?q?=20code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interface/src/Menu.cpp | 1 - interface/src/Menu.h | 1 - interface/src/avatar/Hand.cpp | 66 ----------------------------------- interface/src/avatar/Hand.h | 3 -- 4 files changed, 71 deletions(-) diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index baa82a2f6a..c492af3964 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -336,7 +336,6 @@ Menu::Menu() : SLOT(setFilter(bool))); addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::DisplayHands, 0, true); addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::DisplayHandTargets, 0, false); - addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::PlaySlaps, 0, false); addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::HandsCollideWithSelf, 0, false); addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::ShowIKConstraints, 0, false); addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::AlignForearmsWithWrists, 0, true); diff --git a/interface/src/Menu.h b/interface/src/Menu.h index da2585f81a..9a7dda9111 100644 --- a/interface/src/Menu.h +++ b/interface/src/Menu.h @@ -340,7 +340,6 @@ namespace MenuOption { const QString Particles = "Particles"; const QString PasteToVoxel = "Paste to Voxel..."; const QString PipelineWarnings = "Show Render Pipeline Warnings"; - const QString PlaySlaps = "Play Slaps"; const QString Preferences = "Preferences..."; const QString Quit = "Quit"; const QString ReloadAllScripts = "Reload All Scripts"; diff --git a/interface/src/avatar/Hand.cpp b/interface/src/avatar/Hand.cpp index 0f0df8a484..1ee22d3edf 100644 --- a/interface/src/avatar/Hand.cpp +++ b/interface/src/avatar/Hand.cpp @@ -55,76 +55,10 @@ void Hand::simulate(float deltaTime, bool isMine) { } } -void Hand::playSlaps(PalmData& palm, Avatar* avatar) { - // Check for palm collisions - glm::vec3 myPalmPosition = palm.getPosition(); - float palmCollisionDistance = 0.1f; - bool wasColliding = palm.getIsCollidingWithPalm(); - palm.setIsCollidingWithPalm(false); - // If 'Play Slaps' is enabled, look for palm-to-palm collisions and make sound - for (size_t j = 0; j < avatar->getHand()->getNumPalms(); j++) { - PalmData& otherPalm = avatar->getHand()->getPalms()[j]; - if (!otherPalm.isActive()) { - continue; - } - glm::vec3 otherPalmPosition = otherPalm.getPosition(); - if (glm::length(otherPalmPosition - myPalmPosition) < palmCollisionDistance) { - palm.setIsCollidingWithPalm(true); - if (!wasColliding) { - const float PALM_COLLIDE_VOLUME = 1.f; - const float PALM_COLLIDE_FREQUENCY = 1000.f; - const float PALM_COLLIDE_DURATION_MAX = 0.75f; - const float PALM_COLLIDE_DECAY_PER_SAMPLE = 0.01f; - Application::getInstance()->getAudio()->startDrumSound(PALM_COLLIDE_VOLUME, - PALM_COLLIDE_FREQUENCY, - PALM_COLLIDE_DURATION_MAX, - PALM_COLLIDE_DECAY_PER_SAMPLE); - // If the other person's palm is in motion, move mine downward to show I was hit - const float MIN_VELOCITY_FOR_SLAP = 0.05f; - if (glm::length(otherPalm.getVelocity()) > MIN_VELOCITY_FOR_SLAP) { - // add slapback here - } - } - } - } -} - // We create a static CollisionList that is recycled for each collision test. const float MAX_COLLISIONS_PER_AVATAR = 32; static CollisionList handCollisions(MAX_COLLISIONS_PER_AVATAR); -void Hand::collideAgainstAvatarOld(Avatar* avatar, bool isMyHand) { - if (!avatar || avatar == _owningAvatar) { - // don't collide with our own hands (that is done elsewhere) - return; - } - float scaledPalmRadius = PALM_COLLISION_RADIUS * _owningAvatar->getScale(); - for (size_t i = 0; i < getNumPalms(); i++) { - PalmData& palm = getPalms()[i]; - if (!palm.isActive()) { - continue; - } - if (isMyHand && Menu::getInstance()->isOptionChecked(MenuOption::PlaySlaps)) { - playSlaps(palm, avatar); - } - - glm::vec3 totalPenetration; - handCollisions.clear(); - if (avatar->findSphereCollisions(palm.getPosition(), scaledPalmRadius, handCollisions)) { - for (int j = 0; j < handCollisions.size(); ++j) { - CollisionInfo* collision = handCollisions.getCollision(j); - if (isMyHand) { - totalPenetration = addPenetrations(totalPenetration, collision->_penetration); - } - } - } - if (isMyHand) { - // resolve penetration - palm.addToPosition(-totalPenetration); - } - } -} - void Hand::collideAgainstAvatar(Avatar* avatar, bool isMyHand) { if (!avatar || avatar == _owningAvatar) { // don't collide hands against ourself (that is done elsewhere) diff --git a/interface/src/avatar/Hand.h b/interface/src/avatar/Hand.h index 1c857a198a..65a7dcb74a 100755 --- a/interface/src/avatar/Hand.h +++ b/interface/src/avatar/Hand.h @@ -58,7 +58,6 @@ public: const glm::vec3& getLeapFingerTipBallPosition (int ball) const { return _leapFingerTipBalls [ball].position;} const glm::vec3& getLeapFingerRootBallPosition(int ball) const { return _leapFingerRootBalls[ball].position;} - void collideAgainstAvatarOld(Avatar* avatar, bool isMyHand); void collideAgainstAvatar(Avatar* avatar, bool isMyHand); void collideAgainstOurself(); @@ -80,8 +79,6 @@ private: void renderLeapFingerTrails(); void calculateGeometry(); - - void playSlaps(PalmData& palm, Avatar* avatar); }; #endif // hifi_Hand_h