haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug of displaying stroked rectangles on wrong layer depth.

This commit is contained in:
Maciej Suminski 2013-04-05 15:10:58 +02:00
parent 84239542b7
commit 52ec277592
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/gal/opengl/opengl_gal.cpp
View File

@ -819,10 +819,6 @@ void OPENGL_GAL::DrawRectangle( VECTOR2D aStartPoint, VECTOR2D aEndPoint )
selectShader( -1 ); selectShader( -1 );
glPushMatrix();
glTranslated( 0, 0, layerDepth );
// Stroke the outline // Stroke the outline
if( isStrokeEnabled ) if( isStrokeEnabled )
{ {
@ -841,15 +837,13 @@ void OPENGL_GAL::DrawRectangle( VECTOR2D aStartPoint, VECTOR2D aEndPoint )
{ {
glColor4d( fillColor.r, fillColor.g, fillColor.b, fillColor.a ); glColor4d( fillColor.r, fillColor.g, fillColor.b, fillColor.a );
glBegin( GL_QUADS ); glBegin( GL_QUADS );
glVertex2d( aStartPoint.x, aStartPoint.y ); glVertex3d( aStartPoint.x, aStartPoint.y, layerDepth );
glVertex2d( diagonalPointA.x, diagonalPointA.y ); glVertex3d( diagonalPointA.x, diagonalPointA.y, layerDepth );
glVertex2d( aEndPoint.x, aEndPoint.y ); glVertex3d( aEndPoint.x, aEndPoint.y, layerDepth );
glVertex2d( diagonalPointB.x, diagonalPointB.y ); glVertex3d( diagonalPointB.x, diagonalPointB.y, layerDepth );
glEnd(); glEnd();
} }
glPopMatrix();
// Restore the stroke color // Restore the stroke color
glColor4d( strokeColor.r, strokeColor.g, strokeColor.b, strokeColor.a ); glColor4d( strokeColor.r, strokeColor.g, strokeColor.b, strokeColor.a );
} }