From 217080fe1db781821ffe044934a12d7d209d4e50 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Fri, 9 May 2014 10:27:01 -0700 Subject: [PATCH] cleanup - remove unused leap fingers --- interface/src/avatar/Avatar.cpp | 1 - interface/src/avatar/Hand.cpp | 79 +------------------------------ interface/src/avatar/Hand.h | 12 ----- interface/src/avatar/MyAvatar.cpp | 1 - 4 files changed, 2 insertions(+), 91 deletions(-) diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp index bac339813f..4de608fc6b 100644 --- a/interface/src/avatar/Avatar.cpp +++ b/interface/src/avatar/Avatar.cpp @@ -73,7 +73,6 @@ const float BILLBOARD_LOD_DISTANCE = 40.0f; void Avatar::init() { getHead()->init(); - getHand()->init(); _skeletonModel.init(); _initialized = true; _shouldRenderBillboard = (getLODDistance() >= BILLBOARD_LOD_DISTANCE); diff --git a/interface/src/avatar/Hand.cpp b/interface/src/avatar/Hand.cpp index a6cd7ff10e..576790714e 100644 --- a/interface/src/avatar/Hand.cpp +++ b/interface/src/avatar/Hand.cpp @@ -29,22 +29,11 @@ const float PALM_COLLISION_RADIUS = 0.03f; Hand::Hand(Avatar* owningAvatar) : HandData((AvatarData*)owningAvatar), - - _owningAvatar(owningAvatar), - _renderAlpha(1.0) + _owningAvatar(owningAvatar) { } -void Hand::init() { -} - -void Hand::reset() { -} - void Hand::simulate(float deltaTime, bool isMine) { - - calculateGeometry(); - if (isMine) { // Iterate hand controllers, take actions as needed for (size_t i = 0; i < getNumPalms(); ++i) { @@ -146,55 +135,7 @@ void Hand::resolvePenetrations() { } } -void Hand::calculateGeometry() { - // generate finger tip balls.... - _leapFingerTipBalls.clear(); - for (size_t i = 0; i < getNumPalms(); ++i) { - PalmData& palm = getPalms()[i]; - if (palm.isActive()) { - for (size_t f = 0; f < palm.getNumFingers(); ++f) { - FingerData& finger = palm.getFingers()[f]; - if (finger.isActive()) { - const float standardBallRadius = FINGERTIP_COLLISION_RADIUS; - HandBall ball; - ball.rotation = getBaseOrientation(); - ball.position = finger.getTipPosition(); - ball.radius = standardBallRadius; - ball.touchForce = 0.0; - ball.isCollidable = true; - ball.isColliding = false; - _leapFingerTipBalls.push_back(ball); - } - } - } - } - - // generate finger root balls.... - _leapFingerRootBalls.clear(); - for (size_t i = 0; i < getNumPalms(); ++i) { - PalmData& palm = getPalms()[i]; - if (palm.isActive()) { - for (size_t f = 0; f < palm.getNumFingers(); ++f) { - FingerData& finger = palm.getFingers()[f]; - if (finger.isActive()) { - const float standardBallRadius = 0.005f; - HandBall ball; - ball.rotation = getBaseOrientation(); - ball.position = finger.getRootPosition(); - ball.radius = standardBallRadius; - ball.touchForce = 0.0; - ball.isCollidable = true; - ball.isColliding = false; - _leapFingerRootBalls.push_back(ball); - } - } - } - } -} - void Hand::render(bool isMine, Model::RenderMode renderMode) { - _renderAlpha = 1.0; - if (renderMode != Model::SHADOW_RENDER_MODE && Menu::getInstance()->isOptionChecked(MenuOption::RenderSkeletonCollisionShapes)) { // draw a green sphere at hand joint location, which is actually near the wrist) @@ -218,7 +159,6 @@ void Hand::render(bool isMine, Model::RenderMode renderMode) { glEnable(GL_DEPTH_TEST); glEnable(GL_RESCALE_NORMAL); - } void Hand::renderHandTargets(bool isMine) { @@ -239,6 +179,7 @@ void Hand::renderHandTargets(bool isMine) { glm::vec3 targetPosition; palm.getBallHoldPosition(targetPosition); glPushMatrix(); + glTranslatef(targetPosition.x, targetPosition.y, targetPosition.z); const float collisionRadius = 0.05f; glColor4f(0.5f,0.5f,0.5f, alpha); @@ -247,22 +188,6 @@ void Hand::renderHandTargets(bool isMine) { } } - glPushMatrix(); - // Draw the leap balls - for (size_t i = 0; i < _leapFingerTipBalls.size(); i++) { - if (alpha > 0.0f) { - if (_leapFingerTipBalls[i].isColliding) { - glColor4f(handColor.r, 0, 0, alpha); - } else { - glColor4f(handColor.r, handColor.g, handColor.b, alpha); - } - glPushMatrix(); - glTranslatef(_leapFingerTipBalls[i].position.x, _leapFingerTipBalls[i].position.y, _leapFingerTipBalls[i].position.z); - glutSolidSphere(_leapFingerTipBalls[i].radius, 20.0f, 20.0f); - glPopMatrix(); - } - } - const float PALM_BALL_RADIUS = 0.03f; const float PALM_DISK_RADIUS = 0.06f; const float PALM_DISK_THICKNESS = 0.01f; diff --git a/interface/src/avatar/Hand.h b/interface/src/avatar/Hand.h index 9c2bc2c2c0..5d171f2809 100755 --- a/interface/src/avatar/Hand.h +++ b/interface/src/avatar/Hand.h @@ -50,15 +50,9 @@ public: float touchForce; // a scalar determining the amount that the cursor (or hand) is penetrating the ball }; - void init(); - void reset(); void simulate(float deltaTime, bool isMine); void render(bool isMine, Model::RenderMode renderMode = Model::DEFAULT_RENDER_MODE); - // getters - const glm::vec3& getLeapFingerTipBallPosition (int ball) const { return _leapFingerTipBalls [ball].position;} - const glm::vec3& getLeapFingerRootBallPosition(int ball) const { return _leapFingerRootBalls[ball].position;} - void collideAgainstAvatar(Avatar* avatar, bool isMyHand); void collideAgainstOurself(); @@ -72,14 +66,8 @@ private: int _controllerButtons; /// Button states read from hand-held controllers Avatar* _owningAvatar; - float _renderAlpha; - std::vector _leapFingerTipBalls; - std::vector _leapFingerRootBalls; void renderHandTargets(bool isMine); - void renderLeapFingerTrails(); - - void calculateGeometry(); }; #endif // hifi_Hand_h diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 6d7962bff1..6ce362071b 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -97,7 +97,6 @@ MyAvatar::~MyAvatar() { void MyAvatar::reset() { _skeletonModel.reset(); getHead()->reset(); - getHand()->reset(); _oculusYawOffset = 0.0f; setVelocity(glm::vec3(0.0f));