Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 19:21:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Pass the aspect ratio into the shader, since it no longer necessarily

Browse source 
corresponds to the texture rectangle's aspect ratio.
This commit is contained in:
Andrzej Kapolka 2013-07-18 21:25:11 -07:00
parent 0ae6887c4a
commit ff0d63173c
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/resources/shaders/face.vert
View file

@ -17,6 +17,9 @@ uniform vec2 texCoordRight;
// the texture coordinate vector from bottom to the top // the texture coordinate vector from bottom to the top
uniform vec2 texCoordUp; uniform vec2 texCoordUp;
// the aspect ratio of the image
uniform float aspectRatio;
// the depth texture // the depth texture
uniform sampler2D depthTexture; uniform sampler2D depthTexture;
@ -29,5 +32,5 @@ void main(void) {
const float MAX_VISIBLE_DEPTH = 254.0 / 255.0; const float MAX_VISIBLE_DEPTH = 254.0 / 255.0;
gl_FrontColor = vec4(1.0, 1.0, 1.0, step(MIN_VISIBLE_DEPTH, depth) * (1.0 - step(MAX_VISIBLE_DEPTH, depth))); gl_FrontColor = vec4(1.0, 1.0, 1.0, step(MIN_VISIBLE_DEPTH, depth) * (1.0 - step(MAX_VISIBLE_DEPTH, depth)));
gl_Position = gl_ModelViewProjectionMatrix * vec4(0.5 - gl_Vertex.x, gl_Position = gl_ModelViewProjectionMatrix * vec4(0.5 - gl_Vertex.x,
(gl_Vertex.y - 0.5) * length(texCoordUp) / length(texCoordRight), depth * 2.0 - 2.0, 1.0); (gl_Vertex.y - 0.5) / aspectRatio, depth * 2.0 - 2.0, 1.0);
} }

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

@ -25,6 +25,7 @@ ProgramObject* Face::_program = 0;
int Face::_texCoordCornerLocation; int Face::_texCoordCornerLocation;
int Face::_texCoordRightLocation; int Face::_texCoordRightLocation;
int Face::_texCoordUpLocation; int Face::_texCoordUpLocation;
int Face::_aspectRatioLocation;
GLuint Face::_vboID; GLuint Face::_vboID;
GLuint Face::_iboID; GLuint Face::_iboID;
@ -205,6 +206,7 @@ bool Face::render(float alpha) {
_texCoordCornerLocation = _program->uniformLocation("texCoordCorner"); _texCoordCornerLocation = _program->uniformLocation("texCoordCorner");
_texCoordRightLocation = _program->uniformLocation("texCoordRight"); _texCoordRightLocation = _program->uniformLocation("texCoordRight");
_texCoordUpLocation = _program->uniformLocation("texCoordUp"); _texCoordUpLocation = _program->uniformLocation("texCoordUp");
_aspectRatioLocation = _program->uniformLocation("aspectRatio");
glGenBuffers(1, &_vboID); glGenBuffers(1, &_vboID);
glBindBuffer(GL_ARRAY_BUFFER, _vboID); glBindBuffer(GL_ARRAY_BUFFER, _vboID);
@ -253,6 +255,7 @@ bool Face::render(float alpha) {
(points[3].x - points[0].x) / _textureSize.width, (points[3].y - points[0].y) / _textureSize.height); (points[3].x - points[0].x) / _textureSize.width, (points[3].y - points[0].y) / _textureSize.height);
_program->setUniformValue(_texCoordUpLocation, _program->setUniformValue(_texCoordUpLocation,
(points[1].x - points[0].x) / _textureSize.width, (points[1].y - points[0].y) / _textureSize.height); (points[1].x - points[0].x) / _textureSize.width, (points[1].y - points[0].y) / _textureSize.height);
_program->setUniformValue(_aspectRatioLocation, _aspectRatio);
glEnableClientState(GL_VERTEX_ARRAY); glEnableClientState(GL_VERTEX_ARRAY);
glVertexPointer(2, GL_FLOAT, 0, 0); glVertexPointer(2, GL_FLOAT, 0, 0);

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

@ -67,6 +67,7 @@ private:
static int _texCoordCornerLocation; static int _texCoordCornerLocation;
static int _texCoordRightLocation; static int _texCoordRightLocation;
static int _texCoordUpLocation; static int _texCoordUpLocation;
static int _aspectRatioLocation;
static GLuint _vboID; static GLuint _vboID;
static GLuint _iboID; static GLuint _iboID;
}; };