Changeset 1268Tweet

Timestamp:

Apr 22, 2012, 2:31:52 AM (9 years ago)

Author:

sam

Message:

orbital: implement chamfer boxes and stars in the mesh builder.

Location:

trunk/orbital

Files:

• mesh.h (modified) (6 diffs)
• orbital.cpp (modified) (1 diff)

trunk/orbital/mesh.h

@@ -4 +4 @@
 // Copyright: (c) 2012 Various People
 //
+
+/* TODO for this file:
+ *  - rename "AppendQuadVert" to "AddVertex" or something; it has nothing
+ *    to do with quads.
+ */
 
 #if !defined __MESH_H__
@@ -19 +24 @@
     {
         m_vert_cursor = m_vert.Count();
-        ComputeQuadNormals(m_quadidx_cursor,
-                           m_quadidx.Count() - m_quadidx_cursor);
         m_quadidx_cursor = m_quadidx.Count();
-        ComputeTriNormals(m_triidx_cursor,
-                          m_triidx.Count() - m_triidx_cursor);
         m_triidx_cursor = m_triidx.Count();
     }
@@ -213 +214 @@
     void AppendTriangle(int i1, int i2, int i3, int base)
     {
-        m_quadidx += base + i1;
-        m_quadidx += base + i2;
-        m_quadidx += base + i3;
+        m_triidx += base + i1;
+        m_triidx += base + i2;
+        m_triidx += base + i3;
     }
 
     void AppendTriangleDuplicateVerts(int i1, int i2, int i3, int base)
     {
-        m_quadidx += m_vert.Count(); AppendDuplicateQuadVert(base + i1);
-        m_quadidx += m_vert.Count(); AppendDuplicateQuadVert(base + i2);
-        m_quadidx += m_vert.Count(); AppendDuplicateQuadVert(base + i3);
+        m_triidx += m_vert.Count(); AppendDuplicateQuadVert(base + i1);
+        m_triidx += m_vert.Count(); AppendDuplicateQuadVert(base + i2);
+        m_triidx += m_vert.Count(); AppendDuplicateQuadVert(base + i3);
     }
 
@@ -244 +245 @@
         for (int i = 0; i < vcount; i += 3)
         {
-            vec3 v0 = m_vert[m_quadidx[start + i + 2]].m1
-                    - m_vert[m_quadidx[start + i + 0]].m1;
-            vec3 v1 = m_vert[m_quadidx[start + i + 1]].m1
-                    - m_vert[m_quadidx[start + i + 0]].m1;
+            vec3 v0 = m_vert[m_triidx[start + i + 2]].m1
+                    - m_vert[m_triidx[start + i + 0]].m1;
+            vec3 v1 = m_vert[m_triidx[start + i + 1]].m1
+                    - m_vert[m_triidx[start + i + 0]].m1;
             vec3 n = normalize(cross(v1, v0));
 
             for (int j = 0; j < 3; j++)
-                m_vert[m_quadidx[start + i + j]].m2 = n;
+                m_vert[m_triidx[start + i + j]].m2 = n;
         }
     }
@@ -409 +410 @@
     void AppendBox(vec3 const &size)
     {
-        AppendBox(size, 0.f);
-    }
-
-    void AppendBox(vec3 const &size, float chamf)
-    {
-        int ibase = m_quadidx.Count();
+        AppendBox(size, 0.f, false);
+    }
+
+    void AppendSmoothChamfBox(vec3 const &size, float chamf)
+    {
+        AppendBox(size, chamf, true);
+    }
+
+    void AppendFlatChamfBox(vec3 const &size, float chamf)
+    {
+        AppendBox(size, chamf, false);
+    }
+
+    void AppendBox(vec3 const &size, float chamf, bool smooth)
+    {
         int vbase = m_vert.Count();
+        int qibase = m_quadidx.Count();
+        int tibase = m_triidx.Count();
 
         vec3 d = size * 0.5f;
@@ -449 +461 @@
         AppendQuadVert(vec3(+d.x, +d.y + chamf, -d.z));
 
-        AppendQuad(0, 1, 2, 3, vbase);
-        AppendQuad(4, 5, 6, 7, vbase);
-        AppendQuad(8, 9, 10, 11, vbase);
-        AppendQuad(12, 13, 14, 15, vbase);
-        AppendQuad(16, 17, 18, 19, vbase);
-        AppendQuad(20, 21, 22, 23, vbase);
-
-        ComputeQuadNormals(ibase, m_quadidx.Count() - ibase);
-    }
+        /* The 6 quads on each side of the box */
+        for (int i = 0; i < 24; i += 4)
+            AppendQuad(i, i + 1, i + 2, i + 3, vbase);
+
+        ComputeQuadNormals(qibase, m_quadidx.Count() - qibase);
+        qibase = m_quadidx.Count();
+
+        if (chamf)
+        {
+            /* The 8 quads at each edge of the box */
+            static int const quadlist[48] =
+            {
+                0, 3, 18, 17, 4, 7, 17, 16, 8, 11, 16, 19, 12, 15, 19, 18,
+                2, 1, 20, 23, 6, 5, 21, 20, 10, 9, 22, 21, 14, 13, 23, 22,
+                1, 0, 7, 6, 5, 4, 11, 10, 9, 8, 15, 14, 13, 12, 3, 2,
+            };
+
+            for (int i = 0; i < 48; i += 4)
+            {
+                if (smooth)
+                    AppendQuad(quadlist[i], quadlist[i + 1],
+                               quadlist[i + 2], quadlist[i + 3], vbase);
+                else
+                    AppendQuadDuplicateVerts(quadlist[i], quadlist[i + 1],
+                                     quadlist[i + 2], quadlist[i + 3], vbase);
+            }
+
+            /* The 8 triangles at each corner of the box */
+            static int const trilist[24] =
+            {
+                3, 12, 18, 15, 8, 19, 11, 4, 16, 7, 0, 17,
+                2, 23, 13, 14, 22, 9, 10, 21, 5, 6, 20, 1,
+            };
+
+            for (int i = 0; i < 24; i += 3)
+            {
+                if (smooth)
+                    AppendTriangle(trilist[i], trilist[i + 1],
+                                   trilist[i + 2], vbase);
+                else
+                    AppendTriangleDuplicateVerts(trilist[i], trilist[i + 1],
+                                                 trilist[i + 2], vbase);
+            }
+        }
+
+        if (!smooth)
+        {
+            ComputeQuadNormals(qibase, m_quadidx.Count() - qibase);
+            ComputeTriNormals(tibase, m_triidx.Count() - tibase);
+        }
+    }
+
+    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)
+    {
+        int vbase = m_vert.Count();
+
+        AppendQuadVert(vec3(0.f, 0.f, 0.f));
+
+        /* FIXME: use mat3 instead of mat4 when it's working */
+        mat3 rotmat(mat4::rotate(180.0f / nbranches, 0.f, 1.f, 0.f));
+        vec3 p1(r1, 0.f, 0.f), p2(r2, 0.f, 0.f);
+
+        p2 = rotmat * p2;
+        rotmat = rotmat * rotmat;
+
+        for (int i = 0; i < nbranches; i++)
+        {
+            AppendQuadVert(p1);
+            if (fade2)
+                SetCurVertColor(m_color2);
+
+            AppendQuadVert(p2);
+            if (fade)
+                SetCurVertColor(m_color2);
+
+            AppendQuad(0, (2 * i + 3) % (2 * nbranches),
+                       2 * i + 2, 2 * i + 1, vbase);
+
+            p1 = rotmat * p1;
+            p2 = rotmat * p2;
+        }
+    }
+
+    void AppendExpandedStar() {} /* TODO */
+    void AppendDisc() {} /* TODO */
+    void AppendSimpleTriangle() {} /* TODO */
+    void AppendSimpleQuad() {} /* TODO */
+    void AppendCog() {} /* TODO */
 
 private:

trunk/orbital/orbital.cpp

@@ -34 +34 @@
 
     m.SetCurColor(vec4(1.0, 0.0, 1.0, 1.0));
-    m.AppendBox(vec3(0.5, 0.5, 0.5));
+    m.AppendSmoothChamfBox(vec3(0.5, 0.5, 0.5), 0.1);
     m.RotateX(45.0);
     m.RotateZ(45.0);
-    m.Translate(vec3(0.0, 0.4, 0.0));
+    m.Translate(vec3(0.0, 0.6, 0.0));
+    m.Flush();
+
+    m.SetCurColor(vec4(0.0, 1.0, 0.5, 1.0));
+    m.SetCurColor2(vec4(0.0, 0.5, 1.0, 1.0));
+    m.AppendStar(5, 0.4, 0.7, 1, 1);
     m.Flush();