From c214e9b179f2f68863cefa5d9a6a8adcdb941eb0 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 17 May 2013 10:46:59 -0700 Subject: [PATCH] use the default Avatar destructor, comment out unused consts in Head --- interface/src/Avatar.h | 1 - interface/src/Head.cpp | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/interface/src/Avatar.h b/interface/src/Avatar.h index 1533de4e5c..a3f46cc542 100644 --- a/interface/src/Avatar.h +++ b/interface/src/Avatar.h @@ -76,7 +76,6 @@ enum AvatarJointID class Avatar : public AvatarData { public: Avatar(bool isMine); - ~Avatar(); Avatar(const Avatar &otherAvatar); Avatar* clone() const; diff --git a/interface/src/Head.cpp b/interface/src/Head.cpp index 214f894a33..28cbe35cec 100644 --- a/interface/src/Head.cpp +++ b/interface/src/Head.cpp @@ -297,10 +297,10 @@ void Head::render(bool lookingInMirror) { glPopMatrix(); // Mouth - const float MIN_LOUDNESS_SCALE_WIDTH = 0.7f; - const float WIDTH_SENSITIVITY = 60.f; - const float HEIGHT_SENSITIVITY = 30.f; - const float MIN_LOUDNESS_SCALE_HEIGHT = 1.0f; +// const float MIN_LOUDNESS_SCALE_WIDTH = 0.7f; +// const float WIDTH_SENSITIVITY = 60.f; +// const float HEIGHT_SENSITIVITY = 30.f; +// const float MIN_LOUDNESS_SCALE_HEIGHT = 1.0f; glPushMatrix(); glTranslatef(0,-0.35,0.75); glColor3f(0,0,0);