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

Fix renderHalfCylinder so that normals are correct now. Add facePosition and faceRotation storage to Face class.

Browse source
This commit is contained in:
Hifi Test Account 2013-08-07 12:07:41 -07:00
parent 988faeff54
commit 1e7dbbbccd
3 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/avatar/Face.cpp
View file

@ -63,6 +63,8 @@ void Face::setFrameFromWebcam() {
_textureSize = webcam->getTextureSize();
_textureRect = webcam->getFaceRect();
_aspectRatio = webcam->getAspectRatio();
_facePosition = webcam->getEstimatedPosition();
_faceRotation = webcam->getEstimatedRotation();
} else {
clearFrame();
@ -264,7 +266,7 @@ bool Face::render(float alpha) {
glPushMatrix();
glScalef(xScale / 12, xScale / (aspect * 3), zScale / 2);
Application::getInstance()->getGeometryCache()->renderHalfCylinder(25,20);
Application::getInstance()->getGeometryCache()->renderHalfCylinder(25, 20);
glPopMatrix();
} else {
aspect = _aspectRatio;

3
interface/src/avatar/Face.h
View file

@ -62,6 +62,9 @@ private:
cv::RotatedRect _textureRect;
float _aspectRatio;
glm::vec3 _facePosition;
glm::vec3 _faceRotation;
vpx_codec_ctx_t _colorCodec;
vpx_codec_ctx_t _depthCodec;
bool _lastFullFrame;

21
interface/src/renderer/GeometryCache.cpp
View file

@ -169,18 +169,23 @@ void GeometryCache::renderHalfCylinder(int slices, int stacks) {
int vertices = (slices + 1) * stacks;
int indices = 2 * 3 * slices * (stacks - 1);
if (vbo.first == 0) {
GLfloat* vertexData = new GLfloat[vertices * 3];
GLfloat* vertexData = new GLfloat[vertices * 2 * 3];
GLfloat* vertex = vertexData;
for (int i = 0; i <= (stacks - 1); i++) {
float y = (float)i / (stacks - 1);
float radius = 1.0f;
for (int j = 0; j <= slices; j++) {
float theta = 3 * PIf / 2 + PIf * j / slices;
*(vertex++) = sinf(theta) * radius;
//normals
*(vertex++) = sinf(theta);
*(vertex++) = 0;
*(vertex++) = cosf(theta);
// vertices
*(vertex++) = sinf(theta);
*(vertex++) = y;
*(vertex++) = cosf(theta) * radius;
*(vertex++) = cosf(theta);
}
}
@ -196,7 +201,7 @@ void GeometryCache::renderHalfCylinder(int slices, int stacks) {
GLushort bottom = i * (slices + 1);
GLushort top = bottom + slices + 1;
for (int j = 0; j < slices; j++) {
int next = (j + 1) % slices;
int next = j + 1;
*(index++) = bottom + j;
*(index++) = top + next;
@ -220,9 +225,9 @@ void GeometryCache::renderHalfCylinder(int slices, int stacks) {
}
glEnableClientState(GL_VERTEX_ARRAY);
glEnableClientState(GL_NORMAL_ARRAY);
glVertexPointer(3, GL_FLOAT, 0, 0);
glNormalPointer(GL_FLOAT, 0, 0);
glNormalPointer(GL_FLOAT, 6 * sizeof(float), 0);
glVertexPointer(3, GL_FLOAT, 6 * sizeof(float), 3 * sizeof(float));
glDrawRangeElementsEXT(GL_TRIANGLES, 0, vertices - 1, indices, GL_UNSIGNED_SHORT, 0);