Commit 70769d5d authored by Maciej Suminski's avatar Maciej Suminski
Browse files

Fixed drawing of circles in certain circumstances using OpenGL.

parent 05e3ae64

common/gal/opengl/opengl_gal.cpp

+46 −84
Original line number Original line Diff line number Diff line
@@ -437,6 +437,7 @@ inline void OPENGL_GAL::selectShader( int aIndex ) 
    }

    }

}

}







void OPENGL_GAL::drawRoundedSegment( VECTOR2D aStartPoint, VECTOR2D aEndPoint,

void OPENGL_GAL::drawRoundedSegment( VECTOR2D aStartPoint, VECTOR2D aEndPoint,

                                     double aWidth, bool aStroke, bool aGlBegin )

                                     double aWidth, bool aStroke, bool aGlBegin )

{

{
@@ -863,11 +864,7 @@ void OPENGL_GAL::DrawCircle( VECTOR2D aCenterPoint, double aRadius ) 
        return;

        return;

    }

    }





    switch( m_drawMode )

    {

    // Draw the middle of the circle (not anti-aliased)

    // Draw the middle of the circle (not anti-aliased)

    case DRAW_MODE_NORMAL:

    {

    // Compute the factors for the unit circle

    // Compute the factors for the unit circle

    double outerScale = lineWidth / aRadius / 2;

    double outerScale = lineWidth / aRadius / 2;

    double innerScale = -outerScale;

    double innerScale = -outerScale;
@@ -914,49 +911,10 @@ void OPENGL_GAL::DrawCircle( VECTOR2D aCenterPoint, double aRadius ) 
        glTranslated( aCenterPoint.x, aCenterPoint.y, layerDepth );

        glTranslated( aCenterPoint.x, aCenterPoint.y, layerDepth );

        glScaled( aRadius, aRadius, 1.0 );

        glScaled( aRadius, aRadius, 1.0 );





            glBegin( GL_TRIANGLE_FAN );

            glVertex3d( 0, 0, 0 );

        glCallList( displayListCircle );

        glCallList( displayListCircle );

            glEnd();





        glPopMatrix();

        glPopMatrix();

    }

    }



        glColor4d( strokeColor.r, strokeColor.g, strokeColor.b, strokeColor.a );

    }

        break;



        // Prepare / draw anti-aliased edges

    case DRAW_MODE_PREPARE_EDGES:

    case DRAW_MODE_DRAW_EDGES:

        if( isUseShader )

        {

            // Set the color

            // Now we enable the shader program for the circle

            // the shader requires the screen size as uniform argument

            shaderList[0].Use();

            shaderList[0].SetParameter( 0, screenSize.x / 2 );

            shaderList[0].SetParameter( 1, screenSize.y / 2 );

            glBegin( GL_LINES );

            if( isStrokeEnabled )

            {

                glColor4d( strokeColor.r, strokeColor.g, strokeColor.b, strokeColor.a );

                glVertex3d( aCenterPoint.x, aCenterPoint.y, layerDepth );

                glVertex3d( aRadius - lineWidth / 2, aRadius + lineWidth / 2, 0 );

            }

            else

            {

                glColor4d( fillColor.r, fillColor.g, fillColor.b, fillColor.a );

                glVertex3d( aCenterPoint.x, aCenterPoint.y, layerDepth );

                glVertex3d( 0, aRadius, 0 );

            }

            glEnd();

            shaderList[0].Deactivate();

        }

        break;

    default:

        break;

    }

}

}
@@ -970,9 +928,7 @@ void OPENGL_GAL::drawSemiCircle( VECTOR2D aCenterPoint, double aRadius, double a 
    glScaled( aRadius, aRadius, 1.0 );

    glScaled( aRadius, aRadius, 1.0 );

    glRotated( aAngle * 360.0 / ( 2 * M_PI ), 0, 0, 1 );

    glRotated( aAngle * 360.0 / ( 2 * M_PI ), 0, 0, 1 );





    glBegin( GL_TRIANGLE_FAN );

    glCallList( displayListSemiCircle );

    glCallList( displayListSemiCircle );

    glEnd();





    glPopMatrix();

    glPopMatrix();

}

}
@@ -1362,15 +1318,18 @@ void OPENGL_GAL::computeUnitCircle() 
    displayListCircle = glGenLists( 1 );

    displayListCircle = glGenLists( 1 );

    glNewList( displayListCircle, GL_COMPILE );

    glNewList( displayListCircle, GL_COMPILE );





    glBegin( GL_TRIANGLE_FAN );

    glVertex2d( 0, 0 );

    // Compute the circle points for a given number of segments

    // Compute the circle points for a given number of segments

    // Insert in a display list and a vector

    // Insert in a display list and a vector

    for( int i = 0; i < CIRCLE_POINTS + 1; i++ )

    for( int i = 0; i < CIRCLE_POINTS + 1; i++ )

    {

    {

        double valueX = cos( 2 * M_PI / CIRCLE_POINTS * i );

        double valueX = cos( 2.0 * M_PI / CIRCLE_POINTS * i );

        double valueY = sin( 2 * M_PI / CIRCLE_POINTS * i );

        double valueY = sin( 2.0 * M_PI / CIRCLE_POINTS * i );

        glVertex3d( valueX, valueY, 0 );

        glVertex2d( valueX, valueY );

        unitCirclePoints.push_back( VECTOR2D( valueX, valueY ) );

        unitCirclePoints.push_back( VECTOR2D( valueX, valueY ) );

    }

    }

    glEnd();





    glEndList();

    glEndList();

}

}
@@ -1381,10 +1340,13 @@ void OPENGL_GAL::computeUnitSemiCircle() 
    displayListSemiCircle = glGenLists( 1 );

    displayListSemiCircle = glGenLists( 1 );

    glNewList( displayListSemiCircle, GL_COMPILE );

    glNewList( displayListSemiCircle, GL_COMPILE );





    glBegin( GL_TRIANGLE_FAN );

    glVertex2d( 0, 0 );

    for( int i = 0; i < CIRCLE_POINTS / 2 + 1; i++ )

    for( int i = 0; i < CIRCLE_POINTS / 2 + 1; i++ )

    {

    {

        glVertex3d( cos( 2 * M_PI / CIRCLE_POINTS * i ), sin( 2 * M_PI / CIRCLE_POINTS * i ), 0 );

        glVertex2d( cos( 2.0 * M_PI / CIRCLE_POINTS * i ), sin( 2.0 * M_PI / CIRCLE_POINTS * i ) );

    }

    }

    glEnd();





    glEndList();

    glEndList();

}

}