Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-05-02 00:39:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't make the eye sphere a global object

Browse source
This commit is contained in:
Stephen Birarda 2013-03-28 11:36:41 -07:00
parent 846ba80c10
commit d2a8da890f
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
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) {
@ -140,7 +140,7 @@ Head::Head(const Head &otherHead) {
} }
Head::~Head() { Head::~Head() {
if (sphere) { if (sphere != NULL) {
gluDeleteQuadric(sphere); gluDeleteQuadric(sphere);
} }
} }

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.