Changeset 1279Tweet

Timestamp:

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

Author:

sam

Message:

orbital: implement expanded stars in the mesh builder.

File:

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

trunk/orbital/mesh.h

@@ -57 +57 @@
             else CASE("afcb") { p = GetArg(p, v3, f1); AppendFlatChamfBox(v3, f1); }
             else CASE("asph") { p = GetArg(p, v3, f1); AppendSphere(v3, (int)f1); }
-            else CASE("as")  { p = GetArg(p, f1, f2, f3, f4, f5); AppendStar((int)f1, f2, f4, (int)f5, (int)f5); }
-            else CASE("aes") { /* TODO */ }
+            else CASE("as")  { p = GetArg(p, f1, f2, f3, f4, f5); AppendStar((int)f1, f2, f3, (int)f4, (int)f5); }
+            else CASE("aes") { p = GetArg(p, f1, f2, f3, f4); AppendExpandedStar((int)f1, f2, f3, f4); }
             else CASE("ad")  { p = GetArg(p, f1, f2, f3); AppendDisc((int)f1, f2, (int)f3); }
             else CASE("at")  { p = GetArg(p, f1, f2); AppendSimpleTriangle(f1, (int)f2); }
@@ -687 +687 @@
     }
 
-    void AppendStar(int nbranches, float r1, float r2)
-    {
-        AppendStar(nbranches, r1, r2, 0, 0);
-    }
-
-    void AppendStar(int nbranches, float r1, float r2, int fade)
-    {
-        AppendStar(nbranches, r1, r2, fade, 0);
-    }
-
-    void AppendStar(int nbranches, float r1, float r2, int fade, int fade2)
+    void AppendStar(int nbranches, float r1, float r2,
+                    int fade = 0, int fade2 = 0)
     {
         int vbase = m_vert.Count();
@@ -727 +718 @@
     }
 
-    void AppendExpandedStar() {} /* TODO */
+    void AppendExpandedStar(int nbranches, float r1, float r2, float extrar)
+    {
+        int vbase = m_vert.Count();
+
+        AppendQuadVert(vec3(0.f, 0.f, 0.f));
+
+        mat3 rotmat = mat3::rotate(180.0f / nbranches, 0.f, 1.f, 0.f);
+        vec3 p1(r1, 0.f, 0.f), p2(r2, 0.f, 0.f),
+             p3(r1 + extrar, 0.f, 0.f), p4(r2 + extrar, 0.f, 0.f);;
+
+        p2 = rotmat * p2;
+        p4 = rotmat * p4;
+        rotmat = rotmat * rotmat;
+
+        for (int i = 0; i < nbranches; i++)
+        {
+            AppendQuadVert(p1);
+            AppendQuadVert(p2);
+            AppendQuadVert(p3);
+            SetCurVertColor(m_color2);
+            AppendQuadVert(p4);
+            SetCurVertColor(m_color2);
+
+            int j = (i + 1) % nbranches;
+            AppendQuad(0, 4 * i + 1, 4 * i + 2, 4 * j + 1, vbase);
+            AppendQuad(4 * i + 1, 4 * i + 3, 4 * i + 4, 4 * i + 2, vbase);
+            AppendQuad(4 * j + 1, 4 * i + 2, 4 * i + 4, 4 * j + 3, vbase);
+
+            p1 = rotmat * p1;
+            p2 = rotmat * p2;
+            p3 = rotmat * p3;
+            p4 = rotmat * p4;
+        }
+    }
 
     void AppendDisc(int nsides, float r, int fade = 0)