更新版本号

.vscode/settings.json

@@ -1,3 +1,16 @@
+// 将设置放入此文件中以覆盖默认值和用户设置。
 {
-    "editor.formatOnSave": true
+    "typescript.tsdk": "node_modules\\typescript\\lib",
+    //格式化设置
+    "editor.tabSize": 4,
+    "editor.formatOnPaste": true,
+    "editor.formatOnSave": true,
+    //格式设置
+    "typescript.format.placeOpenBraceOnNewLineForFunctions": true,
+    "typescript.format.placeOpenBraceOnNewLineForControlBlocks": true,
+    "typescript.referencesCodeLens.enabled": true,
+    "javascript.format.placeOpenBraceOnNewLineForFunctions": true,
+    "javascript.format.enable": true,
+    "files.insertFinalNewline": true,
+    "editor.detectIndentation": true,
 }

dist/Text.js

@@ -6,7 +6,7 @@ const GeUtils_1 = require("./GeUtils");
 class FontLoaderUtil {
     static Load() {
         if (!this.defFont) {
-            const f = require("../node_modules/three/examples/fonts/helvetiker_regular.typeface.json");
+            const f = require("../resources/fonts/helvetiker_regular.typeface.json");
             let loader = new three_1.FontLoader();
             this.defFont = loader.parse(f);
         }

dist/Text.js.map

@@ -1 +1 @@
-{"version":3,"file":"Text.js","sourceRoot":"","sources":["../src/Text.ts"],"names":[],"mappings":";;AAAA,iCAAuE;AACvE,iDAA+C;AAC/C,uCAAuC;AAGvC;IAGI,MAAM,CAAC,IAAI;QAEP,IAAG,CAAC,IAAI,CAAC,OAAO,EAChB;YACI,MAAM,CAAC,GAAG,OAAO,CAAC,uEAAuE,CAAC,CAAC;YAC3F,IAAI,MAAM,GAAG,IAAI,kBAAU,EAAE,CAAC;YAC9B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SAClC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;CACJ;AAED,YAAoB,SAAQ,YAAI;IAE5B;;;;;;OAMG;IACH,YAAY,GAAU,EAAC,SAAgB,CAAC;QAGpC,IAAI,IAAI,GAAG,cAAc,CAAC,IAAI,EAAE,CAAC;QAEjC,IAAI,MAAM,GAAkB,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,EAAC,GAAG,CAAC,CAAC;QACjE,IAAI,QAAQ,GAAG,IAAI,qBAAa,CAAC,MAAM,CAAC,CAAC;QAEzC,QAAQ,CAAC,kBAAkB,EAAE,CAAC;QAE9B,KAAK,CAAC,QAAQ,EAAC,4BAAa,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;QAEjD,IAAI,MAAM,GAAG,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,eAAO,EAAE,CAAC,CAAC;QAC3D,IAAI,CAAC,WAAW,CAAC,oBAAU,CAAC,IAAI,eAAO,CAAC,CAAC,MAAM,CAAC,CAAC,EAAC,CAAC,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7D,CAAC;CACJ;AAxBD,wBAwBC"}
+{"version":3,"file":"Text.js","sourceRoot":"","sources":["../src/Text.ts"],"names":[],"mappings":";;AAAA,iCAAuE;AACvE,iDAA+C;AAC/C,uCAAuC;AAEvC;IAEE,MAAM,CAAC,IAAI;QACT,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,MAAM,CAAC,GAAG,OAAO,CAAC,qDAAqD,CAAC,CAAC;YACzE,IAAI,MAAM,GAAG,IAAI,kBAAU,EAAE,CAAC;YAC9B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SAChC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;CACF;AAED,YAAoB,SAAQ,YAAI;IAC9B;;;;;;OAMG;IACH,YAAY,GAAW,EAAE,SAAiB,CAAC;QACzC,IAAI,IAAI,GAAG,cAAc,CAAC,IAAI,EAAE,CAAC;QAEjC,IAAI,MAAM,GAAkB,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QAClE,IAAI,QAAQ,GAAG,IAAI,qBAAa,CAAC,MAAM,CAAC,CAAC;QAEzC,QAAQ,CAAC,kBAAkB,EAAE,CAAC;QAE9B,KAAK,CAAC,QAAQ,EAAE,4BAAa,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;QAElD,IAAI,MAAM,GAAG,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,eAAO,EAAE,CAAC,CAAC;QAC3D,IAAI,CAAC,WAAW,CAAC,oBAAU,CAAC,IAAI,eAAO,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7D,CAAC;CACF;AArBD,wBAqBC"}

dist/createBoard.js

@@ -80,11 +80,20 @@ function createBoard(boardData) {
         boardMat.setPosition(pBase);
         matInv.getInverse(boardMat, true);
     }
-    for (let i = 0; i < boardPts.length; i++) {
-        let pt = getVec(boardPts[i]);
-        pt.applyMatrix4(matInv);
-        pts.push(new THREE.Vector2(pt.x, pt.y));
-        buls.push(boardBuls[i]);
+    if (boardPts && boardPts.length !== 0)
+        for (let i = 0; i < boardPts.length; i++) {
+            let pt = getVec(boardPts[i]);
+            if (boardPts[i].z !== undefined)
+                pt.applyMatrix4(matInv);
+            pts.push(new THREE.Vector2(pt.x, pt.y));
+            buls.push(boardBuls[i]);
+        }
+    else {
+        let length = boardData["L"];
+        let width = boardData["W"];
+        let height = boardData["H"];
+        pts.push(new three_1.Vector2(0, 0), new three_1.Vector2(width, 0), new three_1.Vector2(width, length), new three_1.Vector2(0, length), new three_1.Vector2(0, 0));
+        buls.push(0, 0, 0, 0, 0);
     }
     let sp = createPath(pts, buls);
     let extrudeSettings = {

package.json

@@ -1,13 +1,13 @@
 {
   "name": "cadview",
-  "version": "1.0.0",
+  "version": "1.0.4",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
     "build": "tsc"
   },
-  "author": "",
+  "author": "cx",
   "license": "ISC",
   "devDependencies": {
     "@types/node": "^10.1.2",

src/Text.ts

@@ -2,44 +2,37 @@ import { Font, FontLoader, Mesh, ShapeGeometry, Vector3 } from "three";
 import { ColorMaterial } from "./ColorPalette";
 import { MoveMatrix } from "./GeUtils";
 
-
-class FontLoaderUtil
-{
-    private static defFont:Font;
-    static Load():Font
-    {
-        if(!this.defFont)
-        {
-            const f = require("../node_modules/three/examples/fonts/helvetiker_regular.typeface.json");
-            let loader = new FontLoader();
-            this.defFont = loader.parse(f);
-        }
-        return this.defFont;
+class FontLoaderUtil {
+  private static defFont: Font;
+  static Load(): Font {
+    if (!this.defFont) {
+      const f = require("../resources/fonts/helvetiker_regular.typeface.json");
+      let loader = new FontLoader();
+      this.defFont = loader.parse(f);
     }
+    return this.defFont;
+  }
 }
 
-export class DbText extends Mesh
-{
-    /**
-     * 
-     * 构造一个文本对象,8位点(中心点下面)在0点
-     * @param {string} str 数字字符串
-     * @param {number} height 文本高度
-     * @memberof DbText
-     */
-    constructor(str:string,height:number = 5)
-    {
+export class DbText extends Mesh {
+  /**
+   *
+   * 构造一个文本对象,8位点(中心点下面)在0点
+   * @param {string} str 数字字符串
+   * @param {number} height 文本高度
+   * @memberof DbText
+   */
+  constructor(str: string, height: number = 5) {
+    let font = FontLoaderUtil.Load();
 
-        let font = FontLoaderUtil.Load();
+    let shapes: THREE.Shape[] = font.generateShapes(str, height, 0.1);
+    let geometry = new ShapeGeometry(shapes);
 
-        let shapes: THREE.Shape[] = font.generateShapes(str, height,0.1);
-        let geometry = new ShapeGeometry(shapes);
+    geometry.computeBoundingBox();
 
-        geometry.computeBoundingBox();
+    super(geometry, ColorMaterial.GetLineMaterial(5));
 
-        super(geometry,ColorMaterial.GetLineMaterial(5));
-
-        let center = geometry.boundingBox.getCenter(new Vector3());
-        this.applyMatrix(MoveMatrix(new Vector3(-center.x,0,0)));
-    }
+    let center = geometry.boundingBox.getCenter(new Vector3());
+    this.applyMatrix(MoveMatrix(new Vector3(-center.x, 0, 0)));
+  }
 }

src/createBoard.ts

@@ -1,5 +1,5 @@
 import * as THREE from 'three';
-import { Geometry, LineSegments } from 'three';
+import { Geometry, LineSegments, Vector2 } from 'three';
 import { polar } from './GeUtils';
 import { boardMaterial, edgeMaterial } from './Material';
 import { RotateUVs } from './RotateUV';
@@ -101,12 +101,27 @@ export function createBoard(boardData: object)
         matInv.getInverse(boardMat, true);
     }
 
-    for (let i = 0; i < boardPts.length; i++)
+    if (boardPts && boardPts.length !== 0)
+        for (let i = 0; i < boardPts.length; i++)
+        {
+            let pt = getVec(boardPts[i]);
+            if (boardPts[i].z !== undefined)
+                pt.applyMatrix4(matInv);
+            pts.push(new THREE.Vector2(pt.x, pt.y));
+            buls.push(boardBuls[i]);
+        }
+    else
     {
-        let pt = getVec(boardPts[i]);
-        pt.applyMatrix4(matInv);
-        pts.push(new THREE.Vector2(pt.x, pt.y));
-        buls.push(boardBuls[i]);
+        let length = boardData["L"];
+        let width = boardData["W"];
+        let height = boardData["H"];
+        pts.push(new Vector2(0, 0),
+            new Vector2(width, 0),
+            new Vector2(width, length),
+            new Vector2(0, length),
+            new Vector2(0, 0)
+        );
+        buls.push(0, 0, 0, 0, 0);
     }
 
     let sp = createPath(pts, buls);