yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix texture mapping.

Browse source 
svn path=/branches/work/kwin_composite/; revision=597757
This commit is contained in:
Luboš Luňák 2006-10-21 15:06:09 +00:00
parent b5590c87db
commit daa8f7eccc
1 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
scene_opengl.cpp
View file

@ -430,9 +430,7 @@ void SceneOpenGL::Window::bindTexture()
bound_glxpixmap = glXCreatePixmap( display(), fbcdrawable, pix, attrs ); bound_glxpixmap = glXCreatePixmap( display(), fbcdrawable, pix, attrs );
int value; int value;
glXGetFBConfigAttrib( display(), fbcdrawable, GLX_Y_INVERTED_EXT, &value ); glXGetFBConfigAttrib( display(), fbcdrawable, GLX_Y_INVERTED_EXT, &value );
// this is swapped in order to get a conversion of OpenGL coordinates texture_y_inverted = value ? true : false;
// (binding to a texture is not affected by transforming the OpenGL scene)
texture_y_inverted = value ? false : true;
glBindTexture( GL_TEXTURE_RECTANGLE_ARB, texture ); glBindTexture( GL_TEXTURE_RECTANGLE_ARB, texture );
glXBindTexImageEXT( display(), bound_glxpixmap, GLX_FRONT_LEFT_EXT, NULL ); glXBindTexImageEXT( display(), bound_glxpixmap, GLX_FRONT_LEFT_EXT, NULL );
} }
@ -446,7 +444,7 @@ void SceneOpenGL::Window::bindTexture()
{ {
glGenTextures( 1, &texture ); glGenTextures( 1, &texture );
glBindTexture( GL_TEXTURE_RECTANGLE_ARB, texture ); glBindTexture( GL_TEXTURE_RECTANGLE_ARB, texture );
texture_y_inverted = true; // conversion to OpenGL coordinates texture_y_inverted = false;
glCopyTexImage2D( GL_TEXTURE_RECTANGLE_ARB, 0, glCopyTexImage2D( GL_TEXTURE_RECTANGLE_ARB, 0,
toplevel->hasAlpha() ? GL_RGBA : GL_RGB, toplevel->hasAlpha() ? GL_RGBA : GL_RGB,
0, 0, toplevel->width(), toplevel->height(), 0 ); 0, 0, toplevel->width(), toplevel->height(), 0 );
@ -462,7 +460,7 @@ void SceneOpenGL::Window::bindTexture()
// the pixmap to a texture, this is not affected // the pixmap to a texture, this is not affected
// by transforming the OpenGL scene) // by transforming the OpenGL scene)
int gly = toplevel->height() - r.y() - r.height(); int gly = toplevel->height() - r.y() - r.height();
texture_y_inverted = true; texture_y_inverted = false;
glCopyTexSubImage2D( GL_TEXTURE_RECTANGLE_ARB, 0, glCopyTexSubImage2D( GL_TEXTURE_RECTANGLE_ARB, 0,
r.x(), gly, r.x(), gly, r.width(), r.height()); r.x(), gly, r.x(), gly, r.width(), r.height());
} }
@ -500,15 +498,15 @@ void SceneOpenGL::Window::discardTexture()
texture = 0; texture = 0;
} }
static void quadPaint( int x1, int y1, int x2, int y2, bool invert_y ) static void quadPaint( int x1, int y1, int x2, int y2, int ty1, int ty2 )
{ {
glTexCoord2i( x1, invert_y ? y2 : y1 ); glTexCoord2i( x1, ty1 );
glVertex2i( x1, y1 ); glVertex2i( x1, y1 );
glTexCoord2i( x2, invert_y ? y2 : y1 ); glTexCoord2i( x2, ty1 );
glVertex2i( x2, y1 ); glVertex2i( x2, y1 );
glTexCoord2i( x2, invert_y ? y1 : y2 ); glTexCoord2i( x2, ty2 );
glVertex2i( x2, y2 ); glVertex2i( x2, y2 );
glTexCoord2i( x1, invert_y ? y1 : y2 ); glTexCoord2i( x1, ty2 );
glVertex2i( x1, y2 ); glVertex2i( x1, y2 );
} }
@ -564,8 +562,16 @@ void SceneOpenGL::Window::performPaint( QRegion region, int mask )
glBegin( GL_QUADS ); glBegin( GL_QUADS );
foreach( QRect r, region.rects()) foreach( QRect r, region.rects())
{ {
quadPaint( r.x(), r.y(), r.x() + r.width(), r.y() + r.height(), int y1 = r.y();
texture_y_inverted ); int y2 = r.y() + r.height();
int ty1 = y1;
int ty2 = y2;
if( !texture_y_inverted ) // "!" because of converting to OpenGL coords
{
ty1 = height() - y1;
ty2 = height() - y2;
}
quadPaint( r.x(), y1, r.x() + r.width(), y2, ty1, ty2 );
} }
glEnd(); glEnd();
glPopMatrix(); glPopMatrix();