mxdraw 0.1.21 → 0.1.22

package/dist/lib/MxModule/McGeVector3d/McGeVector3d.js

@@ -1,2 +1,3 @@
 "use strict";
+/** @module McGeVector3d */
 Object.defineProperty(exports, "__esModule", { value: true });

package/dist/lib/MxModule/MxFun/MxFun.js

@@ -9,6 +9,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+/** @module MxFun */
 var random_1 = require("../../tools/algorithm/random");
 var create_1 = require("../../tools/dom/create");
 var MxDrawObject_1 = require("../MxDrawObject");
@@ -671,6 +672,12 @@ var MxFun = /** @class */ (function () {
     MxFun.prototype.listenForCoordTip = function (callback) {
         mxUiData_1.default.mountSetCoordFun(callback);
     };
+    /**
+     * 返回mxfun.min.js中的THREE.JS对象，可以用它来创建mxfun.min.js中THREE对象。
+     * */
+    MxFun.prototype.getMxFunTHREE = function () {
+        return store_1.default.state.MxFun.getTHREE();
+    };
     return MxFun;
 }());
 exports.default = MxFun;

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

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var three_1 = require("three");
 var math_1 = require("../../tools/algorithm/math");
 var formatting_1 = require("../../tools/formatting");
+var store_1 = require("../store");
 /**
  * MxThreeJS 模块
  * ##### 使用说明:
@@ -274,9 +275,21 @@ var MxThreeJS = /** @class */ (function () {
      * ```
      */
     MxThreeJS.prototype.loadSVG = function (url, color, callResult) {
-        return new Promise(function (resolve) {
-            resolve(null);
-        });
+        if (callResult) {
+            ;
+            store_1.default.state.MxFun.loadSVG(url, color, callResult);
+            return new Promise(function (resolve) {
+                resolve(null);
+            });
+        }
+        else {
+            return new Promise(function (resolve) {
+                ;
+                store_1.default.state.MxFun.loadSVG(url, color, function (threeobj) {
+                    resolve(threeobj);
+                });
+            });
+        }
     };
     return MxThreeJS;
 }());

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

@@ -1,110 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var three_1 = require("three");
-// import { SVGLoader } from 'three/examples/jsm/loaders/SVGLoader'
-var SVGLoader_1 = require("./SVGLoader");
 var three_2 = require("../../tools/three");
-var MxThreeJSSVGData = /** @class */ (function () {
-    function MxThreeJSSVGData() {
-        this.svg = new three_1.Group();
-        this.aryMeterial = [];
-    }
-    return MxThreeJSSVGData;
-}());
-var MxThreeJSBuffer = /** @class */ (function () {
-    function MxThreeJSBuffer() {
-        this.mapSvgUrlToData = new Map();
-    }
-    MxThreeJSBuffer.prototype.loadSVGImp = function (url, color, callResult) {
-        var loader = new SVGLoader_1.SVGLoader();
-        loader.load(url, function (data) {
-            var aryMeterial = [];
-            var paths = data.paths;
-            var group = new three_1.Group();
-            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;
-                if (drawFillShapes && fillColor !== undefined && fillColor !== 'none') {
-                    var material = new three_1.MeshBasicMaterial({
-                        color: color ? color : new three_1.Color().setStyle(fillColor),
-                        opacity: path.userData.style.fillOpacity,
-                        transparent: path.userData.style.fillOpacity < 1,
-                        side: three_1.DoubleSide,
-                        depthWrite: false,
-                        wireframe: fillShapesWireframe
-                    });
-                    // const shapes = path.toShapes( true );
-                    var shapes = SVGLoader_1.SVGLoader.createShapes(path);
-                    for (var j = 0; j < shapes.length; j++) {
-                        var shape = shapes[j];
-                        var geometry = new three_1.ShapeBufferGeometry(shape);
-                        var mesh = new three_1.Mesh(geometry, material);
-                        group.add(mesh);
-                    }
-                    aryMeterial.push(material);
-                }
-                var strokeColor = path.userData.style.stroke;
-                if (drawStrokes && strokeColor !== undefined && strokeColor !== 'none') {
-                    var material = new three_1.MeshBasicMaterial({
-                        color: color ? color : new three_1.Color().setStyle(strokeColor),
-                        opacity: path.userData.style.strokeOpacity,
-                        transparent: path.userData.style.strokeOpacity < 1,
-                        side: three_1.DoubleSide,
-                        depthWrite: false,
-                        wireframe: strokesWireframe
-                    });
-                    for (var j = 0, jl = path.subPaths.length; j < jl; j++) {
-                        var subPath = path.subPaths[j];
-                        var geometry = SVGLoader_1.SVGLoader.pointsToStroke(subPath.getPoints(), path.userData.style, 12, 0.001);
-                        if (geometry) {
-                            var mesh = new three_1.Mesh(geometry, material);
-                            group.add(mesh);
-                        }
-                    }
-                    aryMeterial.push(material);
-                }
-            }
-            callResult && callResult(group, aryMeterial);
-        }, undefined, function () {
-            callResult && callResult(null, null);
-        });
-    };
-    MxThreeJSBuffer.prototype.loadSVG = function (url, color, callResult) {
-        var _this = this;
-        var data = this.mapSvgUrlToData.get(url);
-        if (data) {
-            if (callResult) {
-                if (data == null)
-                    callResult(null, null);
-                else
-                    callResult(data.svg.clone(), data.aryMeterial);
-            }
-            return;
-        }
-        else {
-            this.loadSVGImp(url, color, function (group, aryMeterial) {
-                if (group && aryMeterial) {
-                    var data_1 = new MxThreeJSSVGData();
-                    data_1.svg = group;
-                    data_1.aryMeterial = aryMeterial;
-                    _this.mapSvgUrlToData.set(url, data_1);
-                    callResult && callResult(data_1.svg.clone(), data_1.aryMeterial);
-                }
-                else {
-                    _this.mapSvgUrlToData.set(url, null);
-                    callResult && callResult(null, null);
-                }
-            });
-        }
-    };
-    return MxThreeJSBuffer;
-}());
 function default_1(MxThreeJS) {
-    var mxThreeJsBuffer = new MxThreeJSBuffer();
     MxThreeJS.createImage = function (pos, w, h, imageUrlPath, callResult) {
         new three_1.TextureLoader().load(imageUrlPath, function (texture) {
             var geometry = new three_1.PlaneGeometry(w, h);
@@ -127,20 +25,5 @@ function default_1(MxThreeJS) {
             callResult && callResult(null);
         });
     };
-    MxThreeJS.loadSVG = function (url, color, callResult) {
-        if (callResult) {
-            mxThreeJsBuffer.loadSVG(url, color, callResult);
-            return new Promise(function (resolve) {
-                resolve(null);
-            });
-        }
-        else {
-            return new Promise(function (resolve) {
-                mxThreeJsBuffer.loadSVG(url, color, function (threeobj) {
-                    resolve(threeobj);
-                });
-            });
-        }
-    };
 }
 exports.default = default_1;