Changeset 1280Tweet

Timestamp:

Apr 23, 2012, 2:20:26 PM (9 years ago)

Author:

sam

Message:

orbital: fix a bug in cylinders that made them twice the height.

File:

• trunk/orbital/mesh.h (modified) (1 diff)

trunk/orbital/mesh.h

@@ -501 +501 @@
 
         mat3 rotmat = mat3::rotate(360.0f / nsides, 0.f, 1.f, 0.f);
-        vec3 p1(r1, -h, 0.f), p2(r2, h, 0.f), n;
+        vec3 p1(r1, -h * .5f, 0.f), p2(r2, h * .5f, 0.f), n;
 
         /* Construct normal */
         n = p2;
-        n.y = r1 * (r1 - r2) / (2.f * h);
+        n.y = r1 * (r1 - r2) / h;
         if (!smooth)
             n = mat3::rotate(180.0f / nsides, 0.f, 1.f, 0.f) * n;