From 417f965466811b3de0575edec9d0182528af0073 Mon Sep 17 00:00:00 2001 From: dcnieho Date: Fri, 5 Apr 2013 11:58:32 +0000 Subject: [PATCH] added API docs for teacup and teaspoon git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1603 7f0cb862-5218-0410-a997-914c9d46530a --- freeglut/web-src/docs/api.php | 47 ++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/freeglut/web-src/docs/api.php b/freeglut/web-src/docs/api.php index 6009967..0184bb0 100644 --- a/freeglut/web-src/docs/api.php +++ b/freeglut/web-src/docs/api.php @@ -198,7 +198,8 @@ will thus not work with the currently available 2.8.1 release.
  • glutWireDodecahedron, glutSolidDodecahedron
  • glutWireIcosahedron, glutSolidIcosahedron
  • glutWireRhombicDodecahedron, glutSolidRhombicDodecahedron
    • -
  • glutWireTeapot, glutSolidTeapot
    • +
  • glutWireTeapot, glutSolidTeapot, glutWireTeacup, + glutSolidTeacup, glutWireTeaspoon, glutSolidTeaspoon
  • Game Mode Functions @@ -2339,46 +2340,58 @@ at which four faces meet are found at (0, 0, +/- 1) and (+/- sqrt(2)/2,

    GLUT does not include these functions.

    -

    15.11 glutWireTeapot, glutSolidTeapot

    +

    15.11 glutWireTeapot, glutSolidTeapot, glutWireTeacup, +glutSolidTeacup, glutWireTeaspoon, glutSolidTeaspoon

    -The glutWireTeapot and glutSolidTeapot functions -draw a wireframe and solid teapot respectively. +The glutWireTeapot and glutSolidTeapot functions draw +a wireframe and solid teapot respectively, the glutWireTeacup +and glutSolidTeacup functions a wireframe and solid teacup, and +the glutWireTeaspoon and glutSolidTeaspoon functions a +wireframe and solid teaspoon.

    Definition

    -void glutWireTeapot (double dSize);
    -void glutSolidTeapot(double dSize);

    +void glutWireTeapot   (double dSize);
    +void glutSolidTeapot  (double dSize);
    +void glutWireTeacup   (double dSize);
    +void glutSolidTeacup  (double dSize);
    +void glutWireTeaspoon (double dSize);
    +void glutSolidTeaspoon(double dSize);

    Arguments

    -

    dSize  The desired size of the teapot

    +

    dSize  The desired size of the teapot, teacup and +teaspoon - relative to a "standard" size

    Description

    -

    The glutWireTeapot and - glutSolidTeapot functions render a teapot of the desired size, - centered at the origin. This is the famous OpenGL teapot [add - reference].

    +

    The glutWireTeapot and glutSolidTeapot functions +render a teapot of the desired size, centered at the origin. This is the +famous teapot created by Martin Newell. The other functions render the +teacup and teaspoon he used in the table scene figure in his PhD thesis. +Vertex data retrieved from: ftp://ftp.funet.fi/pub/sci/graphics/packages/objects/teasetorig.gz.

    Bugs

    OpenGL's default glFrontFace state assumes that front facing polygons (for the purpose of face culling) have vertices that wind -counter clockwise when projected into window space. This teapot is -rendered with its front facing polygon vertices winding clockwise. For -OpenGL's default back face culling to work, you should use:

    +counter clockwise when projected into window space. This teapot, teacup +and teaspoon are rendered with their front facing polygon vertices +winding clockwise. For OpenGL's default back face culling to work, you +should use:

      glFrontFace(GL_CW);
      glutSolidTeapot(size);
      glFrontFace(GL_CCW);

    -

    Both these bugs reflect issues in the original aux toolkit's teapot -rendering routines (GLUT used the same teapot rendering routine).

    +

    Both these bugs reflect issues in the original teaset's vertex data +(and are thus present in GLUT too).

    Changes From GLUT

    -

    None that we know of.

    +

    GLUT only has the teapot and misses the rest of the teaset.

    16. Game Mode Functions