Changeset 1282Tweet

Timestamp:

Apr 23, 2012, 8:13:17 PM (11 years ago)

Author:

sam

Message:

orbital: improve the cog mesh generator.

File:

• trunk/orbital/mesh.h (modified) (5 diffs)

trunk/orbital/mesh.h

@@ -514 +514 @@
         for (int i = 0; i < nsides; i++)
         {
-            AppendQuadVert(p1);
-            SetCurVertNormal(n);
-            AppendQuadVert(p2);
-            SetCurVertNormal(n);
+            AppendQuadVert(p1); SetCurVertNormal(n);
+            AppendQuadVert(p2); SetCurVertNormal(n);
             SetCurVertColor(m_color2);
 
@@ -533 +531 @@
             if (!smooth)
             {
-                AppendQuadVert(p1);
-                SetCurVertNormal(n);
-                AppendQuadVert(p2);
-                SetCurVertNormal(n);
+                AppendQuadVert(p1); SetCurVertNormal(n);
+                AppendQuadVert(p2); SetCurVertNormal(n);
                 SetCurVertColor(m_color2);
 
@@ -736 +732 @@
             AppendQuadVert(p1);
             AppendQuadVert(p2);
-            AppendQuadVert(p3);
-            SetCurVertColor(m_color2);
-            AppendQuadVert(p4);
-            SetCurVertColor(m_color2);
+            AppendQuadVert(p3); SetCurVertColor(m_color2);
+            AppendQuadVert(p4); SetCurVertColor(m_color2);
 
             int j = (i + 1) % nbranches;
@@ -822 +816 @@
         mat3 rotmat = mat3::rotate(180.0f / nbsides, 0.f, 1.f, 0.f);
 
-        vec3 p1(r1, h * .5f, 0.f);
-        vec3 p2 = rotmat * p1;
-        vec3 p3 = rotmat * vec3(r1 + r12, h * .5f, 0.f);
-        vec3 p4 = rotmat * p3;
-
-        vec3 p5(r2, h * -.5f, 0.f);
-        vec3 p6 = rotmat * p5;
-        vec3 p7 = rotmat * vec3(r2 + r22, h * -.5f, 0.f);
-        vec3 p8 = rotmat * p7;
+        vec3 p[8];
+
+        p[0] = vec3(r1, h * .5f, 0.f);
+        p[1] = rotmat * p[0];
+        p[2] = rotmat * vec3(r1 + r12, h * .5f, 0.f);
+        p[3] = rotmat * p[2];
+
+        p[4] = vec3(r2, h * -.5f, 0.f);
+        p[5] = rotmat * p[4];
+        p[6] = rotmat * vec3(r2 + r22, h * -.5f, 0.f);
+        p[7] = rotmat * p[6];
 
         rotmat = rotmat * rotmat;
@@ -836 +832 @@
         for (int i = 0; i < nbsides; i++)
         {
-            AppendQuadVert(p1);
-            AppendQuadVert(p2);
-            AppendQuadVert(p3);
-            AppendQuadVert(p4);
-
-            AppendQuadVert(p5); SetCurVertColor(m_color2);
-            AppendQuadVert(p6); SetCurVertColor(m_color2);
-            AppendQuadVert(p7); SetCurVertColor(m_color2);
-            AppendQuadVert(p8); SetCurVertColor(m_color2);
-
-            int j = (i + 1) % nbsides;
-
-            AppendQuad(-2, 24 * i, 24 * i + 1, 24 * j, vbase + 2);
-            AppendQuad(-1, 24 * j + 4, 24 * i + 5, 24 * i + 4, vbase + 2);
-
-            AppendQuad(24 * i + 1, 24 * i + 2, 24 * i + 3, 24 * j, vbase + 2);
-            AppendQuad(24 * j + 4, 24 * i + 7, 24 * i + 6, 24 * i + 5, vbase + 2);
-
-            AppendQuadVert(p1);
-            AppendQuadVert(p2);
-            AppendQuadVert(p5); SetCurVertColor(m_color2);
-            AppendQuadVert(p6); SetCurVertColor(m_color2);
-            AppendQuad(24 * i + 9, 24 * i + 8, 24 * i + 10, 24 * i + 11, vbase + 2);
-
-            AppendQuadVert(p2);
-            AppendQuadVert(p3);
-            AppendQuadVert(p6); SetCurVertColor(m_color2);
-            AppendQuadVert(p7); SetCurVertColor(m_color2);
-            AppendQuad(24 * i + 13, 24 * i + 12, 24 * i + 14, 24 * i + 15, vbase + 2);
-
-            AppendQuadVert(p3);
-            AppendQuadVert(p4);
-            AppendQuadVert(p7); SetCurVertColor(m_color2);
-            AppendQuadVert(p8); SetCurVertColor(m_color2);
-            AppendQuad(24 * i + 17, 24 * i + 16, 24 * i + 18, 24 * i + 19, vbase + 2);
-
-            AppendQuadVert(p4);
-            AppendQuadVert(p1);
-            AppendQuadVert(p8); SetCurVertColor(m_color2);
-            AppendQuadVert(p5); SetCurVertColor(m_color2);
-            AppendQuad(24 * j + 21, 24 * i + 20, 24 * i + 22, 24 * j + 23, vbase + 2);
-
-            p1 = rotmat * p1;
-            p2 = rotmat * p2;
-            p3 = rotmat * p3;
-            p4 = rotmat * p4;
-            p5 = rotmat * p5;
-            p6 = rotmat * p6;
-            p7 = rotmat * p7;
-            p8 = rotmat * p8;
+            /* Each vertex will share three faces, so three different
+             * normals, therefore we add each vertex three times. */
+            for (int n = 0; n < 24; n++)
+            {
+                AppendQuadVert(p[n / 3]);
+                if (n / 3 >= 4)
+                    SetCurVertColor(m_color2);
+            }
+
+            int j = 24 * i, k = 24 * ((i + 1) % nbsides);
+
+            /* The top and bottom faces */
+            AppendQuad(0, j + 2, j + 5, k + 2, vbase);
+            AppendQuad(1, k + 14, j + 17, j + 14, vbase);
+            AppendQuad(j + 5, j + 8, j + 11, k + 2, vbase);
+            AppendQuad(k + 14, j + 23, j + 20, j + 17, vbase);
+
+            /* The side quads */
+            AppendQuad(j + 6, j + 3, j + 15, j + 18, vbase);
+            AppendQuad(j + 9, j + 7, j + 19, j + 21, vbase);
+            AppendQuad(j + 12, j + 10, j + 22, j + 24, vbase);
+            AppendQuad(k + 4, j + 13, j + 25, k + 16, vbase);
+
+            for (int n = 0; n < 8; n++)
+                p[n] = rotmat * p[n];
         }