mxdraw 0.1.11 → 0.1.12

package/dist/lib/MxModule/MxDbSVG/MxDbSVG.js

@@ -39,6 +39,8 @@ var MxDbSVG = /** @class */ (function (_super) {
         _this.svgSize = new THREE.Vector2(50, 50);
         _this.svgAlignmentRatio = new THREE.Vector2(0, 0);
         _this.svgRotate = 0;
+        _this.svgReverse = false;
+        _this.svgMargin = new THREE.Vector2(0, 0);
         _this.isSvgDirtyLocation = false;
         _this.isLoadFromPath = true;
         _this.aryText = [];
@@ -48,21 +50,37 @@ var MxDbSVG = /** @class */ (function (_super) {
         _this.useSvgColor = false;
         return _this;
     }
-    MxDbSVG.prototype.worldDraw = function (pWorldDraw) {
-        var _this = this;
-        var mxObj = pWorldDraw.getMxObject();
-        this.calcSvgPosition(mxObj);
+    MxDbSVG.prototype.calcVewSize = function (mxObj) {
         var sizew = this.svgSize.x;
         var sizeh = this.svgSize.y;
+        if (sizeh <= 0) {
+            if (this.svgBoxSize) {
+                sizeh = (this.svgBoxSize.y / this.svgBoxSize.x) * sizew;
+            }
+            else {
+                sizeh = sizew;
+            }
+        }
         if (this.fixedSize) {
             sizew = mxObj.screenCoordLong2Doc(sizew);
             sizeh = mxObj.screenCoordLong2Doc(sizeh);
         }
+        return [sizew, sizeh];
+    };
+    MxDbSVG.prototype.worldDraw = function (pWorldDraw) {
+        var _this = this;
+        var mxObj = pWorldDraw.getMxObject();
+        this.calcSvgPosition(mxObj);
+        var _a = this.calcVewSize(mxObj), sizew = _a[0], sizeh = _a[1];
+        var matSclae = new THREE.Matrix4();
+        if (this.svgReverse)
+            matSclae.makeScale(1, -1, 1);
         var mat = new THREE.Matrix4();
         mat.makeRotationZ(this.svgRotate);
         var matMove = new THREE.Matrix4();
         var svgNewPos = new THREE.Vector3(this.svgPos.x - sizew * this.svgAlignmentRatio.x, this.svgPos.y - sizeh * this.svgAlignmentRatio.y, 0);
         matMove.makeTranslation(svgNewPos.x, svgNewPos.y, svgNewPos.z);
+        mat.multiply(matSclae);
         mat.premultiply(matMove);
         var pt1 = new THREE.Vector3(0, 0, 0);
         var pt3 = new THREE.Vector3(sizew, 0, 0);
@@ -116,9 +134,13 @@ var MxDbSVG = /** @class */ (function (_super) {
                             }
                             myThis_1.svgBoxSize.x = box.max.x - box.min.x;
                             myThis_1.svgBoxSize.y = box.max.y - box.min.y;
-                            obj.scale.x = sizew / myThis_1.svgBoxSize.x;
-                            obj.scale.y = sizeh / myThis_1.svgBoxSize.y;
+                            var _a = myThis_1.calcVewSize(mxObj), sizew_1 = _a[0], sizeh_1 = _a[1];
+                            obj.scale.x = sizew_1 / myThis_1.svgBoxSize.x;
+                            obj.scale.y = sizeh_1 / myThis_1.svgBoxSize.y;
                             obj.scale.z = obj.scale.x;
+                            if (myThis_1.svgReverse) {
+                                obj.scale.y *= -1;
+                            }
                             obj.rotateZ(myThis_1.svgRotate);
                             myThis_1.isSvgDirtyLocation = true;
                             var color_1 = new THREE.Color(pWorldDraw.getColor());
@@ -212,14 +234,11 @@ var MxDbSVG = /** @class */ (function (_super) {
             return;
         }
         this.isSvgDirtyLocation = false;
-        var sizew = this.svgSize.x;
-        var sizeh = this.svgSize.y;
-        if (this.fixedSize) {
-            sizew = mxObj.screenCoordLong2Doc(sizew);
-            sizeh = mxObj.screenCoordLong2Doc(sizeh);
-        }
-        this.svg.position.x = this.svgPos.x - sizew * this.svgAlignmentRatio.x;
-        this.svg.position.y = this.svgPos.y - sizeh * this.svgAlignmentRatio.y;
+        var _a = this.calcVewSize(mxObj), sizew = _a[0], sizeh = _a[1];
+        this.svg.position.x =
+            this.svgPos.x - sizew * this.svgAlignmentRatio.x - this.svgMargin.x * sizew;
+        this.svg.position.y =
+            this.svgPos.y - sizeh * this.svgAlignmentRatio.y - this.svgMargin.y * sizeh;
     };
     MxDbSVG.prototype.dwgIn = function (obj) {
         var _this = this;
@@ -251,6 +270,8 @@ var MxDbSVG = /** @class */ (function (_super) {
         });
         this.svgRotate = obj['svgRotate'];
         this.useSvgColor = obj['useSvgColor'];
+        this.svgReverse = obj['svgReverse'];
+        this.svgMargin = obj['svgMargin'];
         return true;
     };
     MxDbSVG.prototype.dwgOut = function (obj) {
@@ -266,6 +287,8 @@ var MxDbSVG = /** @class */ (function (_super) {
         obj['fixedSize'] = this.fixedSize;
         obj['svgRotate'] = this.svgRotate;
         obj['useSvgColor'] = this.useSvgColor;
+        obj['svgReverse'] = this.svgReverse;
+        obj['svgMargin'] = this.svgMargin;
         return obj;
     };
     MxDbSVG.prototype.create = function () {
@@ -308,11 +331,13 @@ var MxDbSVG = /** @class */ (function (_super) {
                 this.svgBoxSize.x = box.max.x - box.min.x;
                 this.svgBoxSize.y = box.max.y - box.min.y;
             }
-            var sizew = mxObj.screenCoordLong2Doc(this.svgSize.x);
-            var sizeh = mxObj.screenCoordLong2Doc(this.svgSize.y);
+            var _a = this.calcVewSize(mxObj), sizew = _a[0], sizeh = _a[1];
             this.svg.scale.x = sizew / this.svgBoxSize.x;
             this.svg.scale.y = sizeh / this.svgBoxSize.y;
             this.svg.scale.z = this.svg.scale.x;
+            if (this.svgReverse) {
+                this.svg.scale.y *= -1;
+            }
             this.isSvgDirtyLocation = true;
             this.calcSvgPosition(mxObj);
         }

package/dist/lib/MxModule/MxThreeJS/MxThreeJS.mixin.js

@@ -21,10 +21,10 @@ var MxThreeJSBuffer = /** @class */ (function () {
             var aryMeterial = [];
             var paths = data.paths;
             var group = new three_1.Group();
-            var drawStrokes = true;
-            var strokesWireframe = false;
+            var drawStrokes = false;
             var drawFillShapes = true;
             var fillShapesWireframe = false;
+            var strokesWireframe = false;
             for (var i = 0; i < paths.length; i++) {
                 var path = paths[i];
                 var fillColor = path.userData.style.fill;

package/dist/lib/MxModule/loadCoreCode/mxfun.es5.js

@@ -7254,7 +7254,7 @@ function mxfun() { !function a(o, s, l) { function c(e, t) { if (!s[e]) {
                 return !1; d.OnMxEvent(t); };
         }, { "./MxCmdRunManager": 33, "./MxFun": 45, "./MxJigCmdManager": 48, "./MxTools": 59 }], 65: [function (t, e, n) {
             "use strict";
-            Object.defineProperty(n, "__esModule", { value: !0 }), n.MxBulid = void 0, window.MxDrawVersion = "1.0(2022-04-25 16:45)", (n.MxBulid || (n.MxBulid = {})).getVersion = function () { return window.MxDrawVersion ? window.MxDrawVersion : "inalid version"; };
+            Object.defineProperty(n, "__esModule", { value: !0 }), n.MxBulid = void 0, window.MxDrawVersion = "1.0(2022-04-26 11:53)", (n.MxBulid || (n.MxBulid = {})).getVersion = function () { return window.MxDrawVersion ? window.MxDrawVersion : "inalid version"; };
         }, {}], 66: [function (t, e, n) {
             "use strict";
             Object.defineProperty(n, "__esModule", { value: !0 }), n.MxWindowsEvent = void 0;