From 3d924d7d4f041c56f02720554514bdcb5b989579 Mon Sep 17 00:00:00 2001 From: Diederick Niehorster Date: Sun, 22 Apr 2012 16:30:19 +0000 Subject: [PATCH 1/1] cylinder also ported little bit of cleanup in Cone and Sphere code (fixed normals of top of cone, no longer generating too many indices for wire frame) git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1262 7f0cb862-5218-0410-a997-914c9d46530a --- src/fg_geometry.c | 386 +++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 268 insertions(+), 118 deletions(-) diff --git a/src/fg_geometry.c b/src/fg_geometry.c index 26a30a5..44b9322 100644 --- a/src/fg_geometry.c +++ b/src/fg_geometry.c @@ -843,6 +843,8 @@ static void fghGenerateSphere(GLfloat radius, GLint slices, GLint stacks, GLfloa return; } *nVert = slices*(stacks-1)+2; + if ((*nVert) > 65535) /* TODO: must have a better solution than this low limit, at least for architectures where gluint is available */ + fgWarning("fghGenerateSphere: too many slices or stacks requested, indices will wrap"); /* precompute values on unit circle */ fghCircleTable(&sint1,&cost1,-slices,FALSE); @@ -936,7 +938,10 @@ void fghGenerateCone( *nVert = 0; return; } - *nVert = slices*(stacks+1)+1; + *nVert = slices*(stacks+2)+1; /* need an extra stack for closing off bottom with correct normals */ + + if ((*nVert) > 65535) + fgWarning("fghGenerateCone: too many slices or stacks requested, indices will wrap"); /* Pre-computed circle */ fghCircleTable(&sint,&cost,-slices,FALSE); @@ -959,6 +964,16 @@ void fghGenerateCone( (*normals )[1] = 0.f; (*normals )[2] = -1.f; idx = 3; + /* other on bottom (get normals right) */ + for (j=0; j 0 ) ? stacks : 1 ); + + /* Pre-computed circle */ + GLfloat *sint,*cost; + + /* number of unique vertices */ + if (slices==0 || stacks<1) + { + /* nothing to generate */ + *nVert = 0; + return; + } + *nVert = slices*(stacks+3)+2; /* need two extra stacks for closing off top and bottom with correct normals */ + + if ((*nVert) > 65535) + fgWarning("fghGenerateCylinder: too many slices or stacks requested, indices will wrap"); + + /* Pre-computed circle */ + fghCircleTable(&sint,&cost,-slices,FALSE); + + /* Allocate vertex and normal buffers, bail out if memory allocation fails */ + *vertices = malloc((*nVert)*3*sizeof(GLfloat)); + *normals = malloc((*nVert)*3*sizeof(GLfloat)); + if (!(vertices) || !(normals)) + { + free(*vertices); + free(*normals); + fgError("Failed to allocate memory in fghGenerateCylinder"); + } + + z=0; + /* top on Z-axis */ + (*vertices)[0] = 0.f; + (*vertices)[1] = 0.f; + (*vertices)[2] = 0.f; + (*normals )[0] = 0.f; + (*normals )[1] = 0.f; + (*normals )[2] = -1.f; + idx = 3; + /* other on top (get normals right) */ + for (j=0; j 65535) - fgWarning("fghSphere: too many slices or stacks requested, indices will wrap"); - /* Generate vertices and normals */ fghGenerateSphere((GLfloat)radius,slices,stacks,&vertices,&normals,&nVert); @@ -1246,10 +1360,8 @@ static void fghCone( double base, double height, GLint slices, GLint stacks, GLb int i,j,idx, nVert; GLfloat *vertices, *normals; - if (slices * stacks > 65535) - fgWarning("fghCone: too many slices or stacks requested, indices will wrap"); - /* Generate vertices and normals */ + /* Note, (stacks+1)*slices vertices for side of object, slices+1 for top and bottom closures */ fghGenerateCone((GLfloat)base,(GLfloat)height,slices,stacks,&vertices,&normals,&nVert); if (nVert==0) @@ -1274,9 +1386,9 @@ static void fghCone( double base, double height, GLint slices, GLint stacks, GLb } /* generate for each stack */ - for (i=0,idx=0; i 0 ) ? stacks : 1 ); - - /* Pre-computed circle */ - - GLfloat *sint,*cost; - FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSolidCylinder" ); - fghCircleTable(&sint,&cost,-slices,FALSE); - - /* Cover the base and top */ - - glBegin(GL_TRIANGLE_FAN); - glNormal3f(0, 0, -1 ); - glVertex3f(0, 0, 0 ); - for (j=0; j<=slices; j++) - glVertex3f(cost[j]*radf, sint[j]*radf, 0); - glEnd(); - - glBegin(GL_TRIANGLE_FAN); - glNormal3f(0, 0, 1 ); - glVertex3f(0, 0, (GLfloat)height); - for (j=slices; j>=0; j--) - glVertex3f(cost[j]*radf, sint[j]*radf, (GLfloat)height); - glEnd(); - - /* Do the stacks */ - - z0 = 0; - z1 = zStep; - - for (i=1; i<=stacks; i++) - { - if (i==stacks) - z1 = (GLfloat)height; - - glBegin(GL_TRIANGLE_STRIP); - for (j=0; j<=slices; j++ ) - { - glNormal3f(cost[j], sint[j], 0 ); - glVertex3f(cost[j]*radf, sint[j]*radf, z0 ); - glVertex3f(cost[j]*radf, sint[j]*radf, z1 ); - } - glEnd(); - - z0 = z1; z1 += zStep; - } - - /* Release sin and cos tables */ - - free(sint); - free(cost); + fghCylinder( radius, height, slices, stacks, FALSE ); } /* @@ -1491,58 +1690,9 @@ void FGAPIENTRY glutSolidCylinder(double radius, double height, GLint slices, GL */ void FGAPIENTRY glutWireCylinder(double radius, double height, GLint slices, GLint stacks) { - int i,j; - - /* Step in z and radius as stacks are drawn. */ - GLfloat radf = (GLfloat)radius; - GLfloat z = 0; - const GLfloat zStep = (GLfloat)height / ( ( stacks > 0 ) ? stacks : 1 ); - - /* Pre-computed circle */ - - GLfloat *sint,*cost; - FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWireCylinder" ); - fghCircleTable(&sint,&cost,-slices,FALSE); - - /* Draw the stacks... */ - - for (i=0; i<=stacks; i++) - { - if (i==stacks) - z = (GLfloat)height; - - glBegin(GL_LINE_LOOP); - - for( j=0; j