From a1ea7b58ddac9d2fbc765ca1f2d6a4a45d324c81 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 17 May 2013 10:45:26 -0700 Subject: [PATCH] remove unused GLUQuadric sphere from Avatar class --- interface/src/Avatar.cpp | 12 +----------- interface/src/Avatar.h | 1 - 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/interface/src/Avatar.cpp b/interface/src/Avatar.cpp index eb2b0d07e6..954a4a38bc 100644 --- a/interface/src/Avatar.cpp +++ b/interface/src/Avatar.cpp @@ -60,7 +60,6 @@ float chatMessageHeight = 0.45; Avatar::Avatar(bool isMine) { - _orientation.setToIdentity(); _velocity = glm::vec3(0.0f, 0.0f, 0.0f); @@ -94,7 +93,6 @@ Avatar::Avatar(bool isMine) { for (int i = 0; i < MAX_DRIVE_KEYS; i++) _driveKeys[i] = false; _movedHandOffset = glm::vec3(0.0f, 0.0f, 0.0f); - _sphere = NULL; _handHoldingPosition = glm::vec3(0.0f, 0.0f, 0.0f); _distanceToNearestAvatar = std::numeric_limits::max(); _gravity = glm::vec3(0.0f, -1.0f, 0.0f); @@ -109,7 +107,7 @@ Avatar::Avatar(bool isMine) { else { _balls = NULL; } } -Avatar::Avatar(const Avatar &otherAvatar) :_head(otherAvatar._head) { //include the copy constructor for head +Avatar::Avatar(const Avatar &otherAvatar) : _head(otherAvatar._head) { //include the copy constructor for head _velocity = otherAvatar._velocity; _thrust = otherAvatar._thrust; @@ -138,8 +136,6 @@ Avatar::Avatar(const Avatar &otherAvatar) :_head(otherAvatar._head) { //include _orientation.set(otherAvatar._orientation); - _sphere = NULL; - initializeSkeleton(); for (int i = 0; i < MAX_DRIVE_KEYS; i++) _driveKeys[i] = otherAvatar._driveKeys[i]; @@ -150,12 +146,6 @@ Avatar::Avatar(const Avatar &otherAvatar) :_head(otherAvatar._head) { //include } -Avatar::~Avatar() { - if (_sphere != NULL) { - gluDeleteQuadric(_sphere); - } -} - Avatar* Avatar::clone() const { return new Avatar(*this); } diff --git a/interface/src/Avatar.h b/interface/src/Avatar.h index 18565a6db5..1533de4e5c 100644 --- a/interface/src/Avatar.h +++ b/interface/src/Avatar.h @@ -179,7 +179,6 @@ private: float _maxArmLength; Orientation _orientation; int _driveKeys[MAX_DRIVE_KEYS]; - GLUquadric* _sphere; float _renderYaw; float _renderPitch; // Pitch from view frustum when this is own head bool _transmitterIsFirstData;