Changeset 1278Tweet

Timestamp:

Apr 23, 2012, 2:20:16 PM (11 years ago)

Author:

sam

Message:

orbital: cylinders now have correct normals.

File:

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

trunk/orbital/mesh.h

@@ -501 +501 @@
 
         mat3 rotmat = mat3::rotate(360.0f / nsides, 0.f, 1.f, 0.f);
-        vec3 p1(r1, -h, 0.f);
-        vec3 p2(r2, h, 0.f);
-
+        vec3 p1(r1, -h, 0.f), p2(r2, h, 0.f), n;
+
+        /* Construct normal */
+        n = p2;
+        n.y = r1 * (r1 - r2) / (2.f * h);
+        if (!smooth)
+            n = mat3::rotate(180.0f / nsides, 0.f, 1.f, 0.f) * n;
+        n = normalize(n);
+
+        /* FIXME: normals should be flipped in two-sided mode, but that
+         * means duplicating the vertices again... */
         for (int i = 0; i < nsides; i++)
         {
             AppendQuadVert(p1);
+            SetCurVertNormal(n);
             AppendQuadVert(p2);
+            SetCurVertNormal(n);
             SetCurVertColor(m_color2);
 
@@ -516 +526 @@
                 if (dualside)
                     AppendQuad(i * 2, i * 2 + 1, j * 2 + 1, j * 2, vbase);
-
-                /* TODO: compute normals */
             }
 
@@ -526 +534 @@
             {
                 AppendQuadVert(p1);
+                SetCurVertNormal(n);
                 AppendQuadVert(p2);
+                SetCurVertNormal(n);
                 SetCurVertColor(m_color2);
 
@@ -533 +543 @@
                     AppendQuad(i * 4, i * 4 + 1, i * 4 + 3, i * 4 + 2, vbase);
             }
-        }
-
-        if (!smooth)
-            ComputeQuadNormals(ibase, m_quadidx.Count() - ibase);
+
+            n = rotmat * n;
+        }
     }