Changeset 1276Tweet

Timestamp:

Apr 23, 2012, 8:42:01 AM (11 years ago)

Author:

sam

Message:

orbital: implement cylinders in the mesh builder; their normals are wrong
in the smooth case, for now.

File:

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

trunk/orbital/mesh.h

@@ -25 +25 @@
         vec4 v4;
         vec3 v3;
-        float f1, f2, f3, f4, f5;
+        float f1, f2, f3, f4, f5, f6;
 
         for (char const *p = command; p && *p; )
@@ -52 +52 @@
             else CASE("my")  { MirrorY(); }
             else CASE("mz")  { MirrorZ(); }
-            else CASE("ac")  { /* TODO */ }
+            else CASE("ac")  { p = GetArg(p, f1, f2, f3); p = GetArg(p, f4, f5, f6); AppendCylinder((int)f1, f2, f3, f4, (int)f5, (int)f6); }
             else CASE("ab")  { p = GetArg(p, v3); AppendBox(v3); }
             else CASE("ascb") { p = GetArg(p, v3, f1); AppendSmoothChamfBox(v3, f1); }
@@ -494 +494 @@
     }
 
-    void AppendCylinder() {} /* TODO */
+    void AppendCylinder(int nsides, float h, float r1, float r2,
+                        int dualside, int smooth)
+    {
+        int ibase = m_quadidx.Count();
+        int vbase = m_vert.Count();
+
+        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);
+
+        for (int i = 0; i < nsides; i++)
+        {
+            AppendQuadVert(p1);
+            AppendQuadVert(p2);
+            SetCurVertColor(m_color2);
+
+            if (smooth)
+            {
+                int j = (i + 1) % nsides;
+                AppendQuad(j * 2, j * 2 + 1, i * 2 + 1, i * 2, vbase);
+                if (dualside)
+                    AppendQuad(i * 2, i * 2 + 1, j * 2 + 1, j * 2, vbase);
+
+                /* TODO: compute normals */
+            }
+
+            p1 = rotmat * p1;
+            p2 = rotmat * p2;
+
+            if (!smooth)
+            {
+                AppendQuadVert(p1);
+                AppendQuadVert(p2);
+                SetCurVertColor(m_color2);
+
+                AppendQuad(i * 4 + 2, i * 4 + 3, i * 4 + 1, i * 4, vbase);
+                if (dualside)
+                    AppendQuad(i * 4, i * 4 + 1, i * 4 + 3, i * 4 + 2, vbase);
+            }
+        }
+
+        if (!smooth)
+            ComputeQuadNormals(ibase, m_quadidx.Count() - ibase);
+    }
 
     void AppendSphere(vec3 const &size, int divisions)