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

Fixing mohawk orientation

Browse source
This commit is contained in:
Philip Rosedale 2013-05-24 12:30:05 -07:00
parent 8b5901d904
commit dc9b2e33b5
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
interface/src/Head.cpp
View file

@ -55,7 +55,6 @@ Head::Head() :
_audioAttack(0.0f), _audioAttack(0.0f),
_returnSpringScale(1.0f), _returnSpringScale(1.0f),
_bodyRotation(0.0f, 0.0f, 0.0f), _bodyRotation(0.0f, 0.0f, 0.0f),
_headRotation(0.0f, 0.0f, 0.0f),
_renderLookatVectors(false), _renderLookatVectors(false),
_mohawkTriangleFan(NULL), _mohawkTriangleFan(NULL),
_mohawkColors(NULL) _mohawkColors(NULL)
@ -180,7 +179,7 @@ void Head::render(bool lookingInMirror) {
glEnable(GL_DEPTH_TEST); glEnable(GL_DEPTH_TEST);
glEnable(GL_RESCALE_NORMAL); glEnable(GL_RESCALE_NORMAL);
renderMohawk(); renderMohawk(lookingInMirror);
renderHeadSphere(); renderHeadSphere();
renderEyeBalls(); renderEyeBalls();
renderEars(); renderEars();
@ -213,13 +212,15 @@ void Head::createMohawk() {
} }
} }
void Head::renderMohawk() { void Head::renderMohawk(bool lookingInMirror) {
if (!_mohawkTriangleFan) { if (!_mohawkTriangleFan) {
createMohawk(); createMohawk();
} else { } else {
glPushMatrix(); glPushMatrix();
glTranslatef(_position.x, _position.y, _position.z); glTranslatef(_position.x, _position.y, _position.z);
glRotatef(_bodyRotation.y, 0, 1, 0); glRotatef(-(_bodyRotation.y + _yaw) - 90, 0, 1, 0);
//glRotatef((lookingInMirror ? _roll: -roll), 0, 0, 1);
glRotatef(-_pitch, 1, 0, 0);
glBegin(GL_TRIANGLE_FAN); glBegin(GL_TRIANGLE_FAN);
for (int i = 0; i < MOHAWK_TRIANGLES; i++) { for (int i = 0; i < MOHAWK_TRIANGLES; i++) {
glColor3f(_mohawkColors[i].x, _mohawkColors[i].y, _mohawkColors[i].z); glColor3f(_mohawkColors[i].x, _mohawkColors[i].y, _mohawkColors[i].z);

2
interface/src/Head.h
View file

@ -36,7 +36,6 @@ public:
void setScale (float scale ) { _scale = scale; } void setScale (float scale ) { _scale = scale; }
void setPosition (glm::vec3 position ) { _position = position; } void setPosition (glm::vec3 position ) { _position = position; }
void setBodyRotation (glm::vec3 bodyRotation ) { _bodyRotation = bodyRotation; } void setBodyRotation (glm::vec3 bodyRotation ) { _bodyRotation = bodyRotation; }
void setRotationOffBody(glm::vec3 headRotation ) { _headRotation = headRotation; }
void setGravity (glm::vec3 gravity ) { _gravity = gravity; } void setGravity (glm::vec3 gravity ) { _gravity = gravity; }
void setSkinColor (glm::vec3 skinColor ) { _skinColor = skinColor; } void setSkinColor (glm::vec3 skinColor ) { _skinColor = skinColor; }
void setSpringScale (float returnSpringScale ) { _returnSpringScale = returnSpringScale; } void setSpringScale (float returnSpringScale ) { _returnSpringScale = returnSpringScale; }
@ -79,7 +78,6 @@ private:
float _returnSpringScale; //strength of return springs float _returnSpringScale; //strength of return springs
Orientation _orientation; Orientation _orientation;
glm::vec3 _bodyRotation; glm::vec3 _bodyRotation;
glm::vec3 _headRotation;
bool _renderLookatVectors; bool _renderLookatVectors;
glm::vec3* _mohawkTriangleFan; glm::vec3* _mohawkTriangleFan;
glm::vec3* _mohawkColors; glm::vec3* _mohawkColors;