poly-extrude 0.0.9 → 0.2.0

package/dist/poly-extrude.js

@@ -1,5 +1,5 @@
 /*!
- * poly-extrude v0.0.9
+ * poly-extrude v0.2.0
   */
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
@@ -1107,28 +1107,30 @@
         var idx0 = i * 3;
         var _leftPoints$i = leftPoints[i],
             x1 = _leftPoints$i[0],
-            y1 = _leftPoints$i[1];
+            y1 = _leftPoints$i[1],
+            z1 = _leftPoints$i[2];
         points[idx0] = x1;
         points[idx0 + 1] = y1;
-        points[idx0 + 2] = z; // top right
+        points[idx0 + 2] = z + z1; // top right
 
         var _rightPoints$i = rightPoints[i],
             x2 = _rightPoints$i[0],
-            y2 = _rightPoints$i[1];
+            y2 = _rightPoints$i[1],
+            z2 = _rightPoints$i[2];
         var idx1 = len * 3 + idx0;
         points[idx1] = x2;
         points[idx1 + 1] = y2;
-        points[idx1 + 2] = z; // bottom left
+        points[idx1 + 2] = z + z2; // bottom left
 
         var idx2 = len * 2 * 3 + idx0;
         points[idx2] = x1;
         points[idx2 + 1] = y1;
-        points[idx2 + 2] = 0; // bottom right
+        points[idx2 + 2] = z1; // bottom right
 
         var idx3 = len * 2 * 3 + len * 3 + idx0;
         points[idx3] = x2;
         points[idx3 + 1] = y2;
-        points[idx3 + 2] = 0;
+        points[idx3 + 2] = z2;
         i++;
       }
 
@@ -1182,7 +1184,7 @@
 
       function addOneSideIndex(v1, v2) {
         var idx = points.length / 3;
-        points.push(v1[0], v1[1], z, v2[0], v2[1], z, v1[0], v1[1], 0, v2[0], v2[1], 0);
+        points.push(v1[0], v1[1], z + v1[2], v2[0], v2[1], z + v2[2], v1[0], v1[1], v1[2], v2[0], v2[1], v2[2]);
         var a = idx + 2,
             b = idx + 3,
             c = idx,
@@ -1311,13 +1313,14 @@
     function calOffsetPoint(rad, radius, p) {
       var x = p[0],
           y = p[1];
+      var z = p[2] || 0;
       var x1 = Math.cos(rad) * radius,
           y1 = Math.sin(rad) * radius;
-      var p1 = [x + x1, y + y1];
+      var p1 = [x + x1, y + y1, z];
       var rad1 = rad += Math.PI;
       var x2 = Math.cos(rad1) * radius,
           y2 = Math.sin(rad1) * radius;
-      var p2 = [x + x2, y + y2];
+      var p2 = [x + x2, y + y2, z];
       return [p1, p2];
     }
 
@@ -1342,6 +1345,125 @@
       return (y1 - y2) * x + (x2 - x1) * y + x1 * y2 - x2 * y1 > 0;
     }
 
+    function cylinder(point, options) {
+      if (options === void 0) {
+        options = {};
+      }
+
+      options = Object.assign({}, {
+        radius: 1,
+        height: 2,
+        radialSegments: 6
+      }, options);
+      var radialSegments = Math.round(Math.max(4, options.radialSegments));
+      var _options = options,
+          radius = _options.radius,
+          height = _options.height;
+      var aRad = 360 / radialSegments / 360 * Math.PI * 2;
+      var circlePointsLen = radialSegments + 1;
+      var points = new Float32Array(circlePointsLen * 3 * 2);
+      var centerx = point[0],
+          centery = point[1];
+      var idx = 0,
+          uIdx = 0;
+      var offset = circlePointsLen * 3,
+          uOffset = circlePointsLen * 2;
+      var indices = [],
+          uvs = [];
+
+      for (var i = -1; i < radialSegments; i++) {
+        var rad = aRad * i;
+        var x = Math.cos(rad) * radius + centerx,
+            y = Math.sin(rad) * radius + centery; // bottom vertices
+
+        points[idx] = x;
+        points[idx + 1] = y;
+        points[idx + 2] = 0; // top vertices
+
+        points[idx + offset] = x;
+        points[idx + 1 + offset] = y;
+        points[idx + 2 + offset] = height;
+        var u = 0,
+            v = 0;
+        u = 0.5 + x / radius / 2;
+        v = 0.5 + y / radius / 2;
+        uvs[uIdx] = u;
+        uvs[uIdx + 1] = v;
+        uvs[uIdx + uOffset] = u;
+        uvs[uIdx + 1 + uOffset] = v;
+        idx += 3;
+        uIdx += 2;
+
+        if (i > 1) {
+          // bottom indices
+          indices.push(0, i - 1, i);
+        }
+      }
+
+      idx -= 3;
+      points[idx] = points[0];
+      points[idx + 1] = points[1];
+      points[idx + 2] = points[2];
+      var pointsLen = points.length;
+      points[pointsLen - 3] = points[0];
+      points[pointsLen - 2] = points[1];
+      points[pointsLen - 1] = height;
+      var indicesLen = indices.length; // top indices
+
+      for (var _i = 0; _i < indicesLen; _i++) {
+        var index = indices[_i];
+        indices.push(index + circlePointsLen);
+      }
+
+      var sidePoints = new Float32Array((circlePointsLen * 3 * 2 - 6) * 2);
+      var pIndex = -1;
+      idx = circlePointsLen * 2;
+      uIdx = 0;
+
+      for (var _i2 = 0, len = points.length / 2; _i2 < len - 3; _i2 += 3) {
+        var x1 = points[_i2],
+            y1 = points[_i2 + 1],
+            x2 = points[_i2 + 3],
+            y2 = points[_i2 + 4];
+        sidePoints[++pIndex] = x1;
+        sidePoints[++pIndex] = y1;
+        sidePoints[++pIndex] = height;
+        sidePoints[++pIndex] = x2;
+        sidePoints[++pIndex] = y2;
+        sidePoints[++pIndex] = height;
+        sidePoints[++pIndex] = x1;
+        sidePoints[++pIndex] = y1;
+        sidePoints[++pIndex] = 0;
+        sidePoints[++pIndex] = x2;
+        sidePoints[++pIndex] = y2;
+        sidePoints[++pIndex] = 0;
+        var a = idx + 2,
+            b = idx + 3,
+            c = idx,
+            d = idx + 1; // indices.push(a, c, b, c, d, b);
+
+        indices.push(c, a, d, a, b, d);
+        idx += 4;
+        var u1 = uIdx / circlePointsLen,
+            u2 = (uIdx + 1) / circlePointsLen;
+        uvs.push(u1, height / radius / 2, u2, height / radius / 2, u1, 0, u2, 0);
+        uIdx++;
+      }
+
+      var position = new Float32Array(points.length + sidePoints.length);
+      position.set(points, 0);
+      position.set(sidePoints, points.length);
+      var normal = generateNormal(indices, position);
+      return {
+        points: points,
+        indices: new Uint32Array(indices),
+        position: position,
+        normal: normal,
+        uv: new Float32Array(uvs)
+      };
+    }
+
+    exports.cylinder = cylinder;
     exports.expandLine = expandLine;
     exports.extrudePolygons = extrudePolygons;
     exports.extrudePolylines = extrudePolylines;