X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_geometry.c;h=3e4fd3c0fda881f42693374048239601aea70c5f;hb=006650e1dd72e73249d41e2bcea8b1668262a999;hp=3f1d24e9b6227e1c279a0a041213628e217df515;hpb=4fa63bbb5637f30db8eec9de49c0b2c4830cb866;p=freeglut diff --git a/src/freeglut_geometry.c b/src/freeglut_geometry.c index 3f1d24e..3e4fd3c 100644 --- a/src/freeglut_geometry.c +++ b/src/freeglut_geometry.c @@ -121,7 +121,7 @@ void FGAPIENTRY glutSolidCube( GLdouble dSize ) * The sign of n can be flipped to get the reverse loop */ -static void circleTable(double **sint,double **cost,const int n) +static void fghCircleTable(double **sint,double **cost,const int n) { int i; @@ -144,7 +144,7 @@ static void circleTable(double **sint,double **cost,const int n) { free(*sint); free(*cost); - fgError("Failed to allocate memory in circleTable"); + fgError("Failed to allocate memory in fghCircleTable"); } /* Compute cos and sin around the circle */ @@ -177,8 +177,8 @@ void FGAPIENTRY glutSolidSphere(GLdouble radius, GLint slices, GLint stacks) double *sint1,*cost1; double *sint2,*cost2; - circleTable(&sint1,&cost1,-slices); - circleTable(&sint2,&cost2,stacks*2); + fghCircleTable(&sint1,&cost1,-slices); + fghCircleTable(&sint2,&cost2,stacks*2); /* The top stack is covered with a triangle fan */ @@ -262,8 +262,8 @@ void FGAPIENTRY glutWireSphere(GLdouble radius, GLint slices, GLint stacks) double *sint1,*cost1; double *sint2,*cost2; - circleTable(&sint1,&cost1,-slices ); - circleTable(&sint2,&cost2, stacks*2); + fghCircleTable(&sint1,&cost1,-slices ); + fghCircleTable(&sint2,&cost2, stacks*2); /* Draw a line loop for each stack */ @@ -336,7 +336,7 @@ void FGAPIENTRY glutSolidCone( GLdouble base, GLdouble height, GLint slices, GLi /* Pre-computed circle */ double *sint,*cost; - circleTable(&sint,&cost,-slices); + fghCircleTable(&sint,&cost,-slices); /* Cover the circular base with a triangle fan... */ @@ -420,7 +420,7 @@ void FGAPIENTRY glutWireCone( GLdouble base, GLdouble height, GLint slices, GLin /* Pre-computed circle */ double *sint,*cost; - circleTable(&sint,&cost,-slices); + fghCircleTable(&sint,&cost,-slices); /* Draw the stacks... */ @@ -477,7 +477,7 @@ void FGAPIENTRY glutSolidCylinder(GLdouble radius, GLdouble height, GLint slices /* Pre-computed circle */ double *sint,*cost; - circleTable(&sint,&cost,-slices); + fghCircleTable(&sint,&cost,-slices); /* Cover the base and top */ @@ -538,7 +538,7 @@ void FGAPIENTRY glutWireCylinder(GLdouble radius, GLdouble height, GLint slices, /* Pre-computed circle */ double *sint,*cost; - circleTable(&sint,&cost,-slices); + fghCircleTable(&sint,&cost,-slices); /* Draw the stacks... */