Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 23:17:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/worklist/hifi

Browse source
This commit is contained in:
ZappoMan 2013-03-28 14:00:58 -07:00
commit ed6195f3a0
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interface/src/Head.cpp
View file

@ -38,8 +38,6 @@ vector<unsigned char> iris_texture;
unsigned int iris_texture_width = 512; unsigned int iris_texture_width = 512;
unsigned int iris_texture_height = 256; unsigned int iris_texture_height = 256;
GLUquadric *sphere = gluNewQuadric();
Head::Head() Head::Head()
{ {
position = glm::vec3(0,0,0); position = glm::vec3(0,0,0);
@ -80,6 +78,8 @@ Head::Head()
browAudioLift = 0.0; browAudioLift = 0.0;
noise = 0; noise = 0;
sphere = NULL;
hand = new Hand(glm::vec3(skinColor[0], skinColor[1], skinColor[2])); hand = new Hand(glm::vec3(skinColor[0], skinColor[1], skinColor[2]));
if (iris_texture.size() == 0) { if (iris_texture.size() == 0) {
@ -135,12 +135,14 @@ Head::Head(const Head &otherHead) {
browAudioLift = otherHead.browAudioLift; browAudioLift = otherHead.browAudioLift;
noise = otherHead.noise; noise = otherHead.noise;
sphere = NULL;
Hand newHand = Hand(*otherHead.hand); Hand newHand = Hand(*otherHead.hand);
hand = &newHand; hand = &newHand;
} }
Head::~Head() { Head::~Head() {
if (sphere) { if (sphere != NULL) {
gluDeleteQuadric(sphere); gluDeleteQuadric(sphere);
} }
} }
@ -454,7 +456,7 @@ void Head::render(int faceToFace, int isMine)
glPopMatrix(); glPopMatrix();
// Right Pupil // Right Pupil
if (!sphere) { if (sphere == NULL) {
sphere = gluNewQuadric(); sphere = gluNewQuadric();
gluQuadricTexture(sphere, GL_TRUE); gluQuadricTexture(sphere, GL_TRUE);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);

2
interface/src/Head.h
View file

@ -130,6 +130,8 @@ class Head : public AgentData {
int eyeContact; int eyeContact;
eyeContactTargets eyeContactTarget; eyeContactTargets eyeContactTarget;
GLUquadric *sphere;
void readSensors(); void readSensors();
float renderYaw, renderPitch; // Pitch from view frustum when this is own head. float renderYaw, renderPitch; // Pitch from view frustum when this is own head.