diff --git a/interface/src/avatar/Hand.cpp b/interface/src/avatar/Hand.cpp index efbdfa2438..9c62551b00 100644 --- a/interface/src/avatar/Hand.cpp +++ b/interface/src/avatar/Hand.cpp @@ -55,10 +55,6 @@ void Hand::simulate(float deltaTime, bool isMine) { _collisionAge += deltaTime; } - if (isMine) { - _buckyBalls.simulate(deltaTime); - } - calculateGeometry(); if (isMine) { @@ -69,8 +65,7 @@ void Hand::simulate(float deltaTime, bool isMine) { FingerData& finger = palm.getFingers()[0]; // Sixense has only one finger glm::vec3 fingerTipPosition = finger.getTipPosition(); - _buckyBalls.grab(palm, fingerTipPosition, _owningAvatar->getOrientation(), deltaTime); - + if (palm.getControllerButtons() & BUTTON_1) { if (glm::length(fingerTipPosition - _lastFingerAddVoxel) > (FINGERTIP_VOXEL_SIZE / 2.f)) { QColor paintColor = Menu::getInstance()->getActionForOption(MenuOption::VoxelPaintColor)->data().value(); @@ -309,10 +304,6 @@ void Hand::render(bool isMine) { _renderAlpha = 1.0; - if (isMine) { - _buckyBalls.render(); - } - if (Menu::getInstance()->isOptionChecked(MenuOption::RenderSkeletonCollisionProxies)) { // draw a green sphere at hand joint location, which is actually near the wrist) for (size_t i = 0; i < getNumPalms(); i++) { diff --git a/interface/src/avatar/Hand.h b/interface/src/avatar/Hand.h index 9888c9f054..059a83f18a 100755 --- a/interface/src/avatar/Hand.h +++ b/interface/src/avatar/Hand.h @@ -20,7 +20,6 @@ #include #include -#include "BuckyBalls.h" #include "InterfaceConfig.h" #include "world.h" #include "VoxelSystem.h" @@ -81,8 +80,6 @@ private: float _collisionAge; float _collisionDuration; - BuckyBalls _buckyBalls; - // private methods void setLeapHands(const std::vector& handPositions, const std::vector& handNormals); diff --git a/interface/src/avatar/Head.cpp b/interface/src/avatar/Head.cpp index de3f3cd3d8..e27c625bae 100644 --- a/interface/src/avatar/Head.cpp +++ b/interface/src/avatar/Head.cpp @@ -10,6 +10,7 @@ #include "Application.h" #include "Avatar.h" +#include "GeometryUtil.h" #include "Head.h" #include "Menu.h" #include "Util.h"