Changeset 1719Tweet

Timestamp:

Aug 12, 2012, 4:41:16 PM (11 years ago)

Author:

sam

Message:

easymesh: fix the non-uniform sphere scaling and enforce odd numbers
of capsule divisions.

File:

• trunk/src/easymesh/easymesh.cpp (modified) (2 diffs)

trunk/src/easymesh/easymesh.cpp

@@ -367 +367 @@
     Array<vec3> vertices;
 
+    /* FIXME: we don't know how to handle even-divided capsules, so we
+     * force the count to be odd. */
+    if (h)
+        ndivisions |= 1;
+
     /* Fill in the icosahedron vertices, rotating them so that there
      * is a vertex at [0 1 0] and [0 -1 0] after normalisation. */
@@ -454 +459 @@
 void EasyMesh::AppendSphere(int ndivisions, vec3 const &size)
 {
-    AppendCapsule(ndivisions, 0.f, size.x);
+    OpenBrace();
+    AppendCapsule(ndivisions, 0.f, 1.f);
+    Scale(size);
+    CloseBrace();
 }