排钻显示改成实体显示.

修正未选中板件时,视图没有刷新的问题.
加入排钻显示.

.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/CameraControls.d.ts

@@ -31,6 +31,7 @@ export declare class CameraControls {
     onTouchEnd: (event: TouchEvent) => void;
     onTouchMove: (event: TouchEvent) => void;
     beginRotate(): void;
+    lastMiddleClickTime: number;
     onMouseDown: (event: MouseEvent) => void;
     onMouseUp: (event: MouseEvent) => void;
     onMouseMove: (event: MouseEvent) => void;

dist/CameraControls.js

@@ -93,6 +93,8 @@ class CameraControls {
             this.m_StartClickPoint.copy(this.m_EndClickPoint);
             this.m_Viewer.m_bNeedUpdate = true;
         };
+        //最后一次按中键的时间
+        this.lastMiddleClickTime = 0;
         //鼠标    
         this.onMouseDown = (event) => {
             event.preventDefault();
@@ -109,6 +111,13 @@ class CameraControls {
                     }
                 case KeyEnum_1.MouseKey.Middle:
                     {
+                        let curTime = Date.now();
+                        let t = curTime - this.lastMiddleClickTime;
+                        this.lastMiddleClickTime = curTime;
+                        if (t < 350) {
+                            this.m_Viewer.ZoomAll();
+                            return;
+                        }
                         if (this.m_KeyDown.get(KeyEnum_1.KeyBoard.Control)) {
                             this.beginRotate();
                         }

dist/CameraUpdate.d.ts

@@ -18,6 +18,8 @@ export declare class CameraUpdate {
     private m_Target;
     private m_Direction;
     private m_Orbit;
+    m_MinViewHeight: number;
+    m_MaxViewHeight: number;
     constructor();
     readonly Aspect: number;
     readonly Camera: THREE.Camera;

dist/CameraUpdate.js

@@ -24,7 +24,9 @@ class CameraUpdate {
         this.m_Direction = new THREE.Vector3(0, 0, -1);
         //观察的轨道.
         this.m_Orbit = new Orbit_1.Orbit();
-        this.m_CameraArray.set(THREE.OrthographicCamera, new THREE.OrthographicCamera(-2, 2, 2, -2, -100000, 100000));
+        this.m_MinViewHeight = 10;
+        this.m_MaxViewHeight = 3e4;
+        this.m_CameraArray.set(THREE.OrthographicCamera, new THREE.OrthographicCamera(-2, 2, 2, -2, -1e6, 1e6));
         this.m_CameraArray.set(THREE.PerspectiveCamera, new THREE.PerspectiveCamera(50, 1, 0.01, 10000));
         this.m_CurCamera = this.m_CameraArray.get(THREE.OrthographicCamera);
         this.m_Orbit.UpdateRoValue(this.m_Direction);
@@ -41,7 +43,7 @@ class CameraUpdate {
         return this.m_ViewHeight;
     }
     set ViewHeight(height) {
-        this.m_ViewHeight = THREE.Math.clamp(height, 1e-8, 1e8);
+        this.m_ViewHeight = THREE.Math.clamp(height, this.m_MinViewHeight, this.m_MaxViewHeight);
     }
     SetSize(width, height) {
         this.m_Width = width;
@@ -84,7 +86,7 @@ class CameraUpdate {
     Zoom(scale, scaleCenter) {
         if (this.Camera instanceof THREE.OrthographicCamera) {
             this.ViewHeight *= scale;
-            if (scaleCenter) {
+            if (scaleCenter && this.m_ViewHeight < this.m_MaxViewHeight) {
                 this.m_Target.sub(scaleCenter);
                 this.m_Target.multiplyScalar(scale);
                 this.m_Target.add(scaleCenter);

dist/Material.d.ts

@@ -1,3 +1,4 @@
 import { MeshBasicMaterial, LineBasicMaterial } from "three";
 export declare let boardMaterial: MeshBasicMaterial;
+export declare let selectMaterial: MeshBasicMaterial;
 export declare let edgeMaterial: LineBasicMaterial;

dist/Material.js

@@ -8,6 +8,12 @@ exports.boardMaterial = new three_1.MeshBasicMaterial({
     polygonOffsetFactor: 1,
     polygonOffsetUnits: 1
 });
+exports.selectMaterial = new three_1.MeshBasicMaterial({
+    color: new three_1.Color(0.1, 0.5, 0.5),
+    polygonOffset: true,
+    polygonOffsetFactor: 1,
+    polygonOffsetUnits: 1
+});
 //线框的材质
 exports.edgeMaterial = new three_1.LineBasicMaterial({ linewidth: 2, color: new three_1.Color(0, 0, 0) });
 //# sourceMappingURL=Material.js.map

dist/Material.js.map

@@ -1 +1 @@
-{"version":3,"file":"Material.js","sourceRoot":"","sources":["../src/Material.ts"],"names":[],"mappings":";;AAAA,iCAAoE;AAEpE,uBAAuB;AACZ,QAAA,aAAa,GAAG,IAAI,yBAAiB,CAAC;IAC7C,KAAK,EAAE,IAAI,aAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;IAC/B,aAAa,EAAE,IAAI;IACnB,mBAAmB,EAAE,CAAC;IACtB,kBAAkB,EAAE,CAAC;CACxB,CAAC,CAAC;AAEH,OAAO;AACI,QAAA,YAAY,GAAG,IAAI,yBAAiB,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,aAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC"}
+{"version":3,"file":"Material.js","sourceRoot":"","sources":["../src/Material.ts"],"names":[],"mappings":";;AAAA,iCAAoE;AAEpE,uBAAuB;AACZ,QAAA,aAAa,GAAG,IAAI,yBAAiB,CAAC;IAC7C,KAAK,EAAE,IAAI,aAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;IAC/B,aAAa,EAAE,IAAI;IACnB,mBAAmB,EAAE,CAAC;IACtB,kBAAkB,EAAE,CAAC;CACxB,CAAC,CAAC;AAEQ,QAAA,cAAc,GAAG,IAAI,yBAAiB,CAAC;IAC9C,KAAK,EAAE,IAAI,aAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;IAC/B,aAAa,EAAE,IAAI;IACnB,mBAAmB,EAAE,CAAC;IACtB,kBAAkB,EAAE,CAAC;CACxB,CAAC,CAAC;AAEH,OAAO;AACI,QAAA,YAAY,GAAG,IAAI,yBAAiB,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,aAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC"}

dist/RotateUV.d.ts

@@ -1,2 +1,2 @@
-import * as THREE from 'three';
-export declare function RotateUVs(geo: THREE.Geometry): void;
+import { Geometry } from 'three';
+export declare function RotateUVs(geo: Geometry): void;

dist/RotateUV.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const Matrix2_1 = require("./Matrix2");
-const THREE = require("three");
+const three_1 = require("three");
 function RotateUVs(geo) {
     let roMat = new Matrix2_1.Matrix2();
     roMat.set(0, -1, 1, 0);
-    let addV = new THREE.Vector2(1, 0);
+    let addV = new three_1.Vector2(1, 0);
     for (let uvs of geo.faceVertexUvs) {
         for (let uv of uvs) {
             for (let v of uv) {

dist/RotateUV.js.map

@@ -1 +1 @@
-{"version":3,"file":"RotateUV.js","sourceRoot":"","sources":["../src/RotateUV.ts"],"names":[],"mappings":";;AAAA,uCAAoC;AACpC,+BAA+B;AAG/B,mBAA0B,GAAmB;IAEzC,IAAI,KAAK,GAAG,IAAI,iBAAO,EAAE,CAAC;IAC1B,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EACX,CAAC,EAAE,CAAC,CAAC,CAAC;IAEV,IAAI,IAAI,GAAG,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAEnC,KAAK,IAAI,GAAG,IAAI,GAAG,CAAC,aAAa,EACjC;QACI,KAAK,IAAI,EAAE,IAAI,GAAG,EAClB;YACI,KAAK,IAAI,CAAC,IAAI,EAAE,EAChB;gBACI,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;gBACrB,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;aACf;SACJ;KACJ;IACD,GAAG,CAAC,aAAa,GAAG,IAAI,CAAC;AAC7B,CAAC;AApBD,8BAoBC"}
+{"version":3,"file":"RotateUV.js","sourceRoot":"","sources":["../src/RotateUV.ts"],"names":[],"mappings":";;AAAA,uCAAoC;AACpC,iCAA0C;AAG1C,mBAA0B,GAAa;IAEnC,IAAI,KAAK,GAAG,IAAI,iBAAO,EAAE,CAAC;IAC1B,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EACX,CAAC,EAAE,CAAC,CAAC,CAAC;IAEV,IAAI,IAAI,GAAG,IAAI,eAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAE7B,KAAK,IAAI,GAAG,IAAI,GAAG,CAAC,aAAa,EACjC;QACI,KAAK,IAAI,EAAE,IAAI,GAAG,EAClB;YACI,KAAK,IAAI,CAAC,IAAI,EAAE,EAChB;gBACI,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;gBACrB,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;aACf;SACJ;KACJ;IACD,GAAG,CAAC,aAAa,GAAG,IAAI,CAAC;AAC7B,CAAC;AApBD,8BAoBC"}

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;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"}
+{"version":3,"file":"Text.js","sourceRoot":"","sources":["../src/Text.ts"],"names":[],"mappings":";;AAAA,iCAAuE;AACvE,iDAA+C;AAC/C,uCAAuC;AAEvC;IAGE,MAAM,CAAC,IAAI;QAET,IAAI,CAAC,IAAI,CAAC,OAAO,EACjB;YACE,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;IAE9B;;;;;;OAMG;IACH,YAAY,GAAW,EAAE,SAAiB,CAAC;QAEzC,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;AAvBD,wBAuBC"}

dist/Viewer.js

@@ -5,7 +5,7 @@ const CameraUpdate_1 = require("./CameraUpdate");
 const GeUtils_1 = require("./GeUtils");
 const PlaneExt_1 = require("./PlaneExt");
 const _1 = require(".");
-const three_1 = require("three");
+const ColorPalette_1 = require("./ColorPalette");
 class Viewer {
     //构造
     constructor(canvasContainer) {
@@ -38,18 +38,16 @@ class Viewer {
         window.addEventListener("resize", () => {
             this.OnSize();
         });
-        //选中
-        let selectMaterial = new three_1.MeshBasicMaterial({ color: new three_1.Color(0.1, 0.5, 0.5) });
         let oldMesh;
         this.m_Render.domElement.addEventListener("mousemove", (e) => {
             let mesh = _1.PointPick(this, e.offsetX, e.offsetY);
             if (oldMesh)
                 oldMesh.material = _1.boardMaterial;
-            if (mesh) {
+            if (mesh && mesh.material !== ColorPalette_1.ColorMaterial.GetLineMaterial(1)) {
                 oldMesh = mesh;
-                mesh.material = selectMaterial;
-                this.m_bNeedUpdate = true;
+                mesh.material = _1.selectMaterial;
             }
+            this.m_bNeedUpdate = true;
         });
     }
     //初始化render

dist/Viewer.js.map

@@ -1 +1 @@
-{"version":3,"file":"Viewer.js","sourceRoot":"","sources":["../src/Viewer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Viewer.js","sourceRoot":"","sources":["../src/Viewer.ts"],"names":[],"mappings":"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"}

dist/createBoard.d.ts

@@ -1,5 +1,5 @@
 import * as THREE from 'three';
-import { Geometry, LineSegments } from 'three';
+import { Geometry, LineSegments, Shape, Vector2 } from 'three';
 export declare class Arc2d {
     m_StartAn: number;
     m_EndAn: number;
@@ -9,11 +9,11 @@ export declare class Arc2d {
     m_Radius: number;
     constructor(p1: THREE.Vector2, p2: THREE.Vector2, bul: number);
 }
-export declare function createPath(pts: THREE.Vector2[], buls: number[], shapeOut?: THREE.Shape): THREE.Shape;
+export declare function createPath(pts: Vector2[], buls: number[], shapeOut?: Shape): Shape;
 export declare function getVec(data: object): THREE.Vector3;
 export declare function createBoard(boardData: object): {
     mesh: THREE.Mesh;
-    edges: THREE.LineSegments[];
+    edges: (THREE.Mesh | THREE.LineSegments)[];
 };
 export declare function createTemplateBoard(brDataList: any[]): {
     meshs: any[];

dist/createBoard.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const THREE = require("three");
 const three_1 = require("three");
+const ColorPalette_1 = require("./ColorPalette");
 const GeUtils_1 = require("./GeUtils");
 const Material_1 = require("./Material");
 const RotateUV_1 = require("./RotateUV");
@@ -34,7 +35,7 @@ class Arc2d {
 exports.Arc2d = Arc2d;
 //创建轮廓 通过点表和凸度    
 function createPath(pts, buls, shapeOut) {
-    let shape = shapeOut || new THREE.Shape();
+    let shape = shapeOut || new three_1.Shape();
     if (pts.length === 0)
         return shape;
     let firstPt = pts[0];
@@ -80,10 +81,10 @@ function createBoard(boardData) {
         boardMat.setPosition(pBase);
         matInv.getInverse(boardMat, true);
     }
-    if (boardPts)
+    if (boardPts && boardPts.length !== 0)
         for (let i = 0; i < boardPts.length; i++) {
             let pt = getVec(boardPts[i]);
-            if (pt.z !== undefined)
+            if (boardPts[i].z !== undefined)
                 pt.applyMatrix4(matInv);
             pts.push(new THREE.Vector2(pt.x, pt.y));
             buls.push(boardBuls[i]);
@@ -109,13 +110,35 @@ function createBoard(boardData) {
     //外边.
     let edges = [createEdge(ext)];
     //差集
-    if (boardData["SubBoardLocal"].length > 0) {
-        let subBoardList = boardData["SubBoardLocal"].map(d => createBoard(d));
+    if (checkObjectArray(boardData, "SubBoardLocal")
+        || checkObjectArray(boardData, "Drillings")) {
         let thisCsg = new ThreeCSG_1.ThreeBSP(ext);
-        for (let br of subBoardList) {
-            edges.push(...br.edges);
-            let subCsg = new ThreeCSG_1.ThreeBSP(br.mesh);
-            thisCsg = thisCsg.subtract(subCsg);
+        if (boardData["SubBoardLocal"]) {
+            let subBoardList = boardData["SubBoardLocal"].map(d => createBoard(d));
+            for (let br of subBoardList) {
+                edges.push(...br.edges);
+                let subCsg = new ThreeCSG_1.ThreeBSP(br.mesh);
+                thisCsg = thisCsg.subtract(subCsg);
+            }
+        }
+        if (boardData["Drillings"]) {
+            let dris = boardData["Drillings"];
+            for (let dri of dris) {
+                let geo = new three_1.CylinderGeometry(dri.r, dri.r, dri.h, 8);
+                geo.rotateX(Math.PI * 0.5);
+                if (dri.f === 0) //0正
+                    geo.translate(dri.x, dri.y, -dri.h * 0.5);
+                else //1反
+                    geo.translate(dri.x, dri.y, dri.h * 0.5 - boardData["H"]);
+                geo.applyMatrix(boardMat);
+                let mesh = new three_1.Mesh(geo, ColorPalette_1.ColorMaterial.GetLineMaterial(1));
+                edges.push(mesh);
+                // let edge = createEdge(geo);
+                // edge.material = new LineBasicMaterial({ color: new Color(1, 0, 0) });
+                // edges.push(edge);
+                // let subCsg = new ThreeBSP(geo);
+                // thisCsg = thisCsg.subtract(subCsg);
+            }
         }
         ext = thisCsg.toGeometry();
     }
@@ -125,6 +148,9 @@ function createBoard(boardData) {
     return { mesh, edges };
 }
 exports.createBoard = createBoard;
+function checkObjectArray(obj, key) {
+    return obj[key] && obj[key].length > 0;
+}
 function createTemplateBoard(brDataList) {
     let meshs = [];
     let edgesa = [];

package.json

@@ -1,11 +1,17 @@
 {
   "name": "cadview",
-  "version": "1.0.2",
+  "version": "1.1.3",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
+  "private": true,
   "scripts": {
-    "build": "tsc"
+    "build": "tsc",
+    "dev": "tsc -w"
+  },
+  "repository": {
+    "type": "git",
+    "url": "http://git.cf/cx/CADViewComponent.git"
   },
   "author": "cx",
   "license": "ISC",

src/CameraControls.ts

@@ -141,6 +141,9 @@ export class CameraControls
         this.m_State = CameraControlState.Rotate;
         this.m_Viewer.UpdateLockTarget();
     }
+
+    //最后一次按中键的时间
+    lastMiddleClickTime = 0;
     //鼠标    
     onMouseDown = (event: MouseEvent) =>
     {
@@ -161,6 +164,14 @@ export class CameraControls
                 }
             case MouseKey.Middle:
                 {
+                    let curTime = Date.now();
+                    let t = curTime - this.lastMiddleClickTime;
+                    this.lastMiddleClickTime = curTime;
+                    if (t < 350)
+                    {
+                        this.m_Viewer.ZoomAll();
+                        return;
+                    }
                     if (this.m_KeyDown.get(KeyBoard.Control))
                     {
                         this.beginRotate();

src/CameraUpdate.ts

@@ -30,10 +30,13 @@ export class CameraUpdate
     //观察的轨道.
     private m_Orbit: Orbit = new Orbit();
 
+    m_MinViewHeight = 10;
+    m_MaxViewHeight = 3e4;
+
     constructor()
     {
         this.m_CameraArray.set(THREE.OrthographicCamera, new THREE.OrthographicCamera(-2, 2, 2, -2,
-            -100000, 100000));
+            -1e6, 1e6));
 
         this.m_CameraArray.set(THREE.PerspectiveCamera, new THREE.PerspectiveCamera(50, 1, 0.01, 10000));
 
@@ -60,7 +63,7 @@ export class CameraUpdate
     }
     set ViewHeight(height)
     {
-        this.m_ViewHeight = THREE.Math.clamp(height, 1e-8, 1e8);
+        this.m_ViewHeight = THREE.Math.clamp(height, this.m_MinViewHeight, this.m_MaxViewHeight);
     }
 
     SetSize(width: number, height: number)
@@ -114,7 +117,7 @@ export class CameraUpdate
         if (this.Camera instanceof THREE.OrthographicCamera)
         {
             this.ViewHeight *= scale;
-            if (scaleCenter)
+            if (scaleCenter && this.m_ViewHeight < this.m_MaxViewHeight)
             {
                 this.m_Target.sub(scaleCenter);
                 this.m_Target.multiplyScalar(scale);

src/Material.ts

@@ -8,6 +8,13 @@ export let boardMaterial = new MeshBasicMaterial({
     polygonOffsetUnits: 1
 });
 
+export let selectMaterial = new MeshBasicMaterial({
+    color: new Color(0.1, 0.5, 0.5),
+    polygonOffset: true,
+    polygonOffsetFactor: 1, // positive value pushes polygon further away
+    polygonOffsetUnits: 1
+});
+
 //线框的材质
 export let edgeMaterial = new LineBasicMaterial({ linewidth: 2, color: new Color(0, 0, 0) });
 

src/RotateUV.ts

@@ -1,14 +1,14 @@
 import { Matrix2 } from './Matrix2';
-import * as THREE from 'three';
+import { Geometry, Vector2 } from 'three';
 
 
-export function RotateUVs(geo: THREE.Geometry)
+export function RotateUVs(geo: Geometry)
 {
     let roMat = new Matrix2();
     roMat.set(0, -1,
         1, 0);
 
-    let addV = new THREE.Vector2(1, 0);
+    let addV = new Vector2(1, 0);
 
     for (let uvs of geo.faceVertexUvs)
     {

src/Text.ts

@@ -2,10 +2,13 @@ import { Font, FontLoader, Mesh, ShapeGeometry, Vector3 } from "three";
 import { ColorMaterial } from "./ColorPalette";
 import { MoveMatrix } from "./GeUtils";
 
-class FontLoaderUtil {
+class FontLoaderUtil
+{
   private static defFont: Font;
-  static Load(): Font {
-    if (!this.defFont) {
+  static Load(): Font
+  {
+    if (!this.defFont)
+    {
       const f = require("../resources/fonts/helvetiker_regular.typeface.json");
       let loader = new FontLoader();
       this.defFont = loader.parse(f);
@@ -14,7 +17,8 @@ class FontLoaderUtil {
   }
 }
 
-export class DbText extends Mesh {
+export class DbText extends Mesh
+{
   /**
    *
    * 构造一个文本对象,8位点(中心点下面)在0点
@@ -22,7 +26,8 @@ export class DbText extends Mesh {
    * @param {number} height 文本高度
    * @memberof DbText
    */
-  constructor(str: string, height: number = 5) {
+  constructor(str: string, height: number = 5)
+  {
     let font = FontLoaderUtil.Load();
 
     let shapes: THREE.Shape[] = font.generateShapes(str, height, 0.1);

src/Viewer.ts

@@ -1,10 +1,11 @@
 
 import * as THREE from "three";
+import { Mesh } from "three";
+import { CameraControls, PointPick, boardMaterial, selectMaterial } from ".";
 import { CameraUpdate } from "./CameraUpdate";
+import { ColorMaterial } from "./ColorPalette";
 import { GetBox, GetBoxArr, cZeroVec } from "./GeUtils";
 import { PlaneExt } from "./PlaneExt";
-import { PointPick, boardMaterial, CameraControls } from ".";
-import { MeshBasicMaterial, Color, Mesh } from "three";
 
 export class Viewer
 {
@@ -32,21 +33,18 @@ export class Viewer
             this.OnSize();
         });
 
-        //选中
-        let selectMaterial = new MeshBasicMaterial({ color: new Color(0.1, 0.5, 0.5) });
-
         let oldMesh: Mesh;
         this.m_Render.domElement.addEventListener("mousemove", (e: MouseEvent) =>
         {
             let mesh = PointPick(this, e.offsetX, e.offsetY);
             if (oldMesh)
                 oldMesh.material = boardMaterial;
-            if (mesh)
+            if (mesh && mesh.material !== ColorMaterial.GetLineMaterial(1))
             {
                 oldMesh = mesh;
                 mesh.material = selectMaterial;
-                this.m_bNeedUpdate = true;
             }
+            this.m_bNeedUpdate = true;
         })
     }
 

src/createBoard.ts

@@ -1,5 +1,6 @@
 import * as THREE from 'three';
-import { Geometry, LineSegments, Vector2 } from 'three';
+import { CylinderGeometry, Geometry, LineSegments, Mesh, Shape, Vector2 } from 'three';
+import { ColorMaterial } from './ColorPalette';
 import { polar } from './GeUtils';
 import { boardMaterial, edgeMaterial } from './Material';
 import { RotateUVs } from './RotateUV';
@@ -44,9 +45,9 @@ export class Arc2d
 }
 
 //创建轮廓 通过点表和凸度    
-export function createPath(pts: THREE.Vector2[], buls: number[], shapeOut?: THREE.Shape): THREE.Shape
+export function createPath(pts: Vector2[], buls: number[], shapeOut?: Shape): Shape
 {
-    let shape = shapeOut || new THREE.Shape();
+    let shape = shapeOut || new Shape();
     if (pts.length === 0) return shape;
     let firstPt = pts[0];
 
@@ -90,7 +91,6 @@ export function createBoard(boardData: object)
     let matInv: THREE.Matrix4 = new THREE.Matrix4();
     //InitBoardMat
     {
-
         let xD = getVec(boardData["XVec"]);
         let yD = getVec(boardData["YVec"]);
         let ZD = getVec(boardData["ZVec"]);
@@ -101,11 +101,11 @@ export function createBoard(boardData: object)
         matInv.getInverse(boardMat, true);
     }
 
-    if (boardPts)
+    if (boardPts && boardPts.length !== 0)
         for (let i = 0; i < boardPts.length; i++)
         {
             let pt = getVec(boardPts[i]);
-            if (pt.z !== undefined)
+            if (boardPts[i].z !== undefined)
                 pt.applyMatrix4(matInv);
             pts.push(new THREE.Vector2(pt.x, pt.y));
             buls.push(boardBuls[i]);
@@ -138,18 +138,48 @@ export function createBoard(boardData: object)
     ext.applyMatrix(boardMat);
 
     //外边.
-    let edges = [createEdge(ext)];
+    let edges: (LineSegments | Mesh)[] = [createEdge(ext)];
+
     //差集
-    if (boardData["SubBoardLocal"].length > 0)
+    if (checkObjectArray(boardData, "SubBoardLocal")
+        || checkObjectArray(boardData, "Drillings"))
     {
-        let subBoardList = boardData["SubBoardLocal"].map(d => createBoard(d));
         let thisCsg = new ThreeBSP(ext);
 
-        for (let br of subBoardList)
+        if (boardData["SubBoardLocal"])
         {
-            edges.push(...br.edges);
-            let subCsg = new ThreeBSP(br.mesh);
-            thisCsg = thisCsg.subtract(subCsg);
+            let subBoardList = boardData["SubBoardLocal"].map(d => createBoard(d));
+            for (let br of subBoardList)
+            {
+                edges.push(...br.edges);
+                let subCsg = new ThreeBSP(br.mesh);
+                thisCsg = thisCsg.subtract(subCsg);
+            }
+        }
+        if (boardData["Drillings"])
+        {
+            let dris = boardData["Drillings"];
+            for (let dri of dris)
+            {
+                let geo = new CylinderGeometry(dri.r, dri.r, dri.h, 8);
+                geo.rotateX(Math.PI * 0.5);
+
+                if (dri.f === 0) //0正
+                    geo.translate(dri.x, dri.y, -dri.h * 0.5);
+                else             //1反
+                    geo.translate(dri.x, dri.y, dri.h * 0.5 - boardData["H"]);
+
+                geo.applyMatrix(boardMat);
+
+                let mesh = new Mesh(geo, ColorMaterial.GetLineMaterial(1));
+                edges.push(mesh);
+                // let edge = createEdge(geo);
+                // edge.material = new LineBasicMaterial({ color: new Color(1, 0, 0) });
+                // edges.push(edge);
+
+                // let subCsg = new ThreeBSP(geo);
+                // thisCsg = thisCsg.subtract(subCsg);
+            }
         }
         ext = thisCsg.toGeometry();
     }
@@ -161,6 +191,11 @@ export function createBoard(boardData: object)
     return { mesh, edges };
 }
 
+function checkObjectArray(obj: any, key: string)
+{
+    return obj[key] && obj[key].length > 0;
+}
+
 export function createTemplateBoard(brDataList: any[])
 {
     let meshs = [];