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

Scale the normal contributions down. For some reason, their magnitudes are

Browse source 
higher than one would expect.
This commit is contained in:
Andrzej Kapolka 2013-09-23 12:42:58 -07:00
parent 807f6aaf14
commit 1a55c64299
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
interface/src/avatar/BlendFace.cpp
View file

@ -61,24 +61,17 @@ bool BlendFace::render(float alpha) {
if (coefficient == 0.0f || i >= _geometry.blendshapes.size() || _geometry.blendshapes[i].vertices.isEmpty()) { if (coefficient == 0.0f || i >= _geometry.blendshapes.size() || _geometry.blendshapes[i].vertices.isEmpty()) {
continue; continue;
} }
const float NORMAL_COEFFICIENT_SCALE = 0.01f;
float normalCoefficient = coefficient * NORMAL_COEFFICIENT_SCALE;
const glm::vec3* vertex = _geometry.blendshapes[i].vertices.constData(); const glm::vec3* vertex = _geometry.blendshapes[i].vertices.constData();
const glm::vec3* normal = _geometry.blendshapes[i].normals.constData(); const glm::vec3* normal = _geometry.blendshapes[i].normals.constData();
for (const int* index = _geometry.blendshapes[i].indices.constData(), for (const int* index = _geometry.blendshapes[i].indices.constData(),
*end = index + _geometry.blendshapes[i].indices.size(); index != end; index++, vertex++, normal++) { *end = index + _geometry.blendshapes[i].indices.size(); index != end; index++, vertex++, normal++) {
_blendedVertices[*index] += *vertex * coefficient; _blendedVertices[*index] += *vertex * coefficient;
_blendedNormals[*index] += *normal * coefficient; _blendedNormals[*index] += *normal * coefficient * NORMAL_COEFFICIENT_SCALE;
} }
} }
glColor3f(1.0f, 0.0f, 0.0f);
glBegin(GL_LINES);
for (int i = 0; i < vertexCount; i++) {
glVertex3f(_blendedVertices.at(i).x, _blendedVertices.at(i).y, _blendedVertices.at(i).z);
glm::vec3 end = _blendedVertices.at(i) + glm::normalize(_blendedNormals.at(i)) * 10.0f;
glVertex3f(end.x, end.y, end.z);
}
glEnd();
// use the head skin color // use the head skin color
glColor4f(_owningHead->getSkinColor().r, _owningHead->getSkinColor().g, _owningHead->getSkinColor().b, alpha); glColor4f(_owningHead->getSkinColor().r, _owningHead->getSkinColor().g, _owningHead->getSkinColor().b, alpha);