@visactor/vrender 0.12.0 → 0.12.1

package/cjs/plugins/builtin-plugin/3dview-transform-plugin.js

@@ -15,13 +15,15 @@ class ViewTransform3dPlugin {
         }, this.onMouseUp = e => {
             this.option3d || (this.option3d = this.pluginService.stage.option3d), this.option3d && (this.mousedown = !1);
         }, this.onMouseMove = e => {
+            var _a, _b;
             const stage = this.pluginService.stage;
             if (this.option3d || (this.option3d = stage.option3d), this.option3d && this.mousedown) if (this.pageX && this.pageY) {
                 const deltaX = e.page.x - this.pageX, deltaY = e.page.y - this.pageY;
                 this.pageX = e.page.x, this.pageY = e.page.y;
                 const angle1 = deltaX / 100, angle2 = deltaY / 100;
-                this.option3d.alpha += angle1, this.option3d.beta += angle2, stage.set3dOptions(this.option3d), 
-                stage.renderNextFrame();
+                this.option3d.alpha = (null !== (_a = this.option3d.alpha) && void 0 !== _a ? _a : 0) + angle1, 
+                this.option3d.beta = (null !== (_b = this.option3d.beta) && void 0 !== _b ? _b : 0) + angle2, 
+                stage.set3dOptions(this.option3d), stage.renderNextFrame();
             } else this.pageX = e.page.x, this.pageY = e.page.y;
         };
     }

package/cjs/plugins/builtin-plugin/3dview-transform-plugin.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/plugins/builtin-plugin/3dview-transform-plugin.ts"],"names":[],"mappings":"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","file":"3dview-transform-plugin.js","sourcesContent":["import type { IOption3D, IPlugin, IPluginService } from '../../interface';\nimport { Generator } from '../../common/generator';\n\nexport class ViewTransform3dPlugin implements IPlugin {\n  name: 'ViewTransform3dPlugin' = 'ViewTransform3dPlugin';\n  activeEvent: 'onRegister' = 'onRegister';\n  pluginService: IPluginService;\n  _uid: number = Generator.GenAutoIncrementId();\n  key: string = this.name + this._uid;\n  mousedown?: boolean;\n  pageX?: number;\n  pageY?: number;\n  option3d?: IOption3D;\n\n  onMouseDown = (e: MouseEvent | any) => {\n    if (!this.option3d) {\n      this.option3d = this.pluginService.stage.option3d;\n    }\n    if (!this.option3d) {\n      return;\n    }\n    this.mousedown = true;\n    this.pageX = e.page.x;\n    this.pageY = e.page.y;\n  };\n  onMouseUp = (e: MouseEvent | any) => {\n    if (!this.option3d) {\n      this.option3d = this.pluginService.stage.option3d;\n    }\n    if (!this.option3d) {\n      return;\n    }\n    this.mousedown = false;\n  };\n  onMouseMove = (e: MouseEvent | any) => {\n    const stage = this.pluginService.stage;\n    if (!this.option3d) {\n      this.option3d = stage.option3d;\n    }\n    if (!this.option3d) {\n      return;\n    }\n    if (this.mousedown) {\n      if (!this.pageX || !this.pageY) {\n        this.pageX = e.page.x;\n        this.pageY = e.page.y;\n      } else {\n        const deltaX = e.page.x - this.pageX;\n        const deltaY = e.page.y - this.pageY;\n        this.pageX = e.page.x;\n        this.pageY = e.page.y;\n\n        const angle1 = deltaX / 100;\n        const angle2 = deltaY / 100;\n        this.option3d.alpha += angle1;\n        this.option3d.beta += angle2;\n        stage.set3dOptions(this.option3d);\n        stage.renderNextFrame();\n      }\n    }\n  };\n\n  activate(context: IPluginService): void {\n    this.pluginService = context;\n    const stage = context.stage;\n    this.option3d = stage.option3d;\n    stage.addEventListener('mousedown', this.onMouseDown);\n    stage.addEventListener('mouseup', this.onMouseUp);\n    stage.addEventListener('mousemove', this.onMouseMove);\n  }\n  deactivate(context: IPluginService): void {\n    const stage = context.stage;\n    stage.removeEventListener('mousedown', this.onMouseDown);\n    stage.removeEventListener('mouseup', this.onMouseUp);\n    stage.removeEventListener('mousemove', this.onMouseMove);\n  }\n}\n"]}
+{"version":3,"sources":["../../src/plugins/builtin-plugin/3dview-transform-plugin.ts"],"names":[],"mappings":"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","file":"3dview-transform-plugin.js","sourcesContent":["import type { IOption3D, IPlugin, IPluginService } from '../../interface';\nimport { Generator } from '../../common/generator';\n\nexport class ViewTransform3dPlugin implements IPlugin {\n  name: 'ViewTransform3dPlugin' = 'ViewTransform3dPlugin';\n  activeEvent: 'onRegister' = 'onRegister';\n  pluginService: IPluginService;\n  _uid: number = Generator.GenAutoIncrementId();\n  key: string = this.name + this._uid;\n  mousedown?: boolean;\n  pageX?: number;\n  pageY?: number;\n  option3d?: IOption3D;\n\n  onMouseDown = (e: MouseEvent | any) => {\n    if (!this.option3d) {\n      this.option3d = this.pluginService.stage.option3d;\n    }\n    if (!this.option3d) {\n      return;\n    }\n    this.mousedown = true;\n    this.pageX = e.page.x;\n    this.pageY = e.page.y;\n  };\n  onMouseUp = (e: MouseEvent | any) => {\n    if (!this.option3d) {\n      this.option3d = this.pluginService.stage.option3d;\n    }\n    if (!this.option3d) {\n      return;\n    }\n    this.mousedown = false;\n  };\n  onMouseMove = (e: MouseEvent | any) => {\n    const stage = this.pluginService.stage;\n    if (!this.option3d) {\n      this.option3d = stage.option3d;\n    }\n    if (!this.option3d) {\n      return;\n    }\n    if (this.mousedown) {\n      if (!this.pageX || !this.pageY) {\n        this.pageX = e.page.x;\n        this.pageY = e.page.y;\n      } else {\n        const deltaX = e.page.x - this.pageX;\n        const deltaY = e.page.y - this.pageY;\n        this.pageX = e.page.x;\n        this.pageY = e.page.y;\n\n        const angle1 = deltaX / 100;\n        const angle2 = deltaY / 100;\n        this.option3d.alpha = (this.option3d.alpha ?? 0) + angle1;\n        this.option3d.beta = (this.option3d.beta ?? 0) + angle2;\n        stage.set3dOptions(this.option3d);\n        stage.renderNextFrame();\n      }\n    }\n  };\n\n  activate(context: IPluginService): void {\n    this.pluginService = context;\n    const stage = context.stage;\n    this.option3d = stage.option3d;\n    stage.addEventListener('mousedown', this.onMouseDown);\n    stage.addEventListener('mouseup', this.onMouseUp);\n    stage.addEventListener('mousemove', this.onMouseMove);\n  }\n  deactivate(context: IPluginService): void {\n    const stage = context.stage;\n    stage.removeEventListener('mousedown', this.onMouseDown);\n    stage.removeEventListener('mouseup', this.onMouseUp);\n    stage.removeEventListener('mousemove', this.onMouseMove);\n  }\n}\n"]}

package/dist/index.js

@@ -7552,7 +7552,8 @@
       fontStyle: '',
       lineHeight: undefined,
       underline: 0,
-      lineThrough: 0
+      lineThrough: 0,
+      scaleIn3d: false
   };
   const DefaultStyle = {
       opacity: 1,
@@ -17383,7 +17384,9 @@
   }
 
   function getContextFont(text, defaultAttr = {}, fontSizeScale) {
-      fontSizeScale = 1;
+      if (!fontSizeScale) {
+          fontSizeScale = 1;
+      }
       const { fontStyle = defaultAttr.fontStyle, fontVariant = defaultAttr.fontVariant, fontWeight = defaultAttr.fontWeight, fontSize = defaultAttr.fontSize, fontFamily = defaultAttr.fontFamily } = text;
       return ('' +
           (fontStyle ? fontStyle + ' ' : '') +
@@ -26396,11 +26399,12 @@
           if (!defaultParams) {
               defaultParams = this.textAttributes;
           }
+          const { scaleIn3d = defaultParams.scaleIn3d } = params;
           if (params.font) {
               _context.font = params.font;
           }
           else {
-              _context.font = getContextFont(params, defaultParams, this.camera && this.camera.getProjectionScale(z));
+              _context.font = getContextFont(params, defaultParams, scaleIn3d && this.camera && this.camera.getProjectionScale(z));
           }
           const { fontFamily = defaultParams.fontFamily, fontSize = defaultParams.fontSize } = params;
           this.fontFamily = fontFamily;
@@ -32974,8 +32978,8 @@
                   this.pageY = e.page.y;
                   const angle1 = deltaX / 100;
                   const angle2 = deltaY / 100;
-                  this.option3d.alpha += angle1;
-                  this.option3d.beta += angle2;
+                  this.option3d.alpha = (this.option3d.alpha ?? 0) + angle1;
+                  this.option3d.beta = (this.option3d.beta ?? 0) + angle2;
                   stage.set3dOptions(this.option3d);
                   stage.renderNextFrame();
               }
@@ -33739,7 +33743,7 @@
       'rect'
   ];
 
-  const version = "0.12.0";
+  const version = "0.12.1";
 
   exports.ACustomAnimate = ACustomAnimate;
   exports.ARC3D_NUMBER_TYPE = ARC3D_NUMBER_TYPE;