Changeset 1281Tweet

Timestamp:

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

Author:

sam

Message:

orbital: start implementing AppendCog() in the mesh builder.

File:

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

trunk/orbital/mesh.h

@@ -25 +25 @@
         vec4 v4;
         vec3 v3;
-        float f1, f2, f3, f4, f5, f6;
+        float f1, f2, f3, f4, f5, f6, f7, f8;
 
         for (char const *p = command; p && *p; )
@@ -62 +62 @@
             else CASE("at")  { p = GetArg(p, f1, f2); AppendSimpleTriangle(f1, (int)f2); }
             else CASE("aq")  { p = GetArg(p, f1, f2); AppendSimpleQuad(f1, (int)f2); }
-            else CASE("acg") { /* TODO */ }
+            else CASE("acg") { p = GetArg(p, f1, f2, f3, f4); p = GetArg(p, f5, f6, f7, f8); AppendCog((int)f1, f2, f3, f4, f5, f6, f7, (int)f8); }
             else CASE("irb") { MeshConvert(); }
             else CASE("frb") { /* TODO */ }
@@ -810 +810 @@
     }
 
-    void AppendCog() {} /* TODO */
+    void AppendCog(int nbsides, float h, float r1, float r2,
+                   float r12, float r22, float sidemul, int offset)
+    {
+        int qibase = m_quadidx.Count();
+        int vbase = m_vert.Count();
+
+        AppendQuadVert(vec3(0.f, h * .5f, 0.f));
+        AppendQuadVert(vec3(0.f, h * -.5f, 0.f));
+        SetCurVertColor(m_color2);
+
+        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;
+
+        rotmat = rotmat * rotmat;
+
+        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;
+        }
+
+        ComputeQuadNormals(qibase, m_quadidx.Count() - qibase);
+    }
 
 private: