songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Nef_S2: remove attempt to remove OpenGL warnings

This commit is contained in:
Pierre Alliez 2008-10-14 11:02:44 +00:00
parent df58898190
commit 7287c68d75
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Nef_S2/include/CGAL/Nef_S2/Sphere_geometry_OGL.h
View File

@ -557,8 +557,8 @@ void construct_axes() const
// red x-axis and equator // red x-axis and equator
glColor3f(1.0,0.0,0.0); glColor3f(1.0,0.0,0.0);
glBegin(GL_LINES); glBegin(GL_LINES);
glVertex3f(0.0,0.0,0.0); glVertex3d(0.0,0.0,0.0);
glVertex3f(1.2,0.0,0.0); glVertex3d(1.2,0.0,0.0);
glEnd(); glEnd();
glBegin(GL_LINE_LOOP); glBegin(GL_LINE_LOOP);
for(i=0;i<100;i++) for(i=0;i<100;i++)
@ -567,8 +567,8 @@ void construct_axes() const
// green y-axis and equator // green y-axis and equator
glColor3f(0.0,1.0,0.0); glColor3f(0.0,1.0,0.0);
glBegin(GL_LINES); glBegin(GL_LINES);
glVertex3f(0.0,0.0,0.0); glVertex3d(0.0,0.0,0.0);
glVertex3f(0.0,1.2,0.0); glVertex3d(0.0,1.2,0.0);
glEnd(); glEnd();
glBegin(GL_LINE_LOOP); glBegin(GL_LINE_LOOP);
for(i=0;i<100;i++) for(i=0;i<100;i++)
@ -577,8 +577,8 @@ void construct_axes() const
// blue z-axis and equator // blue z-axis and equator
glColor3f(0.0,0.0,1.0); glColor3f(0.0,0.0,1.0);
glBegin(GL_LINES); glBegin(GL_LINES);
glVertex3f(0.0,0.0,0.0); glVertex3d(0.0,0.0,0.0);
glVertex3f(0.0,0.0,1.2); glVertex3d(0.0,0.0,1.2);
glEnd(); glEnd();
glBegin(GL_LINE_LOOP); glBegin(GL_LINE_LOOP);
for(i=0;i<100;i++) for(i=0;i<100;i++)
@ -603,26 +603,26 @@ void construct_cube() const
glColor3f(1,1,0); // yellow glColor3f(1,1,0); // yellow
glLineWidth(2.0); glLineWidth(2.0);
glBegin(GL_LINE_LOOP); glBegin(GL_LINE_LOOP);
glVertex3f(-1.0,-1.0,-1.0); glVertex3d(-1.0,-1.0,-1.0);
glVertex3f( 1.0,-1.0,-1.0); glVertex3d( 1.0,-1.0,-1.0);
glVertex3f( 1.0, 1.0,-1.0); glVertex3d( 1.0, 1.0,-1.0);
glVertex3f(-1.0, 1.0,-1.0); glVertex3d(-1.0, 1.0,-1.0);
glEnd(); glEnd();
glBegin(GL_LINE_LOOP); glBegin(GL_LINE_LOOP);
glVertex3f(-1.0,-1.0, 1.0); glVertex3d(-1.0,-1.0, 1.0);
glVertex3f( 1.0,-1.0, 1.0); glVertex3d( 1.0,-1.0, 1.0);
glVertex3f( 1.0, 1.0, 1.0); glVertex3d( 1.0, 1.0, 1.0);
glVertex3f(-1.0, 1.0, 1.0); glVertex3d(-1.0, 1.0, 1.0);
glEnd(); glEnd();
glBegin(GL_LINES); glBegin(GL_LINES);
glVertex3f(-1.0,-1.0,-1.0); glVertex3d(-1.0,-1.0,-1.0);
glVertex3f(-1.0,-1.0, 1.0); glVertex3d(-1.0,-1.0, 1.0);
glVertex3f( 1.0,-1.0,-1.0); glVertex3d( 1.0,-1.0,-1.0);
glVertex3f( 1.0,-1.0, 1.0); glVertex3d( 1.0,-1.0, 1.0);
glVertex3f( 1.0, 1.0,-1.0); glVertex3d( 1.0, 1.0,-1.0);
glVertex3f( 1.0, 1.0, 1.0); glVertex3d( 1.0, 1.0, 1.0);
glVertex3f(-1.0, 1.0,-1.0); glVertex3d(-1.0, 1.0,-1.0);
glVertex3f(-1.0, 1.0, 1.0); glVertex3d(-1.0, 1.0, 1.0);
glEnd(); glEndList(); glEnd(); glEndList();
} }
@ -661,7 +661,7 @@ void draw() const
glEnable(GL_LIGHTING); glEnable(GL_LIGHTING);
if ( style_ == SM_SKELETON ) { if ( style_ == SM_SKELETON ) {
glEnable(GL_COLOR_MATERIAL); glEnable(GL_COLOR_MATERIAL);
glColor3f(0.7,0.7,0.7); glColor3f(0.7f,0.7f,0.7f);
gluSphere(sphere_,shrink_fac,50,50); gluSphere(sphere_,shrink_fac,50,50);
glDisable(GL_COLOR_MATERIAL); glDisable(GL_COLOR_MATERIAL);
} }