Changeset 334

Timestamp:

10/21/06 07:49:49 (2 years ago)

Author:

cneumann

Message:

changed: whitespace/formatting cleanup, a bit more documentation

moved teapot helper functions/data to anonymous namespace

Files:

• trunk/Source/System/NodeCores/Drawables/Geometry/Util/OSGSimpleGeometry.cpp (modified) (64 diffs)

trunk/Source/System/NodeCores/Drawables/Geometry/Util/OSGSimpleGeometry.cpp

@@ -66 +66 @@
-// The Simple Geometry creation functions
-
-
-
-
+
+
-    \a vert quads.
-
-
+
+
+
+
+
+
+
+
+
-NodePtr makePlane(Real32 xsize, Real32 ysize, UInt16 hor, UInt16 vert)
-{
-    GeometryPtr pGeo = makePlaneGeo(xsize, ysize, hor, vert);
-
+
-    if(pGeo == NullFC)
-    {
-        return NullFC;
-    }
-
+
-    NodePtr node = Node::create();
-
@@ -88 +94 @@
-}
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                         UInt16 hor,   UInt16 vert)
-{
@@ -101 +115 @@
-        return NullFC;
-    }
-
+
-    GeoPnt3fPropertyPtr  pnts  = GeoPnt3fProperty ::create();
-    GeoVec3fPropertyPtr  norms = GeoVec3fProperty ::create();
-    GeoVec2fPropertyPtr  tex   = GeoVec2fProperty ::create();
-   
-  
-     
-
+
+
+
+
-    UInt16 x,y;
-    Real32 xstep,ystep;
@@ -120 +134 @@
-    GeoVec2fProperty::StoredFieldType *tx = tex ->editFieldPtr();
-
-    
-    for(y = 0; y <= vert; y++)
-    {
@@ -132 +145 @@
-
-    // create the faces
-
+
-    GeoUInt32Property::StoredFieldType *i = index->editFieldPtr();
-    GeoUInt32Property::StoredFieldType *l = lens ->editFieldPtr();
@@ -141 +154 @@
-        t->push_back(GL_TRIANGLE_STRIP);
-        l->push_back(2 * (hor + 1));
-
+
-        for(x = 0; x <= hor; x++)
-        {
@@ -149 +162 @@
-    }
-
-   
-    // create the geometry
-
+
-    GeometryPtr geo = Geometry::create();
-
@@ -161 +173 @@
-    geo->setTypes(types);
-    geo->setLengths(lens);
-
+
-    return geo;
-}
-
-\ingroup GrpSystemDrawablesGeometrySimpleGeometry
-makeCone creates a cone. It's center sits in the origin of the x/z plane. 
-
+Creates a cone. It's center is in the origin and the bottom is parallel to
+the x/y plane.
+bot
-
-    Each part of the cone (bottom cap, sides) can be enabled or disabled.
-
+    \param[in] height Height of the cone.
+    \param[in] botradius Radius if the bottom.
+    \param[in] sides Number of sides the base is subdivided into.
+    \param[in] doSide If true side faces are created.
+    \param[in] doBttom If true bottom faces are created.
+    \return NodePtr to a newly created Node with a Geometry core.
+
+    \ingroup GrpSystemDrawablesGeometrySimpleGeometry
-*/
-
-
-
-
-
+
+
+
+
-                 bool   doBottom)
-{
- 
- 
- 
- 
- 
- 
+
+
+
+
+
+
-                              doBottom);
-}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-*/
-
-
-
-
-
+
+
+
+
-                        bool   doBottom)
-{
- 
- 
- 
- 
- 
- 
+
+
+
+
+
+
-                                 doBottom);
-}
-
-
-
-
-
+
+
+
-
-    Each part of the cylinder (top cap, bottom cap, sides) can be enabled or
-    disabled.
-
+    \param[in] height Height of the cylinder.
+    \param[in] radius Radius of the cylinder.
+    \param[in] sides Number of sides the base is subdivided into.
+    \param[in] doSide If true, side faces are created.
+    \param[in] doTop If true, top cap faces are created.
+    \param[in] doBttom If true, bottom cap faces are created.
+    \return NodePtr to a newly created Node with a Geometry core.
+
+    \ingroup GrpSystemDrawablesGeometrySimpleGeometry
-*/
-
-
+
-                     Real32 radius,
- 
- 
- 
+
+
+
-                     bool   doBottom)
-{
- 
- 
- 
- 
- 
- 
+
+
+
+
+
+
-                              doBottom);
-}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-*/
-
-
+
-                            Real32 radius,
- 
- 
- 
+
+
+
-                            bool   doBottom)
-{
- 
- 
- 
- 
- 
- 
+
+
+
+
+
+
-                                 doBottom);
-}
-
-
-
-
-
-
-
+
+
+
+
-
-    Each part of the frustum (top cap, bottom cap, sides) can be enabled or
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                           bool   doBottom)
-{
- 
- 
+
+
-                                             botradius,
- 
- 
- 
+
+
+
-                                             doBottom);
-
@@ -285 +338 @@
-        return NullFC;
-    }
-
+
-    NodePtr node = Node::create();
-
@@ -293 +346 @@
-}
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                  bool   doBottom)
-{
-    if(height <= 0 || topradius < 0 || botradius < 0 || sides < 3)
-    {
- 
- 
- 
- 
+
+
+
+
-                 << std::endl;
-        return NullFC;
-    }
-
+
-    GeoPnt3fPropertyPtr  pnts  = GeoPnt3fProperty ::create();
-    GeoVec3fPropertyPtr  norms = GeoVec3fProperty ::create();
-    GeoVec2fPropertyPtr  tex   = GeoVec2fProperty ::create();
-   
-  
-     
-
+
+
+
+
-    Int16  j;
-    Real32 delta = 2.f * Pi / sides;
@@ -327 +389 @@
-    Real32 incl = (botradius - topradius) / height;
-    Real32 nlen = 1.f / osgSqrt(1 + incl * incl);
-
+
-    // vertices
-
@@ -335 +397 @@
-
-    // faces
-
+
-    GeoUInt32Property::StoredFieldType *i  = index->editFieldPtr();
-    GeoUInt32Property::StoredFieldType *l  = lens ->editFieldPtr();
-    GeoUInt8Property::StoredFieldType  *t  = types->editFieldPtr();
-
-    // 
-    
-    if(doSide)
-    {
-        UInt32 baseindex = p->size();
-
+
-        for(j = 0; j <= sides; j++)
-        {
-            beta = j * delta;
-            x    =  osgSin(beta);
-         
+
-
-            p->push_back(Pnt3f(x * topradius, height/2, z * topradius));
@@ -356 +416 @@
-            tx->push_back(Vec2f(1.f - j / (Real32) sides, 1));
-        }
-
+
-        for(j = 0; j <= sides; j++)
-        {
-            beta = j * delta;
-            x    =  osgSin(beta);
-         
+
-
-            p->push_back(Pnt3f(x * botradius, -height/2, z * botradius));
@@ -371 +431 @@
-        l->push_back(2 * (sides + 1));
-
- 
+
-        {
-                i->push_back(baseindex + sides + 1 + j);
@@ -377 +437 @@
-        }
-    }
-
+
-    if(doTop && topradius > 0)
-    {
-        UInt32 baseindex = p->size();
-
+
-        // need to duplicate the points fornow, as we don't have multi-index geo yet
-
+
-        for(j = sides - 1; j >= 0; j--)
-        {
-            beta = j * delta;
-            x    =  topradius * osgSin(beta);
-        
+
-
-            p->push_back(Pnt3f(x, height/2, z));
@@ -398 +458 @@
-        l->push_back(sides);
-
- 
+
-        {
-            i->push_back(baseindex + j);
-        }
-    }
-
+
-    if(doBottom && botradius > 0 )
-    {
-        UInt32 baseindex = p->size();
-
+
-        // need to duplicate the points fornow, as we don't have multi-index geo yet
-
+
-        for(j = sides - 1; j >= 0; j--)
-        {
-            beta = j * delta;
-            x    =  botradius * osgSin(beta);
-      
+
-
-            p->push_back(Pnt3f(x, -height/2, z));
@@ -424 +484 @@
-        l->push_back(sides);
-
- 
+
-        {
-            i->push_back(baseindex + sides - 1 - j);
-        }
-    }
-
+
-    // create the geometry
-
+
-    GeometryPtr geo = Geometry::create();
-
@@ -445 +505 @@
-}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                  UInt16 rings)
-{
-    GeometryPtr pGeo = makeTorusGeo(innerRadius, outerRadius, sides, rings);
-
+
-    if(pGeo == NullFC)
-    {
-        return NullFC;
-    }
-
+
-    NodePtr node = Node::create();
-
@@ -468 +533 @@
-}
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                         UInt16 rings)
-{
-    if(innerRadius <= 0 || outerRadius <= 0 || sides < 3 || rings < 3)
-    {
- 
- 
- 
- 
+
+
+
+
-                 << std::endl;
-        return NullFC;
-    }
-
+
-    GeoPnt3fPropertyPtr  pnts  = GeoPnt3fProperty ::create();
-    GeoVec3fPropertyPtr  norms = GeoVec3fProperty ::create();
-    GeoVec2fPropertyPtr  tex   = GeoVec2fProperty ::create();
-   
-  
-     
-
+
+
+
+
-    UInt16 a, b;
-    Real32 theta, phi;
@@ -506 +579 @@
-    sideDelta = 2.f * Pi / sides;
-
- 
+
-    {
-        cosTheta = osgCos(theta);
-        sinTheta = osgSin(theta);
-
- 
+
-        {
-            GLfloat cosPhi, sinPhi, dist;
@@ -519 +592 @@
-            dist   = outerRadius + innerRadius * cosPhi;
-
- 
- 
+
+
-                              sinPhi));
- 
- 
+
+
-                              innerRadius * sinPhi));
-            tx->push_back(Vec2f(- a / (Real32) rings, b / (Real32)sides));
-        }
-   
+
-
-    // create the faces
-
+
-    GeoUInt32Property::StoredFieldType *i  = index->editFieldPtr();
-    GeoUInt32Property::StoredFieldType *l  = lens ->editFieldPtr();
-    GeoUInt8Property::StoredFieldType  *t  = types->editFieldPtr();
-
- 
+
-    {
-        t->push_back(GL_TRIANGLE_STRIP);
-        l->push_back((rings + 1) * 2);
-
+
-        for(b = 0; b <= rings; b++)
-        {
@@ -548 +621 @@
-
-    // create the geometry
-
+
-    GeometryPtr geo = Geometry::create();
-
@@ -558 +631 @@
-    geo->setTypes(types);
-    geo->setLengths(lens);
-
+
-    return geo;
-}
@@ -564 +637 @@
-#if !defined(OSG_DO_DOC) || defined(OSG_DOC_DEV)
-
-
+
+
+
+
+
+
+
+
-{
-    Real32 len = vec.length();
- 
+
-    {
-        len = 1;
- 
- 
+
+
-    {
-        len = length / len;
-    }
-    vec *= len;
-
+
-    return length;
-}
@@ -584 +664 @@
-    const Real32 TwoPi  = 6.283185307179586;
-    const Real32 HalfPi = 1.570796326794897;
-
+
-    Real32 phi = osgATan2(-n[2], n[0]) - HalfPi;
-
@@ -590 +670 @@
-        phi += TwoPi;
-    phi /= TwoPi;
-
+
-    return phi;
-}
@@ -617 +697 @@
-}
-
- 
- 
+
+
-                        UInt32 i3,
- 
+
-                        GeoPnt3fProperty::StoredFieldType  *p,
-                        GeoVec3fProperty::StoredFieldType  *n,
@@ -626 +706 @@
-                        GeoUInt32Property::StoredFieldType *i,
-                        GeoUInt32Property::StoredFieldType *tci,
- 
-   
- 
+
+
+
-    {
-        i->push_back(i1);
@@ -636 +716 @@
-        i->push_back(i3);
-        tci->push_back(i3);
-
-         
+
+
-    }
-
@@ -648 +728 @@
-    v23 = v2 + (v3 - v2) * .5f;
-    v31 = v3 + (v1 - v3) * .5f;
-
+
-    v12 /= 2.0f;
-    v23 /= 2.0f;
-    v31 /= 2.0f;
-
+
-    UInt32 i12 = z++, i23 = z++, i31 = z++;
-
@@ -658 +738 @@
-    addPoint(v23,i23,radius,p,n,tx);
-    addPoint(v31,i31,radius,p,n,tx);
-
+
-    subdivideTriangle( i1, i12, i31, depth - 1, p,n,tx,i,tci, z, radius);
-    subdivideTriangle( i2, i23, i12, depth - 1, p,n,tx,i,tci, z, radius);
@@ -667 +747 @@
-#endif            // exclude from doc
-
-
-
+
-    recursive subdivision of an icosahedron, with \a depth giving the number
-    of subdivisions and \a radius being the radius.
-
-
-
+
+
+
+
+
+
-NodePtr makeSphere(UInt16 depth, Real32 radius)
-   
+
-    GeometryPtr pGeo = makeSphereGeo(depth, radius);
-
@@ -686 +769 @@
-
-    node->setCore(pGeo);
-
+
-    return node;
-}
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-GeometryPtr makeSphereGeo(UInt16 depth, Real32 radius)
-{
@@ -703 +792 @@
-    GeoVec3fPropertyPtr  norms   = GeoVec3fProperty ::create();
-    GeoVec2fPropertyPtr  tex     = GeoVec2fProperty ::create();
-   
-   
-  
-     
+
+
+
+
-
-    UInt32              j,z;
-
+
-    static Vec3f v[12] = {  Vec3f(-X, 0.,  Z),
-                            Vec3f( X, 0.,  Z),
@@ -730 +819 @@
-    for (j=0; j<12; j++)
-        mat.mult(v[j]);
-
+
-    Int32 tr[20][3] = { {1,4,0},  {4,9,0},  {4,5,9},  {8,5,4},  {1,8,4},
-                        {1,10,8}, {10,3,8}, {8,3,5},  {3,2,5},  {3,7,2},
-                        {3,10,7}, {10,6,7}, {6,11,7}, {6,0,11}, {6,1,0},
-                  
-
+
+
-    GeoPnt3fProperty::StoredFieldType  *p  = pnts ->editFieldPtr();
-    GeoVec3fProperty::StoredFieldType  *n  = norms->editFieldPtr();
@@ -751 +840 @@
-    i->reserve (estimatedSize);
-    tci->reserve (estimatedSize);
-
-     
- 
+
+
+
-    {
-        Vec3f pnt = v[j];
-        Vec3f norm = v[j];
-
+
-        setVecLen(pnt, radius);
-        norm.normalize();
-
+
-        p->push_back(pnt.addToZero());
-        n->push_back(norm);
@@ -774 +863 @@
-        tx->push_back(texCoord);
-    }
-
+
-    // subdivide the triangles
-    z=12;
- 
-
- 
+
+
+
-                          depth, p, n, tx, i, tci, z, radius);
-    }
@@ -785 +874 @@
-    types->push_back(GL_TRIANGLES);
-    lens->push_back(i->size());
-
+
-    // create the geometry
-    GeometryPtr geo = Geometry::create();
-
-   
-    geo->setMaterial(getDefaultMaterial());
-    geo->setPositions(pnts);
@@ -823 +911 @@
-                {
-                    Real32 theta = ti.getTexCoords(i).y();
-
- 
- 
+
+
+
-                          q[2][0] <= -Eps  ) )
-                    {
@@ -832 +920 @@
-                        if(osgAbs(osgAbs(norm[1]) - 1) <= Eps)
-                            texCoord[0] = 0.5;
-
+
-                        tex->push_back(texCoord);
-
+
-                        tcindex->setValue( tex->size() - 1, ti.getTexCoordsIndex(i));
-                    }
@@ -843 +931 @@
-                        if (osgAbs(osgAbs(norm[1]) - 1) <= Eps)
-                            texCoord[0] = 0.5;
-
+
-                        tex->push_back(texCoord);
-
+
-                        index->setValue( tex->size() - 1, ti.getTexCoordsIndex(i));
-                    }
@@ -852 +940 @@
-        }
-    }
-
+
-    endEditCP(geo);
-#endif
@@ -859 +947 @@
-}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+