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

bit of preparation for porting cone and cylinder: yes, both can be done

Browse Source 
with triangle strips (and then special treatment of cone tip isn't
needed)


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1212 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
dcnieho 2012-03-25 14:53:41 +00:00
parent f39a3f055e
commit 0f713eaaba
1 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1031,11 +1031,10 @@ void FGAPIENTRY glutSolidCone( double base, double height, GLint slices, GLint s
glEnd(); glEnd();
/* Cover each stack with a quad strip, except the top stack */ /* Cover each stack with a triangle strip */
for( i=0; i<stacks; i++ )
for( i=0; i<stacks-1; i++ )
{ {
glBegin(GL_QUAD_STRIP); glBegin(GL_TRIANGLE_STRIP);
for(j=0; j<=slices; j++) for(j=0; j<=slices; j++)
{ {
@ -1050,22 +1049,6 @@ void FGAPIENTRY glutSolidCone( double base, double height, GLint slices, GLint s
glEnd(); glEnd();
} }
/* The top stack is covered with individual triangles */
glBegin(GL_TRIANGLES);
glNormal3f(cost[0]*sinn, sint[0]*sinn, cosn);
for (j=0; j<slices; j++)
{
glVertex3f(cost[j+0]*r0, sint[j+0]*r0, z0 );
glVertex3f(0, 0, (GLfloat)height);
glNormal3f(cost[j+1]*sinn, sint[j+1]*sinn, cosn );
glVertex3f(cost[j+1]*r0, sint[j+1]*r0, z0 );
}
glEnd();
/* Release sin and cos tables */ /* Release sin and cos tables */
free(sint); free(sint);
@ -1186,7 +1169,7 @@ void FGAPIENTRY glutSolidCylinder(double radius, double height, GLint slices, GL
if (i==stacks) if (i==stacks)
z1 = (GLfloat)height; z1 = (GLfloat)height;
glBegin(GL_QUAD_STRIP); glBegin(GL_TRIANGLE_STRIP);
for (j=0; j<=slices; j++ ) for (j=0; j<=slices; j++ )
{ {
glNormal3f(cost[j], sint[j], 0 ); glNormal3f(cost[j], sint[j], 0 );