From 2fad4153a9a333a17a73c3bf94627ff6b9be4710 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Thu, 12 Mar 2015 16:34:27 -0700 Subject: [PATCH] remove unused Avatar::getBoundingRadius() --- interface/src/avatar/Avatar.cpp | 5 ----- interface/src/avatar/Avatar.h | 3 --- 2 files changed, 8 deletions(-) diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp index a0fa21c674..75d77b780a 100644 --- a/interface/src/avatar/Avatar.cpp +++ b/interface/src/avatar/Avatar.cpp @@ -1026,11 +1026,6 @@ float Avatar::getHeadHeight() const { return DEFAULT_HEAD_HEIGHT; } -float Avatar::getBoundingRadius() const { - // TODO: also use head model when computing the avatar's bounding radius - return _skeletonModel.getBoundingRadius(); -} - float Avatar::getPelvisFloatingHeight() const { return -_skeletonModel.getBindExtents().minimum.y; } diff --git a/interface/src/avatar/Avatar.h b/interface/src/avatar/Avatar.h index e9a21af98e..0cde800be0 100644 --- a/interface/src/avatar/Avatar.h +++ b/interface/src/avatar/Avatar.h @@ -133,9 +133,6 @@ public: virtual void applyCollision(const glm::vec3& contactPoint, const glm::vec3& penetration) { } - /// \return bounding radius of avatar - virtual float getBoundingRadius() const; - Q_INVOKABLE void setSkeletonOffset(const glm::vec3& offset); Q_INVOKABLE glm::vec3 getSkeletonOffset() { return _skeletonOffset; } virtual glm::vec3 getSkeletonPosition() const;