Changeset 2746 for GTP/trunk/App/Demos/Vis/CHC_revisited/Geometry.cpp

Timestamp:

06/10/08 10:54:13 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/CHC_revisited/Geometry.cpp (modified) (17 diffs)

GTP/trunk/App/Demos/Vis/CHC_revisited/Geometry.cpp

@@ -89 +89 @@
         return true;
 }
+
 
 void Geometry::GenerateList()
@@ -112 +113 @@
                                 break;
                 }
+
                 glEndList();
         }
 }
+
 
 void Geometry::Render()
@@ -238 +241 @@
         {
                 glBegin(GL_TRIANGLE_STRIP);
-                        while(teapot_indices[i] != STRIP_END)
-                        {       
-                                int index = teapot_indices[i] * 3;
-                                
-                                glNormal3fv(teapot_normals + index);
-                                glVertex3fv(teapot_vertices + index);
-                                
-                                i++;            
-                        }
+                
+                while (teapot_indices[i] != STRIP_END)
+                {       
+                        int index = teapot_indices[i] * 3;
+
+                        glNormal3fv(teapot_normals + index);
+                        glVertex3fv(teapot_vertices + index);
+                        
+                        ++ i;           
+                }
+
                 glEnd();
-                
-                i++; // skip strip end flag
-        }
-}
+
+                ++ i; // skip strip end flag
+        }
+}
+
 
 void Geometry::CalcBoundingVolume()
@@ -276 +282 @@
         Vector3 *rotatedPoints = new Vector3[num_vertices];
         
-        for(int i = 0; i < num_vertices; i++)
+        for (int i = 0; i < num_vertices; ++ i)
         {
                 copyVector3Values(rotatedPoints[i], vertices[i * 3],
@@ -288 +294 @@
         calcCubicHull(mBoundingBox.min, mBoundingBox.max, rotatedPoints, num_vertices);
 
-        for(int i=0; i< 3; i++)
+        for (int i = 0; i < 3; ++ i)
         {
                 mBoundingBox.min[i] *= mScale;
@@ -325 +331 @@
 }
 
-/*
-        creates a torus with specified radii, with number of rings and ring
+/*      Creates a torus with specified radii, with number of rings and ring
         subdivision = precision.
 */
@@ -338 +343 @@
         torus_indices = new int[num_torus_indices];
 
-        for(int i = 0; i < precision + 1; ++ i)
+        for (int i = 0; i < precision + 1; ++ i)
         {
                 int index = i * 3;
@@ -364 +369 @@
         }
 
-        for(int i_rng = 1; i_rng < precision + 1; ++ i_rng)
-        {
-                for(int i=0; i<precision+1; ++i)
+        for (int i_rng = 1; i_rng < precision + 1; ++ i_rng)
+        {
+                for(int i = 0; i<precision + 1; ++ i)
                 {
                         int index = 3 * (i_rng * (precision + 1) + i);
@@ -388 +393 @@
         }
 
-        for(int i_rng = 0; i_rng < precision; ++ i_rng)
-        {
-                for(int i = 0; i < precision; ++ i)
+        for (int i_rng = 0; i_rng < precision; ++ i_rng)
+        {
+                for (int i = 0; i < precision; ++ i)
                 {
                         int index = ((i_rng * precision + i) * 2) * 3;
@@ -407 +412 @@
 }
 
-/**
-        counts the triangles of the teapot.
+
+/** Counts the triangles of the teapot.
         traverses through all the triangle strips.
 */
@@ -414 +419 @@
 {
         int result = 0;
-        int i=0;
+        int i = 0;
+
         // n - 2 triangles are drawn for a strip
-        while(i < num_teapot_indices)
-        {
-                while(teapot_indices[i] != STRIP_END)
+        while (i < num_teapot_indices)
+        {
+                while (teapot_indices[i] != STRIP_END)
                 {       
                         result ++;;
-                        i++;            
+                        ++ i;           
                 }
                 result -= 2;
-                i++; // skip STRIP_END
-        }
+                ++ i; // skip STRIP_END
+        }
+
         return result;
 }
 
-/**
-        counts the triangles of the torus
+
+/**     Counts the triangles of the torus
 */
 int Geometry::CountTorusTriangles()
@@ -452 +459 @@
         int result = 0;
 
-        switch(objectType)
+        switch (objectType)
         {
                 case TEAPOT:
@@ -466 +473 @@
                         break;
         }
+
         return result;
 }
@@ -497 +505 @@
 }
 
-/**
-   renders a sphere with sphere_precision subdivisions.
-   note: works only for even sphere_precision
+
+/** Renders a sphere with sphere_precision subdivisions. 
+    Note: works only for even sphere_precision
 */
 void Geometry::RenderSphere()
@@ -508 +516 @@
         glFrontFace(GL_CW);
 
-        for (int j = 0; j < sphere_precision/2; ++j) 
+        for (int j = 0; j < sphere_precision / 2; ++ j) 
         {
                 double alpha = j * PI * 2.0 / (double)sphere_precision - PI_2;
@@ -515 +523 @@
                 glBegin(GL_TRIANGLE_STRIP);
 
-                for (int i = 0; i <= sphere_precision; ++i) 
+                for (int i = 0; i <= sphere_precision; ++ i) 
                 {
                         double gamma = i * PI * 2.0 / (double)sphere_precision;
@@ -536 +544 @@
                 glEnd();
         }
+
         glFrontFace(GL_CCW);
 }