diff --git a/interface/src/Head.cpp b/interface/src/Head.cpp index adcec11297..8cf831d426 100644 --- a/interface/src/Head.cpp +++ b/interface/src/Head.cpp @@ -38,8 +38,6 @@ vector iris_texture; unsigned int iris_texture_width = 512; unsigned int iris_texture_height = 256; -GLUquadric *sphere = gluNewQuadric(); - Head::Head() { position = glm::vec3(0,0,0); @@ -80,6 +78,8 @@ Head::Head() browAudioLift = 0.0; noise = 0; + sphere = NULL; + hand = new Hand(glm::vec3(skinColor[0], skinColor[1], skinColor[2])); if (iris_texture.size() == 0) { @@ -135,12 +135,14 @@ Head::Head(const Head &otherHead) { browAudioLift = otherHead.browAudioLift; noise = otherHead.noise; + sphere = NULL; + Hand newHand = Hand(*otherHead.hand); hand = &newHand; } Head::~Head() { - if (sphere) { + if (sphere != NULL) { gluDeleteQuadric(sphere); } } @@ -454,7 +456,7 @@ void Head::render(int faceToFace, int isMine) glPopMatrix(); // Right Pupil - if (!sphere) { + if (sphere == NULL) { sphere = gluNewQuadric(); gluQuadricTexture(sphere, GL_TRUE); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); diff --git a/interface/src/Head.h b/interface/src/Head.h index 6ab4368d82..abde89deea 100644 --- a/interface/src/Head.h +++ b/interface/src/Head.h @@ -130,6 +130,8 @@ class Head : public AgentData { int eyeContact; eyeContactTargets eyeContactTarget; + GLUquadric *sphere; + void readSensors(); float renderYaw, renderPitch; // Pitch from view frustum when this is own head.