@visactor/vrender 1.1.1 → 1.1.2-alpha.0

package/dist/index.js

@@ -17939,6 +17939,199 @@
       }
     }
 
+    function drawArcPath(arc, context, cx, cy, z, outerRadius, innerRadius) {
+      const {
+          startAngle: startAngle,
+          endAngle: endAngle
+        } = arc.getParsedAngle(),
+        deltaAngle = abs(endAngle - startAngle),
+        clockwise = endAngle > startAngle;
+      let collapsedToLine = !1;
+      if (outerRadius < innerRadius) {
+        const temp = outerRadius;
+        outerRadius = innerRadius, innerRadius = temp;
+      }
+      if (outerRadius <= epsilon) context.moveTo(cx, cy, z);else if (deltaAngle >= pi2 - epsilon) context.moveTo(cx + outerRadius * cos(startAngle), cy + outerRadius * sin(startAngle), z), context.arc(cx, cy, outerRadius, startAngle, endAngle, !clockwise, z), innerRadius > epsilon && (context.moveTo(cx + innerRadius * cos(endAngle), cy + innerRadius * sin(endAngle), z), context.arc(cx, cy, innerRadius, endAngle, startAngle, clockwise, z));else {
+        const {
+            outerDeltaAngle: outerDeltaAngle,
+            innerDeltaAngle: innerDeltaAngle,
+            outerStartAngle: outerStartAngle,
+            outerEndAngle: outerEndAngle,
+            innerEndAngle: innerEndAngle,
+            innerStartAngle: innerStartAngle
+          } = arc.getParsePadAngle(startAngle, endAngle),
+          xors = outerRadius * cos(outerStartAngle),
+          yors = outerRadius * sin(outerStartAngle),
+          xire = innerRadius * cos(innerEndAngle),
+          yire = innerRadius * sin(innerEndAngle);
+        outerDeltaAngle < .001 ? collapsedToLine = !0 : (context.moveTo(cx + xors, cy + yors, z), context.arc(cx, cy, outerRadius, outerStartAngle, outerEndAngle, !clockwise, z)), !(innerRadius > epsilon) || innerDeltaAngle < .001 ? (context.lineTo(cx + xire, cy + yire, z), collapsedToLine = !0) : (context.lineTo(cx + xire, cy + yire, z), context.arc(cx, cy, innerRadius, innerEndAngle, innerStartAngle, clockwise, z));
+      }
+      return context.closePath(), collapsedToLine;
+    }
+    function drawInnerOuterArcPath(arc, context, cx, cy, z1, z2, radius, getParsePadAngle) {
+      const {
+          startAngle: startAngle,
+          endAngle: endAngle
+        } = arc.getParsedAngle(),
+        deltaAngle = abs(endAngle - startAngle),
+        clockwise = endAngle > startAngle;
+      let collapsedToLine = !1;
+      if (radius <= epsilon) context.moveTo(cx, cy, z1);else if (deltaAngle >= pi2 - epsilon) context.moveTo(cx + radius * cos(startAngle), cy + radius * sin(startAngle), z1), context.arc(cx, cy, radius, startAngle, endAngle, !clockwise, z1), context.lineTo(cx + radius * cos(endAngle), cy + radius * sin(endAngle), z2), context.arc(cx, cy, radius, endAngle, startAngle, clockwise, z2);else {
+        const {
+            innerouterDeltaAngle: innerouterDeltaAngle,
+            innerouterStartAngle: innerouterStartAngle,
+            innerouterEndAngle: innerouterEndAngle
+          } = getParsePadAngle(startAngle, endAngle),
+          xors = radius * cos(innerouterStartAngle),
+          yors = radius * sin(innerouterStartAngle),
+          xore = radius * cos(innerouterEndAngle),
+          yore = radius * sin(innerouterEndAngle);
+        innerouterDeltaAngle < .001 ? collapsedToLine = !0 : (context.moveTo(cx + xors, cy + yors, z1), context.arc(cx, cy, radius, innerouterStartAngle, innerouterEndAngle, !clockwise, z1), context.lineTo(cx + xore, cy + yore, z2), context.arc(cx, cy, radius, innerouterEndAngle, innerouterStartAngle, clockwise, z2));
+      }
+      return context.closePath(), collapsedToLine;
+    }
+    class DefaultCanvasArc3DRender extends BaseRender {
+      constructor() {
+        super(...arguments), this.numberType = ARC3D_NUMBER_TYPE;
+      }
+      drawShape(arc, context, x, y, drawContext, params, fillCb, strokeCb) {
+        var _a;
+        const arcAttribute = getTheme(arc, null == params ? void 0 : params.theme).arc,
+          {
+            fill = arcAttribute.fill
+          } = arc.attribute,
+          data = this.valid(arc, arcAttribute, fillCb, strokeCb);
+        if (!data) return;
+        const {
+            fVisible: fVisible,
+            sVisible: sVisible,
+            doFill: doFill,
+            doStroke: doStroke
+          } = data,
+          z = null !== (_a = this.z) && void 0 !== _a ? _a : 0,
+          {
+            outerPadding = arcAttribute.outerPadding,
+            innerPadding = arcAttribute.innerPadding,
+            height = 10
+          } = arc.attribute;
+        let {
+          outerRadius = arcAttribute.outerRadius,
+          innerRadius = arcAttribute.innerRadius
+        } = arc.attribute;
+        outerRadius += outerPadding, innerRadius -= innerPadding;
+        const rgbArray = ColorStore.Get(fill, exports.ColorType.Color255),
+          {
+            light: light
+          } = drawContext.stage || {},
+          face = drawContext.hack_pieFace,
+          z_face = {
+            top: z,
+            bottom: z + height
+          },
+          n_face = {
+            top: [0, 1, 0],
+            bottom: [0, -1, 0],
+            outside: [1, 0, -1],
+            inside: [1, 0, -1]
+          };
+        "bottom" === face || "top" === face ? (context.beginPath(), drawArcPath(arc, context, x, y, z_face[face], outerRadius, innerRadius), context.setShadowBlendStyle && context.setShadowBlendStyle(arc, arc.attribute, arcAttribute), doFill && (fillCb ? fillCb(context, arc.attribute, arcAttribute) : fVisible && (context.setCommonStyle(arc, arc.attribute, x, y, arcAttribute), context.fillStyle = light ? light.computeColor(n_face[face], rgbArray) : fill, context.fill())), doStroke && (strokeCb ? strokeCb(context, arc.attribute, arcAttribute) : sVisible && (context.setStrokeStyle(arc, arc.attribute, x, y, arcAttribute), context.stroke()))) : "outside" !== face && "inside" !== face || ("inside" === face && (context.save(), context.beginPath(), context.arc(x, y, innerRadius, 0, pi2, !0, z_face.top), context.clip()), context.beginPath(), drawInnerOuterArcPath(arc, context, x, y, z_face.top, z_face.bottom, "outside" === face ? outerRadius : innerRadius, (startAngle, endAngle) => {
+          const {
+            outerDeltaAngle: outerDeltaAngle,
+            innerDeltaAngle: innerDeltaAngle,
+            outerStartAngle: outerStartAngle,
+            outerEndAngle: outerEndAngle,
+            innerEndAngle: innerEndAngle,
+            innerStartAngle: innerStartAngle
+          } = arc.getParsePadAngle(startAngle, endAngle);
+          return "outside" === face ? {
+            innerouterDeltaAngle: outerDeltaAngle,
+            innerouterEndAngle: outerEndAngle,
+            innerouterStartAngle: outerStartAngle
+          } : {
+            innerouterDeltaAngle: innerDeltaAngle,
+            innerouterEndAngle: innerEndAngle,
+            innerouterStartAngle: innerStartAngle
+          };
+        }), context.setShadowBlendStyle && context.setShadowBlendStyle(arc, arc.attribute, arcAttribute), doFill && (fillCb ? fillCb(context, arc.attribute, arcAttribute) : fVisible && (context.setCommonStyle(arc, arc.attribute, x, y, arcAttribute), context.fillStyle = light ? light.computeColor(n_face[face], rgbArray) : fill, context.fill())), doStroke && (strokeCb ? strokeCb(context, arc.attribute, arcAttribute) : sVisible && (context.setStrokeStyle(arc, arc.attribute, x, y, arcAttribute), context.stroke())), "inside" === face && context.restore());
+      }
+      draw(arc, renderService, drawContext, params) {
+        const arcAttribute = getTheme(arc, null == params ? void 0 : params.theme).arc;
+        this._draw(arc, arcAttribute, !1, drawContext, params);
+      }
+    }
+
+    class Base3dRender extends BaseRender {
+      stroke(x, y, z, face3d, context) {
+        const vertices = face3d.vertices;
+        face3d.edges.forEach(edge => {
+          const p1 = vertices[edge[0]],
+            v1 = {
+              x: x + p1[0],
+              y: y + p1[1],
+              z: z + p1[2]
+            },
+            p2 = vertices[edge[1]],
+            v2 = {
+              x: x + p2[0],
+              y: y + p2[1],
+              z: z + p2[2]
+            };
+          context.beginPath(), context.moveTo(v1.x, v1.y, v1.z), context.lineTo(v2.x, v2.y, v2.z), context.stroke();
+        });
+      }
+      fill(x, y, z, face3d, faces, fillColor, context, light, graphic3d, graphic3dAttribute, fillCb) {
+        const rgbArray = ColorStore.Get(fillColor, exports.ColorType.Color255),
+          vertices = face3d.vertices,
+          viewdVerticesZ = vertices.map(v => context.view(v[0], v[1], v[2])[2]),
+          sortFace = [];
+        face3d.polygons.forEach((p, i) => {
+          if (faces && !faces[i]) return;
+          sortFace.push({
+            faceIdx: i,
+            polygon: p
+          });
+          const {
+              polygon: polygon
+            } = p,
+            z1 = viewdVerticesZ[polygon[0]],
+            z2 = viewdVerticesZ[polygon[1]],
+            z3 = viewdVerticesZ[polygon[2]],
+            z4 = viewdVerticesZ[polygon[3]];
+          p.ave_z = z1 + z2 + z3 + z4;
+        }), sortFace.sort((a, b) => b.polygon.ave_z - a.polygon.ave_z), sortFace.forEach(item => {
+          const {
+              polygon: polygon,
+              normal: normal
+            } = item.polygon,
+            p1 = vertices[polygon[0]],
+            p2 = vertices[polygon[1]],
+            p3 = vertices[polygon[2]],
+            p4 = vertices[polygon[3]],
+            v1 = {
+              x: x + p1[0],
+              y: y + p1[1],
+              z: z + p1[2]
+            },
+            v2 = {
+              x: x + p2[0],
+              y: y + p2[1],
+              z: z + p2[2]
+            },
+            v3 = {
+              x: x + p3[0],
+              y: y + p3[1],
+              z: z + p3[2]
+            },
+            v4 = {
+              x: x + p4[0],
+              y: y + p4[1],
+              z: z + p4[2]
+            };
+          context.beginPath(), context.moveTo(v1.x, v1.y, v1.z), context.lineTo(v2.x, v2.y, v2.z), context.lineTo(v3.x, v3.y, v3.z), context.lineTo(v4.x, v4.y, v4.z), context.closePath(), fillCb ? fillCb(context, graphic3d && graphic3d.attribute, graphic3dAttribute) : (context.fillStyle = light ? light.computeColor(normal, rgbArray) : fillColor, context.fill());
+        });
+      }
+    }
+
     class DefaultCanvasCircleRender extends BaseRender {
       constructor(graphicRenderContributions) {
         super(), this.graphicRenderContributions = graphicRenderContributions, this.numberType = CIRCLE_NUMBER_TYPE, this.builtinContributions = [defaultCircleRenderContribution, defaultCircleBackgroundRenderContribution, defaultCircleTextureRenderContribution], this.init(graphicRenderContributions);
@@ -18625,6 +18818,57 @@
       }
     }
 
+    class DefaultCanvasRect3dRender extends Base3dRender {
+      constructor() {
+        super(...arguments), this.type = "rect3d", this.numberType = RECT3D_NUMBER_TYPE;
+      }
+      drawShape(rect, context, x, y, drawContext, params, fillCb, strokeCb) {
+        var _a, _b;
+        const rectAttribute = getTheme(rect, null == params ? void 0 : params.theme).rect,
+          {
+            fill = rectAttribute.fill,
+            stroke = rectAttribute.stroke,
+            x1: x1,
+            y1: y1,
+            x: originX,
+            y: originY,
+            opacity = rectAttribute.opacity,
+            fillOpacity = rectAttribute.fillOpacity,
+            lineWidth = rectAttribute.lineWidth,
+            strokeOpacity = rectAttribute.strokeOpacity,
+            visible = rectAttribute.visible,
+            drawStrokeWhenZeroWH = null !== (_a = rectAttribute.drawStrokeWhenZeroWH) && void 0 !== _a && _a
+          } = rect.attribute;
+        let {
+          width: width,
+          height: height
+        } = rect.attribute;
+        width = (null != width ? width : x1 - originX) || 0, height = (null != height ? height : y1 - originY) || 0;
+        const z = null !== (_b = this.z) && void 0 !== _b ? _b : 0,
+          fVisible = rectFillVisible(opacity, fillOpacity, width, height, fill),
+          sVisible = rectStrokeVisible(opacity, strokeOpacity, width, height, drawStrokeWhenZeroWH),
+          doFill = runFill(fill),
+          doStroke = runStroke(stroke, lineWidth);
+        if (!rect.valid || !visible) return;
+        if (!doFill && !doStroke) return;
+        if (!(fVisible || sVisible || fillCb || strokeCb)) return;
+        const {
+            light: light
+          } = drawContext.stage || {},
+          face3d = rect.findFace();
+        if (!1 !== fill) {
+          context.setCommonStyle(rect, rect.attribute, x, y, rectAttribute);
+          let fc = fill;
+          "string" != typeof fc && (fc = "black"), this.fill(x, y, z, face3d, null, fc, context, light, null, null, fillCb);
+        }
+        !1 !== stroke && (context.setStrokeStyle(rect, rect.attribute, x, y, rectAttribute), this.stroke(x, y, z, face3d, context));
+      }
+      draw(rect, renderService, drawContext) {
+        const rectAttribute = getTheme(rect).rect;
+        this._draw(rect, rectAttribute, !1, drawContext);
+      }
+    }
+
     class DefaultCanvasSymbolRender extends BaseRender {
       constructor(graphicRenderContributions) {
         super(), this.graphicRenderContributions = graphicRenderContributions, this.numberType = SYMBOL_NUMBER_TYPE, this.builtinContributions = [defaultSymbolRenderContribution, defaultSymbolBackgroundRenderContribution, defaultSymbolTextureRenderContribution, defaultSymbolClipRangeStrokeRenderContribution], this.init(graphicRenderContributions);
@@ -18989,6 +19233,37 @@
       }
     }
 
+    class DefaultCanvasPyramid3dRender extends Base3dRender {
+      constructor() {
+        super(...arguments), this.type = "pyramid3d", this.numberType = PYRAMID3D_NUMBER_TYPE;
+      }
+      drawShape(pyramid3d, context, x, y, drawContext, params, fillCb, strokeCb) {
+        var _a;
+        const pyramidAttribute = getTheme(pyramid3d, null == params ? void 0 : params.theme).polygon,
+          {
+            fill = pyramidAttribute.fill,
+            stroke = pyramidAttribute.stroke,
+            face = [!0, !0, !0, !0, !0, !0]
+          } = pyramid3d.attribute,
+          z = null !== (_a = this.z) && void 0 !== _a ? _a : 0;
+        if (!this.valid(pyramid3d, pyramidAttribute, fillCb, strokeCb)) return;
+        const {
+            light: light
+          } = drawContext.stage || {},
+          face3d = pyramid3d.findFace();
+        if (!1 !== fill) {
+          context.setCommonStyle(pyramid3d, pyramid3d.attribute, x, y, pyramidAttribute);
+          let fc = fill;
+          "string" != typeof fc && (fc = "black"), this.fill(x, y, z, face3d, face, fc, context, light, pyramid3d, pyramidAttribute, fillCb);
+        }
+        !1 !== stroke && (context.setStrokeStyle(pyramid3d, pyramid3d.attribute, x, y, pyramidAttribute), this.stroke(x, y, z, face3d, context));
+      }
+      draw(pyramid3d, renderService, drawContext) {
+        const pyramid3dAttribute = getTheme(pyramid3d).polygon;
+        this._draw(pyramid3d, pyramid3dAttribute, !1, drawContext);
+      }
+    }
+
     const repeatStr = ["", "repeat-x", "repeat-y", "repeat"];
     function resolveImageRepeatMode(repeatX, repeatY) {
       let repeat = 0;
@@ -21836,129 +22111,6 @@
     }
     const imageModule = bindImageRenderModule;
 
-    class Base3dRender extends BaseRender {
-      stroke(x, y, z, face3d, context) {
-        const vertices = face3d.vertices;
-        face3d.edges.forEach(edge => {
-          const p1 = vertices[edge[0]],
-            v1 = {
-              x: x + p1[0],
-              y: y + p1[1],
-              z: z + p1[2]
-            },
-            p2 = vertices[edge[1]],
-            v2 = {
-              x: x + p2[0],
-              y: y + p2[1],
-              z: z + p2[2]
-            };
-          context.beginPath(), context.moveTo(v1.x, v1.y, v1.z), context.lineTo(v2.x, v2.y, v2.z), context.stroke();
-        });
-      }
-      fill(x, y, z, face3d, faces, fillColor, context, light, graphic3d, graphic3dAttribute, fillCb) {
-        const rgbArray = ColorStore.Get(fillColor, exports.ColorType.Color255),
-          vertices = face3d.vertices,
-          viewdVerticesZ = vertices.map(v => context.view(v[0], v[1], v[2])[2]),
-          sortFace = [];
-        face3d.polygons.forEach((p, i) => {
-          if (faces && !faces[i]) return;
-          sortFace.push({
-            faceIdx: i,
-            polygon: p
-          });
-          const {
-              polygon: polygon
-            } = p,
-            z1 = viewdVerticesZ[polygon[0]],
-            z2 = viewdVerticesZ[polygon[1]],
-            z3 = viewdVerticesZ[polygon[2]],
-            z4 = viewdVerticesZ[polygon[3]];
-          p.ave_z = z1 + z2 + z3 + z4;
-        }), sortFace.sort((a, b) => b.polygon.ave_z - a.polygon.ave_z), sortFace.forEach(item => {
-          const {
-              polygon: polygon,
-              normal: normal
-            } = item.polygon,
-            p1 = vertices[polygon[0]],
-            p2 = vertices[polygon[1]],
-            p3 = vertices[polygon[2]],
-            p4 = vertices[polygon[3]],
-            v1 = {
-              x: x + p1[0],
-              y: y + p1[1],
-              z: z + p1[2]
-            },
-            v2 = {
-              x: x + p2[0],
-              y: y + p2[1],
-              z: z + p2[2]
-            },
-            v3 = {
-              x: x + p3[0],
-              y: y + p3[1],
-              z: z + p3[2]
-            },
-            v4 = {
-              x: x + p4[0],
-              y: y + p4[1],
-              z: z + p4[2]
-            };
-          context.beginPath(), context.moveTo(v1.x, v1.y, v1.z), context.lineTo(v2.x, v2.y, v2.z), context.lineTo(v3.x, v3.y, v3.z), context.lineTo(v4.x, v4.y, v4.z), context.closePath(), fillCb ? fillCb(context, graphic3d && graphic3d.attribute, graphic3dAttribute) : (context.fillStyle = light ? light.computeColor(normal, rgbArray) : fillColor, context.fill());
-        });
-      }
-    }
-
-    class DefaultCanvasRect3dRender extends Base3dRender {
-      constructor() {
-        super(...arguments), this.type = "rect3d", this.numberType = RECT3D_NUMBER_TYPE;
-      }
-      drawShape(rect, context, x, y, drawContext, params, fillCb, strokeCb) {
-        var _a, _b;
-        const rectAttribute = getTheme(rect, null == params ? void 0 : params.theme).rect,
-          {
-            fill = rectAttribute.fill,
-            stroke = rectAttribute.stroke,
-            x1: x1,
-            y1: y1,
-            x: originX,
-            y: originY,
-            opacity = rectAttribute.opacity,
-            fillOpacity = rectAttribute.fillOpacity,
-            lineWidth = rectAttribute.lineWidth,
-            strokeOpacity = rectAttribute.strokeOpacity,
-            visible = rectAttribute.visible,
-            drawStrokeWhenZeroWH = null !== (_a = rectAttribute.drawStrokeWhenZeroWH) && void 0 !== _a && _a
-          } = rect.attribute;
-        let {
-          width: width,
-          height: height
-        } = rect.attribute;
-        width = (null != width ? width : x1 - originX) || 0, height = (null != height ? height : y1 - originY) || 0;
-        const z = null !== (_b = this.z) && void 0 !== _b ? _b : 0,
-          fVisible = rectFillVisible(opacity, fillOpacity, width, height, fill),
-          sVisible = rectStrokeVisible(opacity, strokeOpacity, width, height, drawStrokeWhenZeroWH),
-          doFill = runFill(fill),
-          doStroke = runStroke(stroke, lineWidth);
-        if (!rect.valid || !visible) return;
-        if (!doFill && !doStroke) return;
-        if (!(fVisible || sVisible || fillCb || strokeCb)) return;
-        const {
-            light: light
-          } = drawContext.stage || {},
-          face3d = rect.findFace();
-        if (!1 !== fill) {
-          context.setCommonStyle(rect, rect.attribute, x, y, rectAttribute);
-          let fc = fill;
-          "string" != typeof fc && (fc = "black"), this.fill(x, y, z, face3d, null, fc, context, light, null, null, fillCb);
-        }
-        !1 !== stroke && (context.setStrokeStyle(rect, rect.attribute, x, y, rectAttribute), this.stroke(x, y, z, face3d, context));
-      }
-      draw(rect, renderService, drawContext) {
-        const rectAttribute = getTheme(rect).rect;
-        this._draw(rect, rectAttribute, !1, drawContext);
-      }
-    }
-
     const loadedRect3dModuleContexts = new WeakSet();
     function bindRect3dRenderModule({
       bind: bind
@@ -21967,127 +22119,6 @@
     }
     const rect3dModule = bindRect3dRenderModule;
 
-    function drawArcPath(arc, context, cx, cy, z, outerRadius, innerRadius) {
-      const {
-          startAngle: startAngle,
-          endAngle: endAngle
-        } = arc.getParsedAngle(),
-        deltaAngle = abs(endAngle - startAngle),
-        clockwise = endAngle > startAngle;
-      let collapsedToLine = !1;
-      if (outerRadius < innerRadius) {
-        const temp = outerRadius;
-        outerRadius = innerRadius, innerRadius = temp;
-      }
-      if (outerRadius <= epsilon) context.moveTo(cx, cy, z);else if (deltaAngle >= pi2 - epsilon) context.moveTo(cx + outerRadius * cos(startAngle), cy + outerRadius * sin(startAngle), z), context.arc(cx, cy, outerRadius, startAngle, endAngle, !clockwise, z), innerRadius > epsilon && (context.moveTo(cx + innerRadius * cos(endAngle), cy + innerRadius * sin(endAngle), z), context.arc(cx, cy, innerRadius, endAngle, startAngle, clockwise, z));else {
-        const {
-            outerDeltaAngle: outerDeltaAngle,
-            innerDeltaAngle: innerDeltaAngle,
-            outerStartAngle: outerStartAngle,
-            outerEndAngle: outerEndAngle,
-            innerEndAngle: innerEndAngle,
-            innerStartAngle: innerStartAngle
-          } = arc.getParsePadAngle(startAngle, endAngle),
-          xors = outerRadius * cos(outerStartAngle),
-          yors = outerRadius * sin(outerStartAngle),
-          xire = innerRadius * cos(innerEndAngle),
-          yire = innerRadius * sin(innerEndAngle);
-        outerDeltaAngle < .001 ? collapsedToLine = !0 : (context.moveTo(cx + xors, cy + yors, z), context.arc(cx, cy, outerRadius, outerStartAngle, outerEndAngle, !clockwise, z)), !(innerRadius > epsilon) || innerDeltaAngle < .001 ? (context.lineTo(cx + xire, cy + yire, z), collapsedToLine = !0) : (context.lineTo(cx + xire, cy + yire, z), context.arc(cx, cy, innerRadius, innerEndAngle, innerStartAngle, clockwise, z));
-      }
-      return context.closePath(), collapsedToLine;
-    }
-    function drawInnerOuterArcPath(arc, context, cx, cy, z1, z2, radius, getParsePadAngle) {
-      const {
-          startAngle: startAngle,
-          endAngle: endAngle
-        } = arc.getParsedAngle(),
-        deltaAngle = abs(endAngle - startAngle),
-        clockwise = endAngle > startAngle;
-      let collapsedToLine = !1;
-      if (radius <= epsilon) context.moveTo(cx, cy, z1);else if (deltaAngle >= pi2 - epsilon) context.moveTo(cx + radius * cos(startAngle), cy + radius * sin(startAngle), z1), context.arc(cx, cy, radius, startAngle, endAngle, !clockwise, z1), context.lineTo(cx + radius * cos(endAngle), cy + radius * sin(endAngle), z2), context.arc(cx, cy, radius, endAngle, startAngle, clockwise, z2);else {
-        const {
-            innerouterDeltaAngle: innerouterDeltaAngle,
-            innerouterStartAngle: innerouterStartAngle,
-            innerouterEndAngle: innerouterEndAngle
-          } = getParsePadAngle(startAngle, endAngle),
-          xors = radius * cos(innerouterStartAngle),
-          yors = radius * sin(innerouterStartAngle),
-          xore = radius * cos(innerouterEndAngle),
-          yore = radius * sin(innerouterEndAngle);
-        innerouterDeltaAngle < .001 ? collapsedToLine = !0 : (context.moveTo(cx + xors, cy + yors, z1), context.arc(cx, cy, radius, innerouterStartAngle, innerouterEndAngle, !clockwise, z1), context.lineTo(cx + xore, cy + yore, z2), context.arc(cx, cy, radius, innerouterEndAngle, innerouterStartAngle, clockwise, z2));
-      }
-      return context.closePath(), collapsedToLine;
-    }
-    class DefaultCanvasArc3DRender extends BaseRender {
-      constructor() {
-        super(...arguments), this.numberType = ARC3D_NUMBER_TYPE;
-      }
-      drawShape(arc, context, x, y, drawContext, params, fillCb, strokeCb) {
-        var _a;
-        const arcAttribute = getTheme(arc, null == params ? void 0 : params.theme).arc,
-          {
-            fill = arcAttribute.fill
-          } = arc.attribute,
-          data = this.valid(arc, arcAttribute, fillCb, strokeCb);
-        if (!data) return;
-        const {
-            fVisible: fVisible,
-            sVisible: sVisible,
-            doFill: doFill,
-            doStroke: doStroke
-          } = data,
-          z = null !== (_a = this.z) && void 0 !== _a ? _a : 0,
-          {
-            outerPadding = arcAttribute.outerPadding,
-            innerPadding = arcAttribute.innerPadding,
-            height = 10
-          } = arc.attribute;
-        let {
-          outerRadius = arcAttribute.outerRadius,
-          innerRadius = arcAttribute.innerRadius
-        } = arc.attribute;
-        outerRadius += outerPadding, innerRadius -= innerPadding;
-        const rgbArray = ColorStore.Get(fill, exports.ColorType.Color255),
-          {
-            light: light
-          } = drawContext.stage || {},
-          face = drawContext.hack_pieFace,
-          z_face = {
-            top: z,
-            bottom: z + height
-          },
-          n_face = {
-            top: [0, 1, 0],
-            bottom: [0, -1, 0],
-            outside: [1, 0, -1],
-            inside: [1, 0, -1]
-          };
-        "bottom" === face || "top" === face ? (context.beginPath(), drawArcPath(arc, context, x, y, z_face[face], outerRadius, innerRadius), context.setShadowBlendStyle && context.setShadowBlendStyle(arc, arc.attribute, arcAttribute), doFill && (fillCb ? fillCb(context, arc.attribute, arcAttribute) : fVisible && (context.setCommonStyle(arc, arc.attribute, x, y, arcAttribute), context.fillStyle = light ? light.computeColor(n_face[face], rgbArray) : fill, context.fill())), doStroke && (strokeCb ? strokeCb(context, arc.attribute, arcAttribute) : sVisible && (context.setStrokeStyle(arc, arc.attribute, x, y, arcAttribute), context.stroke()))) : "outside" !== face && "inside" !== face || ("inside" === face && (context.save(), context.beginPath(), context.arc(x, y, innerRadius, 0, pi2, !0, z_face.top), context.clip()), context.beginPath(), drawInnerOuterArcPath(arc, context, x, y, z_face.top, z_face.bottom, "outside" === face ? outerRadius : innerRadius, (startAngle, endAngle) => {
-          const {
-            outerDeltaAngle: outerDeltaAngle,
-            innerDeltaAngle: innerDeltaAngle,
-            outerStartAngle: outerStartAngle,
-            outerEndAngle: outerEndAngle,
-            innerEndAngle: innerEndAngle,
-            innerStartAngle: innerStartAngle
-          } = arc.getParsePadAngle(startAngle, endAngle);
-          return "outside" === face ? {
-            innerouterDeltaAngle: outerDeltaAngle,
-            innerouterEndAngle: outerEndAngle,
-            innerouterStartAngle: outerStartAngle
-          } : {
-            innerouterDeltaAngle: innerDeltaAngle,
-            innerouterEndAngle: innerEndAngle,
-            innerouterStartAngle: innerStartAngle
-          };
-        }), context.setShadowBlendStyle && context.setShadowBlendStyle(arc, arc.attribute, arcAttribute), doFill && (fillCb ? fillCb(context, arc.attribute, arcAttribute) : fVisible && (context.setCommonStyle(arc, arc.attribute, x, y, arcAttribute), context.fillStyle = light ? light.computeColor(n_face[face], rgbArray) : fill, context.fill())), doStroke && (strokeCb ? strokeCb(context, arc.attribute, arcAttribute) : sVisible && (context.setStrokeStyle(arc, arc.attribute, x, y, arcAttribute), context.stroke())), "inside" === face && context.restore());
-      }
-      draw(arc, renderService, drawContext, params) {
-        const arcAttribute = getTheme(arc, null == params ? void 0 : params.theme).arc;
-        this._draw(arc, arcAttribute, !1, drawContext, params);
-      }
-    }
-
     const loadedArc3dModuleContexts = new WeakSet();
     function bindArc3dRenderModule({
       bind: bind
@@ -22096,37 +22127,6 @@
     }
     const arc3dModule = bindArc3dRenderModule;
 
-    class DefaultCanvasPyramid3dRender extends Base3dRender {
-      constructor() {
-        super(...arguments), this.type = "pyramid3d", this.numberType = PYRAMID3D_NUMBER_TYPE;
-      }
-      drawShape(pyramid3d, context, x, y, drawContext, params, fillCb, strokeCb) {
-        var _a;
-        const pyramidAttribute = getTheme(pyramid3d, null == params ? void 0 : params.theme).polygon,
-          {
-            fill = pyramidAttribute.fill,
-            stroke = pyramidAttribute.stroke,
-            face = [!0, !0, !0, !0, !0, !0]
-          } = pyramid3d.attribute,
-          z = null !== (_a = this.z) && void 0 !== _a ? _a : 0;
-        if (!this.valid(pyramid3d, pyramidAttribute, fillCb, strokeCb)) return;
-        const {
-            light: light
-          } = drawContext.stage || {},
-          face3d = pyramid3d.findFace();
-        if (!1 !== fill) {
-          context.setCommonStyle(pyramid3d, pyramid3d.attribute, x, y, pyramidAttribute);
-          let fc = fill;
-          "string" != typeof fc && (fc = "black"), this.fill(x, y, z, face3d, face, fc, context, light, pyramid3d, pyramidAttribute, fillCb);
-        }
-        !1 !== stroke && (context.setStrokeStyle(pyramid3d, pyramid3d.attribute, x, y, pyramidAttribute), this.stroke(x, y, z, face3d, context));
-      }
-      draw(pyramid3d, renderService, drawContext) {
-        const pyramid3dAttribute = getTheme(pyramid3d).polygon;
-        this._draw(pyramid3d, pyramid3dAttribute, !1, drawContext);
-      }
-    }
-
     const loadedPyramid3dModuleContexts = new WeakSet();
     function bindPyramid3dRenderModule({
       bind: bind
@@ -22790,6 +22790,7 @@
         AreaRenderContribution: AreaRenderContribution,
         get AttributeUpdateType () { return exports.AttributeUpdateType; },
         AutoEnablePlugins: AutoEnablePlugins,
+        Base3dRender: Base3dRender,
         BaseCanvas: BaseCanvas,
         BaseEnvContribution: BaseEnvContribution,
         BaseRender: BaseRender,
@@ -22838,6 +22839,7 @@
         DefaultBaseInteractiveRenderContribution: DefaultBaseInteractiveRenderContribution,
         DefaultBaseTextureRenderContribution: DefaultBaseTextureRenderContribution,
         DefaultCanvasAllocate: DefaultCanvasAllocate,
+        DefaultCanvasArc3DRender: DefaultCanvasArc3DRender,
         DefaultCanvasArcRender: DefaultCanvasArcRender,
         DefaultCanvasAreaRender: DefaultCanvasAreaRender,
         DefaultCanvasCircleRender: DefaultCanvasCircleRender,
@@ -22846,6 +22848,8 @@
         DefaultCanvasLineRender: DefaultCanvasLineRender,
         DefaultCanvasPathRender: DefaultCanvasPathRender,
         DefaultCanvasPolygonRender: DefaultCanvasPolygonRender,
+        DefaultCanvasPyramid3dRender: DefaultCanvasPyramid3dRender,
+        DefaultCanvasRect3dRender: DefaultCanvasRect3dRender,
         DefaultCanvasRectRender: DefaultCanvasRectRender,
         DefaultCanvasSymbolRender: DefaultCanvasSymbolRender,
         DefaultCanvasTextRender: DefaultCanvasTextRender,
@@ -55462,7 +55466,7 @@
         return resolveLegacyApp().createStage(params);
     }
 
-    const version = "1.1.1";
+    const version = "1.1.2-alpha.0";
 
     exports.AComponentAnimate = AComponentAnimate;
     exports.ACustomAnimate = ACustomAnimate;
@@ -55493,6 +55497,7 @@
     exports.AreaRender = AreaRender;
     exports.AreaRenderContribution = AreaRenderContribution;
     exports.AutoEnablePlugins = AutoEnablePlugins;
+    exports.Base3dRender = Base3dRender;
     exports.BaseCanvas = BaseCanvas;
     exports.BaseEnvContribution = BaseEnvContribution;
     exports.BasePlayer = BasePlayer;
@@ -55585,6 +55590,7 @@
     exports.DefaultBaseInteractiveRenderContribution = DefaultBaseInteractiveRenderContribution;
     exports.DefaultBaseTextureRenderContribution = DefaultBaseTextureRenderContribution;
     exports.DefaultCanvasAllocate = DefaultCanvasAllocate;
+    exports.DefaultCanvasArc3DRender = DefaultCanvasArc3DRender;
     exports.DefaultCanvasArcRender = DefaultCanvasArcRender;
     exports.DefaultCanvasAreaRender = DefaultCanvasAreaRender;
     exports.DefaultCanvasCircleRender = DefaultCanvasCircleRender;
@@ -55593,6 +55599,8 @@
     exports.DefaultCanvasLineRender = DefaultCanvasLineRender;
     exports.DefaultCanvasPathRender = DefaultCanvasPathRender;
     exports.DefaultCanvasPolygonRender = DefaultCanvasPolygonRender;
+    exports.DefaultCanvasPyramid3dRender = DefaultCanvasPyramid3dRender;
+    exports.DefaultCanvasRect3dRender = DefaultCanvasRect3dRender;
     exports.DefaultCanvasRectRender = DefaultCanvasRectRender;
     exports.DefaultCanvasSymbolRender = DefaultCanvasSymbolRender;
     exports.DefaultCanvasTextRender = DefaultCanvasTextRender;