Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-12 22:27:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

mouth handling on perlin faces

Browse source
This commit is contained in:
atlante45 2013-09-10 15:33:09 -07:00
parent 4e3484021e
commit 85c3d54718
1 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
interface/src/avatar/PerlinFace.cpp
View file

@ -152,8 +152,14 @@ void PerlinFace::update() {
GL_DYNAMIC_DRAW);
}
const GLfloat NO_SPECULAR_COLOR[] = { 0.0f, 0.0f, 0.0f, 1.0f };
void PerlinFace::render() {
glPushMatrix();
// disable specular lighting for ground and voxels
glMaterialfv(GL_FRONT, GL_SPECULAR, NO_SPECULAR_COLOR);
update();
glm::quat orientation = _owningHead->getOrientation();
@ -226,6 +232,8 @@ void PerlinFace::updatePositions() {
_browsU_R = faceshift->getBrowUpRight();
}
// Update left brow
_vertices[BROW_LEFT].y = VERTICES[FLOAT_PER_VERTEX * BROW_LEFT + 1]
+ _browsU_L * BROWS_UP_MAX - _browsD_L * BROWS_DOWN_MAX
- _browsU_C * BROWS_UP_CENTER_MAX;
@ -240,6 +248,7 @@ void PerlinFace::updatePositions() {
+ _browsU_L * BROWS_UP_MAX - _browsD_L * BROWS_DOWN_MAX
+ _browsU_C * BROWS_UP_CENTER_MAX;
// Update right brow
_vertices[NUM_VERTICES + BROW_LEFT].y = VERTICES[FLOAT_PER_VERTEX * (NUM_VERTICES + BROW_LEFT) + 1]
+ _browsU_R * BROWS_UP_MAX - _browsD_R * BROWS_DOWN_MAX
- _browsU_C * BROWS_UP_CENTER_MAX;
@ -255,6 +264,24 @@ void PerlinFace::updatePositions() {
+ _browsU_C * BROWS_UP_CENTER_MAX;
_vertices[MOUTH_BOTTOM_IN].y = VERTICES[FLOAT_PER_VERTEX * MOUTH_BOTTOM_IN + 1]
+ 6.2;
_vertices[MOUTH_BOTTOM_OUT].y = VERTICES[FLOAT_PER_VERTEX * MOUTH_BOTTOM_OUT + 1]
+ 6;
_vertices[MOUTH_MID_IN].y = VERTICES[FLOAT_PER_VERTEX * MOUTH_MID_IN + 1]
+ 3;
_vertices[MOUTH_MID_OUT].y = VERTICES[FLOAT_PER_VERTEX * MOUTH_MID_OUT + 1]
+ 3;
_vertices[NUM_VERTICES + MOUTH_BOTTOM_IN].y = VERTICES[FLOAT_PER_VERTEX * (NUM_VERTICES + MOUTH_BOTTOM_IN) + 1]
+ 6.2;
_vertices[NUM_VERTICES + MOUTH_BOTTOM_OUT].y = VERTICES[FLOAT_PER_VERTEX * (NUM_VERTICES + MOUTH_BOTTOM_OUT) + 1]
+ 6;
_vertices[NUM_VERTICES + MOUTH_MID_IN].y = VERTICES[FLOAT_PER_VERTEX * (NUM_VERTICES + MOUTH_MID_IN) + 1]
+ 3;
_vertices[NUM_VERTICES + MOUTH_MID_OUT].y = VERTICES[FLOAT_PER_VERTEX * (NUM_VERTICES + MOUTH_MID_OUT) + 1]
+ 3;
}
void PerlinFace::updateVertices() {