← Back to branch summary

~ubuntu-branches/ubuntu/quantal/mesa/quantal

« back to all changes in this revision

Viewing changes to src/glut/mini/models.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2007-02-21 12:44:07 UTC
  • mfrom: (1.2.1 upstream)
  • mto: This revision was merged to the branch mainline in revision 22.
  • Revision ID: james.westby@ubuntu.com-20070221124407-rgcacs32mycrtadl
Import upstream version 6.5.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/glut/mini/models.c
152
152
 
153
153
  for (i = 5; i >= 0; i--) {
154
154
    glBegin(type);
155
 
/*     glNormal3fv(&n[i][0]); */
 
155
    glNormal3fv(&n[i][0]);
156
156
    glVertex3fv(&v[faces[i][0]][0]);
157
157
    glVertex3fv(&v[faces[i][1]][0]);
158
158
    glVertex3fv(&v[faces[i][2]][0]);
205
205
      sinPhi = sin(phi);
206
206
      dist = R + r * cosPhi;
207
207
 
208
 
/*       glNormal3f(cosTheta1 * cosPhi, -sinTheta1 * cosPhi, sinPhi); */
 
208
      glNormal3f(cosTheta1 * cosPhi, -sinTheta1 * cosPhi, sinPhi);
209
209
      glVertex3f(cosTheta1 * dist, -sinTheta1 * dist, r * sinPhi);
210
 
/*       glNormal3f(cosTheta * cosPhi, -sinTheta * cosPhi, sinPhi); */
 
210
      glNormal3f(cosTheta * cosPhi, -sinTheta * cosPhi, sinPhi);
211
211
      glVertex3f(cosTheta * dist, -sinTheta * dist,  r * sinPhi);
212
212
    }
213
213
    glEnd();
222
222
glutWireTorus(GLdouble innerRadius, GLdouble outerRadius,
223
223
  GLint nsides, GLint rings)
224
224
{
225
 
/*   glPushAttrib(GL_POLYGON_BIT); */
226
 
/*   glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); */
 
225
  glPushAttrib(GL_POLYGON_BIT);
 
226
  glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
227
227
  doughnut(innerRadius, outerRadius, nsides, rings);
228
 
/*   glPopAttrib(); */
 
228
  glPopAttrib();
229
229
}
230
230
 
231
231
void APIENTRY
318
318
  normalize(n0);
319
319
 
320
320
  glBegin(shadeType);
321
 
/*   glNormal3fv(n0); */
 
321
  glNormal3fv(n0);
322
322
  glVertex3fv(&dodec[a][0]);
323
323
  glVertex3fv(&dodec[b][0]);
324
324
  glVertex3fv(&dodec[c][0]);
377
377
  normalize(q1);
378
378
 
379
379
  glBegin(shadeType);
380
 
/*   glNormal3fv(q1); */
 
380
  glNormal3fv(q1);
381
381
  glVertex3fv(n1);
382
382
  glVertex3fv(n2);
383
383
  glVertex3fv(n3);