Changeset 1284 for trunk/orbital/mesh.hTweet

Timestamp:

Apr 24, 2012, 1:07:32 AM (11 years ago)

Author:

sam

Message:

orbital: implement sidemul and offset in the cog mesh builder.

File:

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

trunk/orbital/mesh.h

@@ -497 +497 @@
                         int dualside, int smooth)
     {
-        int ibase = m_quadidx.Count();
         int vbase = m_vert.Count();
 
@@ -815 +814 @@
 
         mat3 rotmat = mat3::rotate(180.0f / nbsides, 0.f, 1.f, 0.f);
+        mat3 smat1 = mat3::rotate(sidemul * 180.0f / nbsides, 0.f, 1.f, 0.f);
+        mat3 smat2 = mat3::rotate(sidemul * -360.0f / nbsides, 0.f, 1.f, 0.f);
 
         vec3 p[8];
@@ -820 +821 @@
         p[0] = vec3(r1, h * .5f, 0.f);
         p[1] = rotmat * p[0];
-        p[2] = rotmat * vec3(r1 + r12, h * .5f, 0.f);
-        p[3] = rotmat * p[2];
+        p[2] = smat1 * (rotmat * vec3(r1 + r12, h * .5f, 0.f));
+        p[3] = smat2 * (rotmat * p[2]);
 
         p[4] = vec3(r2, h * -.5f, 0.f);
         p[5] = rotmat * p[4];
-        p[6] = rotmat * vec3(r2 + r22, h * -.5f, 0.f);
-        p[7] = rotmat * p[6];
+        p[6] = smat1 * (rotmat * vec3(r2 + r22, h * -.5f, 0.f));
+        p[7] = smat2 * (rotmat * p[6]);
+
+        if (offset & 1)
+            for (int n = 0; n < 8; n++)
+                p[n] = rotmat * p[n];
 
         rotmat = rotmat * rotmat;