Changeset 1262Tweet

Timestamp:

Apr 21, 2012, 8:23:52 PM (9 years ago)

Author:

sam

Message:

orbital: the mesh builder now supports spheres.

Location:

trunk/orbital

Files:

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

trunk/orbital/mesh.h

@@ -36 +36 @@
             "varying vec4 pass_Color;"
             ""
-            "vec4 Light = vec4(10.0, 1.0, 1.0, 1.0);"
+            "vec4 Light = vec4(3.0, 3.0, 1.0, 1.0);"
             "vec3 Kd = vec3(1.0, 0.8, 0.8);"
             "vec3 Ld = vec3(1.0, 0.8, 0.8);"
@@ -345 +345 @@
     void AppendCylinder() {} /* TODO */
 
+    void AppendSphere(vec3 const &size, int divisions)
+    {
+        int ibase = m_quadidx.Count();
+        int vbase = m_vert.Count();
+
+        vec3 d = size * 0.5f;
+        float const pi = acos(-1.0f);
+
+        Array<vec2> table;
+        for (int i = 0; i <= divisions; i++)
+            table.Append(vec2(sin(pi * 2 / divisions * i) + 1e-5f,
+                              cos(pi * 2 / divisions * i) + 1e-5f));
+
+        for (int j = 0; j <= divisions / 2; j++)
+            for (int i = 0; i < divisions; i++)
+            {
+                int j2 = j + 1;
+                int i2 = (i + 1) % divisions;
+
+                AppendQuadVert(d * vec3(table[i], 1.0f) * table[j].xxy);
+                AppendQuadVert(d * vec3(table[i2], 1.0f) * table[j].xxy);
+                AppendQuadVert(d * vec3(table[i2], 1.0f) * table[j2].xxy);
+                AppendQuadVert(d * vec3(table[i], 1.0f) * table[j2].xxy);
+            }
+
+        for (int i = vbase; i < m_vert.Count(); i += 4)
+            AppendQuad(0, 1, 2, 3, i);
+
+        ComputeQuadNormals(ibase, m_quadidx.Count() - ibase);
+    }
+
     void AppendBox(vec3 const &size)
     {

trunk/orbital/orbital.cpp

@@ -29 +29 @@
 {
     m.SetCurColor(vec4(1.0, 1.0, 0.0, 1.0));
-    m.AppendBox(vec3(1.0, 1.0, 1.0));
-    m.Duplicate();
-    m.RotateX(45);
-    m.Translate(vec3(0.5, 0.0, 0.0));
+    m.AppendSphere(vec3(1.0, 0.5, 1.0), 32);
+    m.Translate(vec3(0.0, -0.4, 0.0));
+    m.Flush();
+
+    m.SetCurColor(vec4(1.0, 0.0, 1.0, 1.0));
+    m.AppendBox(vec3(0.5, 0.5, 0.5));
+    m.RotateX(45.0);
+    m.RotateZ(45.0);
+    m.Translate(vec3(0.0, 0.4, 0.0));
     m.Flush();