mxdraw 0.1.1 → 0.1.4

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

@@ -4,39 +4,23 @@ var three_1 = require("three");
 // import { SVGLoader } from 'three/examples/jsm/loaders/SVGLoader'
 var SVGLoader_1 = require("./SVGLoader");
 var three_2 = require("../../tools/three");
-function default_1(MxThreeJS) {
-    MxThreeJS.createImage = function (pos, w, h, imageUrlPath, callResult) {
-        new three_1.TextureLoader().load(imageUrlPath, function (texture) {
-            var geometry = new three_1.PlaneGeometry(w, h);
-            // 测试 transparent: true,打开，renderOrder才管用。
-            var materialTexture = new three_1.MeshLambertMaterial({
-                map: texture,
-                transparent: true,
-                side: three_1.DoubleSide
-            });
-            if (materialTexture.map)
-                materialTexture.map.needsUpdate = true;
-            (0, three_2.setGeometryPostion)(geometry, pos);
-            //var mesh = new Mesh(geometry, material);
-            var mesh = new three_1.Mesh(geometry, materialTexture);
-            mesh.material['depthTest'] = false;
-            //mesh.renderOrder = renderOrder;
-            callResult && callResult(mesh);
-        }, undefined, function (err) {
-            console.log(err);
-            callResult && callResult(null);
-        });
-    };
-    MxThreeJS.loadSVG = function (url, x, y, scale, color, callResult) {
+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();
-            group.scale.multiplyScalar(scale);
-            group.position.x = x;
-            group.position.y = y;
-            group.scale.y *= -1;
             var drawStrokes = true;
             var strokesWireframe = false;
             var drawFillShapes = true;
@@ -85,8 +69,66 @@ function default_1(MxThreeJS) {
                 }
             }
             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);
+            // 测试 transparent: true,打开，renderOrder才管用。
+            var materialTexture = new three_1.MeshLambertMaterial({
+                map: texture,
+                transparent: true,
+                side: three_1.DoubleSide
+            });
+            if (materialTexture.map)
+                materialTexture.map.needsUpdate = true;
+            (0, three_2.setGeometrPostion)(geometry, pos);
+            //var mesh = new Mesh(geometry, material);
+            var mesh = new three_1.Mesh(geometry, materialTexture);
+            mesh.material['depthTest'] = false;
+            //mesh.renderOrder = renderOrder;
+            callResult && callResult(mesh);
+        }, undefined, function (err) {
+            console.log(err);
+            callResult && callResult(null);
         });
     };
+    MxThreeJS.loadSVG = function (url, color, callResult) {
+        mxThreeJsBuffer.loadSVG(url, color, callResult);
+    };
 }
 exports.default = default_1;
-//# sourceMappingURL=MxThreeJS.mixin.js.map

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

@@ -1860,4 +1860,3 @@ var SVGLoader = /** @class */ (function (_super) {
     return SVGLoader;
 }(three_1.Loader));
 exports.SVGLoader = SVGLoader;
-//# sourceMappingURL=SVGLoader.js.map

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

@@ -5,4 +5,3 @@ var MxThreeJS_1 = require("./MxThreeJS");
 var MxThreeJS = new MxThreeJS_1.default();
 (0, MxThreeJS_mixin_1.default)(MxThreeJS);
 exports.default = MxThreeJS;
-//# sourceMappingURL=index.js.map

package/dist/lib/MxModule/MxType/MxType.js

@@ -0,0 +1,27 @@
+"use strict";
+/** @module MxType*/
+Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * 动态绘制类型
+ * @example ```typescript
+
+ * ```
+ */
+var MxCloneType;
+(function (MxCloneType) {
+    /** 正常Clone */
+    MxCloneType[MxCloneType["kClone"] = 1] = "kClone";
+    /** 动态拖动Clone */
+    MxCloneType[MxCloneType["kDragClone"] = 2] = "kDragClone";
+})(MxCloneType || (MxCloneType = {}));
+var MxCloneType2;
+(function (MxCloneType2) {
+    /** 正常Clone */
+    MxCloneType2[MxCloneType2["kClone"] = 1] = "kClone";
+    /** 动态拖动Clone */
+    MxCloneType2[MxCloneType2["kDragClone"] = 2] = "kDragClone";
+})(MxCloneType2 || (MxCloneType2 = {}));
+exports.default = {
+    MxCloneType: MxCloneType,
+    MxCloneType2: MxCloneType2
+};

package/dist/lib/MxModule/MxType/index.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var MxType_1 = require("./MxType");
+exports.default = MxType_1.default;

package/dist/lib/MxModule/Mxassembly/Mxassembly.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var store_1 = require("../store/store");
+/**
+ * Mxassembly 模块
+ * 导出库时已实例化，只需要调用实例方法 例如：
+ * ```typescript
+ * ```
+ */
+var Mxassembly = /** @class */ (function () {
+    function Mxassembly() {
+    }
+    Mxassembly.prototype.NewMcGeVector3d = function () {
+        return new store_1.default.state.Mxassembly.McGeVector3d();
+    };
+    return Mxassembly;
+}());
+exports.default = Mxassembly;

package/dist/lib/MxModule/Mxassembly/index.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var Mxassembly_1 = require("./Mxassembly");
+// import store from '../store/_index'
+// import loadCoreCode from '../loadCoreCode'
+// if (!store.state.MxFUn) {
+//   loadCoreCode()
+// }
+exports.default = new Mxassembly_1.default();

package/dist/lib/MxModule/loadCoreCode/index.js

@@ -3,4 +3,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /** @module loadCoreCode */
 var loadCoreCode_1 = require("./loadCoreCode");
 exports.default = loadCoreCode_1.default;
-//# sourceMappingURL=index.js.map

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

@@ -40,6 +40,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var dynamicImport_1 = require("../../tools/dynamicImport");
 var store_1 = require("../store/store");
 var mxfun_es5_js_1 = require("./mxfun.es5.js");
+var mxcadassembly_es5_js_1 = require("./mxcadassembly_es5.js");
+var MxDbImage_1 = require("../MxDbImage");
+var MxDbSVG_1 = require("../MxDbSVG");
+var MxDbAlignedDimension_1 = require("../MxDbAlignedDimension");
+var MxDbLine_1 = require("../MxDbLine");
+function rxInitMxEntity() {
+    new MxDbImage_1.default().rxInit();
+    new MxDbSVG_1.default().rxInit();
+    new MxDbAlignedDimension_1.default().rxInit();
+    new MxDbLine_1.default().rxInit();
+}
 /**
  * 加载MxDraw库的核心代码 才能使用Mx的其他模块
  * @returns Promise<{@link MxFun}>
@@ -85,9 +96,14 @@ function loadCoreCode() {
                                 window.MxMain = function (requireFun) {
                                     store_1.default.events.emit('MxMain', requireFun);
                                     window.MxMain = undefined;
+                                    rxInitMxEntity();
                                     res();
                                     return 0;
                                 };
+                                (0, mxcadassembly_es5_js_1.default)().then(function (mxassembly) {
+                                    //console.log(mxassembly);
+                                    store_1.default.commit('setMxassembly', mxassembly);
+                                });
                                 // 加载mxfun.min.js,mxfun()相当直接模拟了mxfun.min.js的加载。
                                 (0, mxfun_es5_js_1.default)();
                                 return [3 /*break*/, 3];
@@ -106,4 +122,3 @@ function loadCoreCode() {
     });
 }
 exports.default = loadCoreCode;
-//# sourceMappingURL=loadCoreCode.js.map