FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

All doubles now GLdoubles (important for GLES later)

Browse Source 
Other general cleanup in prep for porting geometry code involving
circles.
no longer computing a larger circle table when only need half of it


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1192 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
dcnieho 2012-03-18 10:02:54 +00:00
parent 3e21108d4f
commit c00c3d67a0
1 changed files with 71 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

133
freeglut/freeglut/src/fg_geometry.c
View File

@ -566,6 +566,7 @@ static void fghSierpinskiSpongeGenerate ( int numLevels, GLdouble offset[3], GLd
/* -- Now the various shapes involving circles -- */ /* -- Now the various shapes involving circles -- */
/* /*
* Compute lookup table of cos and sin values forming a circle * Compute lookup table of cos and sin values forming a circle
* (or half circle if halfCircle==TRUE)
* *
* Notes: * Notes:
* It is the responsibility of the caller to free these tables * It is the responsibility of the caller to free these tables
@ -573,25 +574,21 @@ static void fghSierpinskiSpongeGenerate ( int numLevels, GLdouble offset[3], GLd
* The last entry is exactly the same as the first * The last entry is exactly the same as the first
* The sign of n can be flipped to get the reverse loop * The sign of n can be flipped to get the reverse loop
*/ */
static void fghCircleTable(double **sint,double **cost,const int n) static void fghCircleTable(GLdouble **sint, GLdouble **cost, const int n, const GLboolean halfCircle)
{ {
int i; int i;
/* Table size, the sign of n flips the circle direction */ /* Table size, the sign of n flips the circle direction */
const int size = abs(n); const int size = abs(n);
/* Determine the angle between samples */ /* Determine the angle between samples */
const GLdouble angle = (halfCircle?1:2)*M_PI/(GLdouble)( ( n == 0 ) ? 1 : n );
const double angle = 2*M_PI/(double)( ( n == 0 ) ? 1 : n );
/* Allocate memory for n samples, plus duplicate of first entry at the end */ /* Allocate memory for n samples, plus duplicate of first entry at the end */
*sint = malloc(sizeof(GLdouble) * (size+1));
*sint = (double *) calloc(sizeof(double), size+1); *cost = malloc(sizeof(GLdouble) * (size+1));
*cost = (double *) calloc(sizeof(double), size+1);
/* Bail out if memory allocation fails, fgError never returns */ /* Bail out if memory allocation fails, fgError never returns */
if (!(*sint) || !(*cost)) if (!(*sint) || !(*cost))
{ {
free(*sint); free(*sint);
@ -600,7 +597,6 @@ static void fghCircleTable(double **sint,double **cost,const int n)
} }
/* Compute cos and sin around the circle */ /* Compute cos and sin around the circle */
(*sint)[0] = 0.0; (*sint)[0] = 0.0;
(*cost)[0] = 1.0; (*cost)[0] = 1.0;
@ -610,10 +606,18 @@ static void fghCircleTable(double **sint,double **cost,const int n)
(*cost)[i] = cos(angle*i); (*cost)[i] = cos(angle*i);
} }
/* Last sample is duplicate of the first */
(*sint)[size] = (*sint)[0]; if (halfCircle)
(*cost)[size] = (*cost)[0]; {
(*sint)[size] = 0.0; /* sin PI */
(*cost)[size] = -1.0; /* cos PI */
}
else
{
/* Last sample is duplicate of the first (sin or cos of 2 PI) */
(*sint)[size] = (*sint)[0];
(*cost)[size] = (*cost)[0];
}
} }
@ -672,9 +676,9 @@ static void fghCube( GLdouble dSize, GLboolean useWireMode )
vertices = cube_verts; vertices = cube_verts;
if (useWireMode) if (useWireMode)
fghDrawGeometryWire (vertices ,cube_norms, CUBE_NUM_FACES,CUBE_NUM_EDGE_PER_FACE); fghDrawGeometryWire (vertices,cube_norms, CUBE_NUM_FACES,CUBE_NUM_EDGE_PER_FACE);
else else
fghDrawGeometrySolid(vertices ,cube_norms,cube_vertIdxs,CUBE_VERT_PER_OBJ_TRI, CUBE_NUM_EDGE_PER_FACE); fghDrawGeometrySolid(vertices,cube_norms,cube_vertIdxs,CUBE_VERT_PER_OBJ_TRI, CUBE_NUM_EDGE_PER_FACE);
if (dSize!=1.) if (dSize!=1.)
/* cleanup allocated memory */ /* cleanup allocated memory */
@ -735,18 +739,18 @@ void FGAPIENTRY glutSolidSphere(GLdouble radius, GLint slices, GLint stacks)
/* Adjust z and radius as stacks are drawn. */ /* Adjust z and radius as stacks are drawn. */
double z0,z1; GLdouble z0,z1;
double r0,r1; GLdouble r0,r1;
/* Pre-computed circle */ /* Pre-computed circle */
double *sint1,*cost1; GLdouble *sint1,*cost1;
double *sint2,*cost2; GLdouble *sint2,*cost2;
FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSolidSphere" ); FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSolidSphere" );
fghCircleTable(&sint1,&cost1,-slices); fghCircleTable(&sint1,&cost1,-slices,FALSE);
fghCircleTable(&sint2,&cost2,stacks*2); fghCircleTable(&sint2,&cost2, stacks,TRUE);
/* The top stack is covered with a triangle fan */ /* The top stack is covered with a triangle fan */
@ -823,18 +827,18 @@ void FGAPIENTRY glutWireSphere(GLdouble radius, GLint slices, GLint stacks)
/* Adjust z and radius as stacks and slices are drawn. */ /* Adjust z and radius as stacks and slices are drawn. */
double r; GLdouble r;
double x,y,z; GLdouble x,y,z;
/* Pre-computed circle */ /* Pre-computed circle */
double *sint1,*cost1; GLdouble *sint1,*cost1;
double *sint2,*cost2; GLdouble *sint2,*cost2;
FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWireSphere" ); FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWireSphere" );
fghCircleTable(&sint1,&cost1,-slices ); fghCircleTable(&sint1,&cost1,-slices,FALSE);
fghCircleTable(&sint2,&cost2, stacks*2); fghCircleTable(&sint2,&cost2, stacks,TRUE);
/* Draw a line loop for each stack */ /* Draw a line loop for each stack */
@ -868,6 +872,7 @@ void FGAPIENTRY glutWireSphere(GLdouble radius, GLint slices, GLint stacks)
x = cost1[i]*sint2[j]; x = cost1[i]*sint2[j];
y = sint1[i]*sint2[j]; y = sint1[i]*sint2[j];
z = cost2[j]; z = cost2[j];
printf("j(%i):%1.3f\n",j,z);
glNormal3d(x,y,z); glNormal3d(x,y,z);
glVertex3d(x*radius,y*radius,z*radius); glVertex3d(x*radius,y*radius,z*radius);
@ -893,24 +898,24 @@ void FGAPIENTRY glutSolidCone( GLdouble base, GLdouble height, GLint slices, GLi
/* Step in z and radius as stacks are drawn. */ /* Step in z and radius as stacks are drawn. */
double z0,z1; GLdouble z0,z1;
double r0,r1; GLdouble r0,r1;
const double zStep = height / ( ( stacks > 0 ) ? stacks : 1 ); const GLdouble zStep = height / ( ( stacks > 0 ) ? stacks : 1 );
const double rStep = base / ( ( stacks > 0 ) ? stacks : 1 ); const GLdouble rStep = base / ( ( stacks > 0 ) ? stacks : 1 );
/* Scaling factors for vertex normals */ /* Scaling factors for vertex normals */
const double cosn = ( height / sqrt ( height * height + base * base )); const GLdouble cosn = ( height / sqrt ( height * height + base * base ));
const double sinn = ( base / sqrt ( height * height + base * base )); const GLdouble sinn = ( base / sqrt ( height * height + base * base ));
/* Pre-computed circle */ /* Pre-computed circle */
double *sint,*cost; GLdouble *sint,*cost;
FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSolidCone" ); FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSolidCone" );
fghCircleTable(&sint,&cost,-slices); fghCircleTable(&sint,&cost,-slices,FALSE);
/* Cover the circular base with a triangle fan... */ /* Cover the circular base with a triangle fan... */
@ -980,24 +985,24 @@ void FGAPIENTRY glutWireCone( GLdouble base, GLdouble height, GLint slices, GLin
/* Step in z and radius as stacks are drawn. */ /* Step in z and radius as stacks are drawn. */
double z = 0.0; GLdouble z = 0.0;
double r = base; GLdouble r = base;
const double zStep = height / ( ( stacks > 0 ) ? stacks : 1 ); const GLdouble zStep = height / ( ( stacks > 0 ) ? stacks : 1 );
const double rStep = base / ( ( stacks > 0 ) ? stacks : 1 ); const GLdouble rStep = base / ( ( stacks > 0 ) ? stacks : 1 );
/* Scaling factors for vertex normals */ /* Scaling factors for vertex normals */
const double cosn = ( height / sqrt ( height * height + base * base )); const GLdouble cosn = ( height / sqrt ( height * height + base * base ));
const double sinn = ( base / sqrt ( height * height + base * base )); const GLdouble sinn = ( base / sqrt ( height * height + base * base ));
/* Pre-computed circle */ /* Pre-computed circle */
double *sint,*cost; GLdouble *sint,*cost;
FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWireCone" ); FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWireCone" );
fghCircleTable(&sint,&cost,-slices); fghCircleTable(&sint,&cost,-slices,FALSE);
/* Draw the stacks... */ /* Draw the stacks... */
@ -1048,16 +1053,16 @@ void FGAPIENTRY glutSolidCylinder(GLdouble radius, GLdouble height, GLint slices
/* Step in z and radius as stacks are drawn. */ /* Step in z and radius as stacks are drawn. */
double z0,z1; GLdouble z0,z1;
const double zStep = height / ( ( stacks > 0 ) ? stacks : 1 ); const GLdouble zStep = height / ( ( stacks > 0 ) ? stacks : 1 );
/* Pre-computed circle */ /* Pre-computed circle */
double *sint,*cost; GLdouble *sint,*cost;
FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSolidCylinder" ); FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSolidCylinder" );
fghCircleTable(&sint,&cost,-slices); fghCircleTable(&sint,&cost,-slices,FALSE);
/* Cover the base and top */ /* Cover the base and top */
@ -1112,16 +1117,16 @@ void FGAPIENTRY glutWireCylinder(GLdouble radius, GLdouble height, GLint slices,
/* Step in z and radius as stacks are drawn. */ /* Step in z and radius as stacks are drawn. */
double z = 0.0; GLdouble z = 0.0;
const double zStep = height / ( ( stacks > 0 ) ? stacks : 1 ); const GLdouble zStep = height / ( ( stacks > 0 ) ? stacks : 1 );
/* Pre-computed circle */ /* Pre-computed circle */
double *sint,*cost; GLdouble *sint,*cost;
FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWireCylinder" ); FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWireCylinder" );
fghCircleTable(&sint,&cost,-slices); fghCircleTable(&sint,&cost,-slices,FALSE);
/* Draw the stacks... */ /* Draw the stacks... */
@ -1167,10 +1172,10 @@ void FGAPIENTRY glutWireCylinder(GLdouble radius, GLdouble height, GLint slices,
*/ */
void FGAPIENTRY glutWireTorus( GLdouble dInnerRadius, GLdouble dOuterRadius, GLint nSides, GLint nRings ) void FGAPIENTRY glutWireTorus( GLdouble dInnerRadius, GLdouble dOuterRadius, GLint nSides, GLint nRings )
{ {
double iradius = dInnerRadius, oradius = dOuterRadius, phi, psi, dpsi, dphi; GLdouble iradius = dInnerRadius, oradius = dOuterRadius, phi, psi, dpsi, dphi;
double *vertex, *normal; GLdouble *vertex, *normal;
int i, j; int i, j;
double spsi, cpsi, sphi, cphi ; GLdouble spsi, cpsi, sphi, cphi ;
FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWireTorus" ); FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWireTorus" );
@ -1178,13 +1183,13 @@ void FGAPIENTRY glutWireTorus( GLdouble dInnerRadius, GLdouble dOuterRadius, GLi
if ( nRings < 1 ) nRings = 1; if ( nRings < 1 ) nRings = 1;
/* Allocate the vertices array */ /* Allocate the vertices array */
vertex = (double *)calloc( sizeof(double), 3 * nSides * nRings ); vertex = (GLdouble *)calloc( sizeof(GLdouble), 3 * nSides * nRings );
normal = (double *)calloc( sizeof(double), 3 * nSides * nRings ); normal = (GLdouble *)calloc( sizeof(GLdouble), 3 * nSides * nRings );
glPushMatrix(); glPushMatrix();
dpsi = 2.0 * M_PI / (double)nRings ; dpsi = 2.0 * M_PI / (GLdouble)nRings ;
dphi = -2.0 * M_PI / (double)nSides ; dphi = -2.0 * M_PI / (GLdouble)nSides ;
psi = 0.0; psi = 0.0;
for( j=0; j<nRings; j++ ) for( j=0; j<nRings; j++ )
@ -1248,10 +1253,10 @@ void FGAPIENTRY glutWireTorus( GLdouble dInnerRadius, GLdouble dOuterRadius, GLi
*/ */
void FGAPIENTRY glutSolidTorus( GLdouble dInnerRadius, GLdouble dOuterRadius, GLint nSides, GLint nRings ) void FGAPIENTRY glutSolidTorus( GLdouble dInnerRadius, GLdouble dOuterRadius, GLint nSides, GLint nRings )
{ {
double iradius = dInnerRadius, oradius = dOuterRadius, phi, psi, dpsi, dphi; GLdouble iradius = dInnerRadius, oradius = dOuterRadius, phi, psi, dpsi, dphi;
double *vertex, *normal; GLdouble *vertex, *normal;
int i, j; int i, j;
double spsi, cpsi, sphi, cphi ; GLdouble spsi, cpsi, sphi, cphi ;
FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSolidTorus" ); FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSolidTorus" );
@ -1263,13 +1268,13 @@ void FGAPIENTRY glutSolidTorus( GLdouble dInnerRadius, GLdouble dOuterRadius, GL
nRings ++ ; nRings ++ ;
/* Allocate the vertices array */ /* Allocate the vertices array */
vertex = (double *)calloc( sizeof(double), 3 * nSides * nRings ); vertex = (GLdouble *)calloc( sizeof(GLdouble), 3 * nSides * nRings );
normal = (double *)calloc( sizeof(double), 3 * nSides * nRings ); normal = (GLdouble *)calloc( sizeof(GLdouble), 3 * nSides * nRings );
glPushMatrix(); glPushMatrix();
dpsi = 2.0 * M_PI / (double)(nRings - 1) ; dpsi = 2.0 * M_PI / (GLdouble)(nRings - 1) ;
dphi = -2.0 * M_PI / (double)(nSides - 1) ; dphi = -2.0 * M_PI / (GLdouble)(nSides - 1) ;
psi = 0.0; psi = 0.0;
for( j=0; j<nRings; j++ ) for( j=0; j<nRings; j++ )