manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

modificato: 

- void  Cone(..)
 aggiustate le normali per avere un effetto piu' gradevole.
This commit is contained in:
Paolo Cignoni 2005-06-30 13:20:32 +00:00
parent 7df3a00426
commit 701abb9c2c
1 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
wrap/gl/addons.h
View File

@ -158,6 +158,8 @@ namespace vcg
glNormal3f(1,0,0); glNormal3f(1,0,0);
glVertex3d(1,0,1); glVertex3d(1,0,1);
glEnd(); glEnd();
if (useDisplList) if (useDisplList)
glEndList(); glEndList();
} }
@ -250,32 +252,46 @@ namespace vcg
if (((!glIsList(cone_List))&&(useDisplList))||(!useDisplList)) if (((!glIsList(cone_List))&&(useDisplList))||(!useDisplList))
{ {
int h; int h=1;
vcg::Point3d p0; vcg::Point3f p0;
vcg::Point3f P[2];
vcg::Point3f N[2];
glScaled(lenght,width,width); glScaled(lenght,width,width);
if (useDisplList) if (useDisplList)
{ {
cone_List = glGenLists(1); cone_List = glGenLists(1);
glNewList(cone_List, GL_COMPILE); glNewList(cone_List, GL_COMPILE);
} }
for(h=0; h < 2; ++h){ for(h=0; h < 2; ++h)
glBegin(GL_TRIANGLE_FAN); {
p0 = Point3d(0,0,0);
if(h==0) //glBegin(GL_TRIANGLE_FAN);
//p0[0]+=lenght; p0 = Point3f(0,0,0);
p0[0]+=1.f; if(h==0) p0[0]+=1.f;
glNormal3f(1,0.0,0.0); //glNormal3f(1,0.0,0.0);
glVertex3d(p0[0],p0[1],p0[2]); //glVertex3d(p0[0],p0[1],p0[2]);
N[0]= Point3f( 1.f,sinf(0),cosf(0) );
P[0]= Point3f( 0,sinf(0),cosf(0));
int b; int b;
for(b = 0; b <= slices; ++b){ for(b = 1; b <= slices; ++b)
{
double angle = -6.28*b/(double)slices; double angle = -6.28*b/(double)slices;
//double ratio= lenght/width; if (b==slices) angle=0;
//Point3d N0( ratio,ratio*sin(angle),ratio* cos(angle) ); N[1] = Point3f( 1.f, sinf(angle), cosf(angle) );
Point3d N0( 1.f,sin(angle),cos(angle) ); P[1] = Point3f( 0, sinf(angle), cosf(angle));
glNormal3f(N0[0],N0[1],N0[2]);
//p0 = Point3d( 0, width * sin(angle),width * cos(angle)); glBegin(GL_TRIANGLES);
p0 = Point3d( 0,sin(angle),cos(angle)); Point3f n = ( (P[0]-p0) ^ (P[2]-p0) ).Normalize();
glVertex3d(p0[0],p0[1],p0[2]); glNormal3f(n[0],n[1],n[2]);
glVertex3f(p0[0],p0[1],p0[2]);
glNormal3f(N[0][0],N[0][1],N[0][2]);
glVertex3f(P[0][0],P[0][1],P[0][2]);
glNormal3f(N[1][0],N[1][1],N[1][2]);
glVertex3f(P[1][0],P[1][1],P[1][2]);
glEnd();
N[0] = N[1];
P[0] = P[1];
} }
glEnd(); glEnd();
} }