修复选择无法取消

.gitignore

@@ -1,3 +1,2 @@
 /node_modules
-/package-lock.json
-.history
+/dist

config/webpack.common.ts

@@ -2,30 +2,26 @@ import * as HardSourceWebpackPlugin from 'hard-source-webpack-plugin';
 import * as webpack from 'webpack';
 import ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
 
-const TS_LOADER = [
-    { loader: 'cache-loader', options: { cacheDirectory: "node_modules/.cache_loader" } },
-    {
-        loader: 'ts-loader',
-        options: {
-            transpileOnly: true,
-            experimentalWatchApi: true,
-        },
-    }
-];
-
 const config: webpack.Configuration = {
     devtool: "source-map",
     //项目需要解析的文件拓展名称
     resolve: {
         extensions: [".ts", ".tsx", ".js", "json"]
     },
+    externals: {
+        'three': "THREE"
+    },
     //模块加载器设置
     module: {
         rules: [
             {
                 test: /\.tsx?$/,
                 exclude: /node_modules/,
-                use: TS_LOADER,
+                loader: 'ts-loader',
+                options: {
+                    transpileOnly: true,
+                    experimentalWatchApi: true,
+                },
             },
             { test: /\.css$/, loader: ['style-loader', 'css-loader'] },
             { test: /\.[(jpg)|(png)|(obj)|(json)]$/, loader: "url-loader" },

config/webpack.umd.ts

@@ -8,9 +8,6 @@ const config: webpack.Configuration = merge(
     {
         mode: "production",
         entry: "./src/index.ts",
-        externals: {
-            'three': "THREE"
-        },
         //输出设置
         output: {
             filename: "cad.js",

config/webpack.view.ts

@@ -9,7 +9,7 @@ const config: webpack.Configuration = merge(
         mode: "development",
         entry: "./src/ViewSrc/index.ts",
         output: { pathinfo: false },
-        devtool: "eval-source-map",
+        devtool: "cheap-module-eval-source-map",
         devServer: {
             contentBase: "./dist/",
             port: 7776,
@@ -26,4 +26,6 @@ const config: webpack.Configuration = merge(
     }
 );
 
+config.externals = {};
+
 export default config;

package.json

@@ -1,15 +1,14 @@
 {
   "name": "cadview",
-  "version": "1.1.9",
+  "version": "1.2.0",
   "description": "",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "src/index.ts",
   "private": true,
   "scripts": {
-    "t": "tsc --noEmit -w",
     "build": "tsc",
     "umd": "webpack --config ./config/webpack.umd.ts",
-    "dev": "webpack-dev-server --config ./config/webpack.view.ts"
+    "dev": "webpack-dev-server --config ./config/webpack.view.ts",
+    "type": "ts-node ./utils/copy_type.ts"
   },
   "repository": {
     "type": "git",
@@ -18,30 +17,29 @@
   "author": "cx",
   "license": "ISC",
   "devDependencies": {
-    "@types/hard-source-webpack-plugin": "^1.0.1",
-    "@types/node": "^13.13.4",
-    "@types/three": "^0.103.2",
+    "@types/hard-source-webpack-plugin": "^0.9.0",
+    "@types/node": "^10.11.7",
     "@types/uglifyjs-webpack-plugin": "^1.1.0",
-    "@types/webpack": "^4.41.12",
-    "@types/webpack-dev-server": "^3.10.1",
-    "@types/webpack-env": "^1.15.2",
-    "@types/webpack-merge": "^4.1.5",
+    "@types/webpack": "^4.4.16",
+    "@types/webpack-dev-server": "^3.1.1",
+    "@types/webpack-env": "^1.13.6",
+    "@types/webpack-merge": "^4.1.3",
     "awesome-typescript-loader": "^5.2.1",
-    "cache-loader": "^4.1.0",
-    "fork-ts-checker-webpack-plugin": "^4.1.3",
-    "hard-source-webpack-plugin": "^0.13.1",
-    "html-webpack-plugin": "^4.2.1",
-    "ts-loader": "^7.0.2",
-    "ts-node": "^8.9.1",
-    "typescript": "^3.8.3",
-    "uglifyjs-webpack-plugin": "^2.2.0",
-    "webpack": "^4.43.0",
-    "webpack-cli": "^3.3.11",
-    "webpack-dev-server": "^3.10.3",
-    "webpack-merge": "^4.2.2"
+    "fork-ts-checker-webpack-plugin": "^0.4.8",
+    "hard-source-webpack-plugin": "^0.12.0",
+    "html-webpack-plugin": "^3.2.0",
+    "ts-loader": "^5.2.1",
+    "ts-node": "^7.0.1",
+    "typescript": "^3.7.5",
+    "uglifyjs-webpack-plugin": "^2.0.1",
+    "webpack": "^4.20.2",
+    "webpack-cli": "^3.1.2",
+    "webpack-dev-server": "^3.1.9",
+    "webpack-merge": "^4.1.4"
   },
   "dependencies": {
-    "three": "^0.115.0",
-    "wolfy87-eventemitter": "^5.2.9"
+    "@types/three": "^0.92.25",
+    "three": "^0.95.0",
+    "wolfy87-eventemitter": "^5.2.5"
   }
 }

src/CameraControls.ts

@@ -56,6 +56,7 @@ export class CameraControls
     }
     /**
      * 窗体失去焦点时.
+     * 
      * @memberof CameraControls
      */
     onBlur = () =>
@@ -224,6 +225,7 @@ export class CameraControls
      */
     onMouseWheel = (event: WheelEvent) =>
     {
+        event.preventDefault();
         event.stopPropagation();
 
         let pt = new THREE.Vector3(event.offsetX, event.offsetY, 0);

src/CameraUpdate.ts

@@ -1,4 +1,5 @@
-import { Box3, Camera, MathUtils, OrthographicCamera, PerspectiveCamera, Vector3 } from 'three';
+import * as THREE from 'three';
+import { Vector3 } from 'three';
 import { Orbit } from './Orbit';
 
 /**
@@ -13,8 +14,8 @@ import { Orbit } from './Orbit';
  */
 export class CameraUpdate
 {
-    private m_CurCamera: Camera;
-    private m_CameraArray: Map<any, Camera> = new Map<any, Camera>();
+    private m_CurCamera: THREE.Camera;
+    private m_CameraArray: Map<any, THREE.Camera> = new Map<any, THREE.Camera>();
 
     //视口的画布大小
     private m_Width: number;
@@ -23,9 +24,9 @@ export class CameraUpdate
     private m_ViewHeight: number = 10;
 
     //观察的位置
-    private m_Target: Vector3 = new Vector3();
+    private m_Target: THREE.Vector3 = new THREE.Vector3();
     //观察向量
-    private m_Direction: Vector3 = new Vector3(0, 0, -1);
+    private m_Direction: THREE.Vector3 = new THREE.Vector3(0, 0, -1);
     //观察的轨道.
     private m_Orbit: Orbit = new Orbit();
 
@@ -34,12 +35,12 @@ export class CameraUpdate
 
     constructor()
     {
-        this.m_CameraArray.set(OrthographicCamera, new OrthographicCamera(-2, 2, 2, -2,
+        this.m_CameraArray.set(THREE.OrthographicCamera, new THREE.OrthographicCamera(-2, 2, 2, -2,
             -1e6, 1e6));
 
-        this.m_CameraArray.set(PerspectiveCamera, new PerspectiveCamera(50, 1, 0.01, 10000));
+        this.m_CameraArray.set(THREE.PerspectiveCamera, new THREE.PerspectiveCamera(50, 1, 0.01, 10000));
 
-        this.m_CurCamera = this.m_CameraArray.get(OrthographicCamera);
+        this.m_CurCamera = this.m_CameraArray.get(THREE.OrthographicCamera);
 
         this.m_Orbit.UpdateRoValue(this.m_Direction);
 
@@ -52,7 +53,7 @@ export class CameraUpdate
         return this.m_Width / this.m_Height;
     }
 
-    get Camera(): Camera
+    get Camera(): THREE.Camera
     {
         return this.m_CurCamera;
     }
@@ -62,7 +63,7 @@ export class CameraUpdate
     }
     set ViewHeight(height)
     {
-        this.m_ViewHeight = MathUtils.clamp(height, this.m_MinViewHeight, this.m_MaxViewHeight);
+        this.m_ViewHeight = THREE.Math.clamp(height, this.m_MinViewHeight, this.m_MaxViewHeight);
     }
 
     SetSize(width: number, height: number)
@@ -74,10 +75,10 @@ export class CameraUpdate
     /**
      * 平移相机.
      * 
-     * @param {Vector3} mouseMove
+     * @param {THREE.Vector3} mouseMove
      * @memberof CameraControl
      */
-    Pan(mouseMove: Vector3)
+    Pan(mouseMove: THREE.Vector3)
     {
         mouseMove.y *= -1;
         mouseMove.multiplyScalar(-this.m_ViewHeight / this.m_Height);
@@ -85,7 +86,7 @@ export class CameraUpdate
         this.m_Target.add(mouseMove);
         this.Update();
     }
-    Rotate(mouseMove: Vector3, target: Vector3)
+    Rotate(mouseMove: THREE.Vector3, target: THREE.Vector3)
     {
         this.m_Orbit.RoX -= mouseMove.y * 0.003;
         this.m_Orbit.RoZ -= mouseMove.x * 0.003;
@@ -111,9 +112,9 @@ export class CameraUpdate
 
         this.Update();
     }
-    Zoom(scale: number, scaleCenter?: Vector3)
+    Zoom(scale: number, scaleCenter?: THREE.Vector3)
     {
-        if (this.Camera instanceof OrthographicCamera)
+        if (this.Camera instanceof THREE.OrthographicCamera)
         {
             this.ViewHeight *= scale;
             if (scaleCenter && this.m_ViewHeight < this.m_MaxViewHeight)
@@ -123,7 +124,7 @@ export class CameraUpdate
                 this.m_Target.add(scaleCenter);
             }
         }
-        else if (this.Camera instanceof PerspectiveCamera)
+        else if (this.Camera instanceof THREE.PerspectiveCamera)
         {
             let add = scale > 1 ? 1 : -1;
             add *= this.Camera.position.distanceTo(this.m_Target) / 10;
@@ -131,7 +132,7 @@ export class CameraUpdate
         }
         this.Update();
     }
-    ZoomExtensBox3(box3: Box3)
+    ZoomExtensBox3(box3: THREE.Box3)
     {
         if (!box3 || box3.isEmpty()) return;
         this.Camera.updateMatrixWorld(false);
@@ -158,7 +159,7 @@ export class CameraUpdate
         }
         this.Update();
     }
-    LookAt(dir: Vector3)
+    LookAt(dir: THREE.Vector3)
     {
         this.m_Orbit.UpdateRoValue(dir);
         this.m_Direction.copy(dir);
@@ -180,7 +181,7 @@ export class CameraUpdate
     {
         this.Camera.position.copy(this.m_Target);
 
-        if (this.Camera instanceof OrthographicCamera)
+        if (this.Camera instanceof THREE.OrthographicCamera)
         {
             this.Camera.left = this.Aspect * this.m_ViewHeight / -2;
             this.Camera.right = this.Aspect * this.m_ViewHeight / 2;
@@ -189,10 +190,10 @@ export class CameraUpdate
 
             this.Camera.position.sub(this.m_Direction);
         }
-        else if (this.Camera instanceof PerspectiveCamera)
+        else if (this.Camera instanceof THREE.PerspectiveCamera)
         {
             this.Camera.aspect = this.Aspect;
-            let distens = (this.m_ViewHeight / 2) / (Math.tan(MathUtils.degToRad(this.Camera.fov) / 2));
+            let distens = (this.m_ViewHeight / 2) / (Math.tan(THREE.Math.degToRad(this.Camera.fov) / 2));
 
             this.Camera.position.sub(this.m_Direction.clone().multiplyScalar(distens));
         }
@@ -208,13 +209,13 @@ export class CameraUpdate
 
     SwitchCamera()
     {
-        if (this.Camera instanceof OrthographicCamera)
+        if (this.Camera instanceof THREE.OrthographicCamera)
         {
-            this.m_CurCamera = this.m_CameraArray.get(PerspectiveCamera);
+            this.m_CurCamera = this.m_CameraArray.get(THREE.PerspectiveCamera);
         }
         else
         {
-            this.m_CurCamera = this.m_CameraArray.get(OrthographicCamera);
+            this.m_CurCamera = this.m_CameraArray.get(THREE.OrthographicCamera);
         }
         this.UpdateUp();
         this.Update();

src/Dimension.ts

@@ -5,6 +5,7 @@ import { MoveMatrix } from "./GeUtils";
 
 /**
  * 标注实体
+ * 
  * @export
  * @class Dimension
  * @extends {Group}
@@ -41,12 +42,12 @@ export class Dimension extends Group
         if (mirror)
         {
             let roMat = new Matrix4().makeRotationZ(Math.PI);
-            text.applyMatrix4(roMat);
-            text.applyMatrix4(MoveMatrix(new Vector3(length * 0.5, footLength - textHeight * 0.1)));
+            text.applyMatrix(roMat);
+            text.applyMatrix(MoveMatrix(new Vector3(length * 0.5, footLength - textHeight * 0.1)));
         }
         else
         {
-            text.applyMatrix4(MoveMatrix(new Vector3(length * 0.5, footLength * 1.1)));
+            text.applyMatrix(MoveMatrix(new Vector3(length * 0.5, footLength * 1.1)));
         }
 
 

src/DrawDimension.ts

@@ -1,4 +1,4 @@
-import { Box3, Matrix4, Mesh, Vector3 } from "three";
+import { Box3, Vector3, Matrix4, Mesh } from "three";
 import { Dimension, GetBoxArr } from ".";
 
 
@@ -24,7 +24,7 @@ export function DrawDimension(brList: Mesh[]): Dimension[]
 
     let textHeight = 45;
     let dimx = new Dimension(size.x, textHeight, true);
-    dimx.applyMatrix4(mat4);
+    dimx.applyMatrix(mat4);
 
     let dimz = new Dimension(size.z, textHeight);
     mat4.makeBasis(
@@ -33,7 +33,7 @@ export function DrawDimension(brList: Mesh[]): Dimension[]
         new Vector3(0, -1, 0)
     )
     mat4.setPosition(box.max.clone().add(new Vector3(30, -size.y)));
-    dimz.applyMatrix4(mat4);
+    dimz.applyMatrix(mat4);
 
     let dimy = new Dimension(size.y, textHeight, true, true);
     mat4.makeBasis(
@@ -42,7 +42,7 @@ export function DrawDimension(brList: Mesh[]): Dimension[]
         new Vector3(0, 0, 1)
     )
     mat4.setPosition(box.max.clone().add(new Vector3(30, -size.y)));
-    dimy.applyMatrix4(mat4);
+    dimy.applyMatrix(mat4);
 
 
     return [dimx, dimy, dimz];

src/GeUtils.ts

@@ -1,11 +1,12 @@
-import { Geometry, Vector, Vector2, Vector3, Box3, Matrix4, Object3D, Line, Mesh } from 'three';
+import * as THREE from 'three';
+import { Geometry, Vector, Vector2, Vector3, Box3 } from 'three';
 import { Matrix2 } from './Matrix2';
 
 
-export const cZeroVec = new Vector3();
-export const cXAxis = new Vector3(1, 0, 0);
-export const cYAxis = new Vector3(0, 1, 0);
-export const cZAxis = new Vector3(0, 0, 1);
+export const cZeroVec = new THREE.Vector3();
+export const cXAxis = new THREE.Vector3(1, 0, 0);
+export const cYAxis = new THREE.Vector3(0, 1, 0);
+export const cZAxis = new THREE.Vector3(0, 0, 1);
 
 /**
  * 旋转一个点,旋转中心在原点
@@ -25,12 +26,6 @@ export function equaln(v1: number, v2: number, fuzz = 1e-3)
 {
     return Math.abs(v1 - v2) < fuzz;
 }
-
-export function equalv3(v1: Vector3, v2: Vector3, fuzz = 1e-8)
-{
-    return equaln(v1.x, v2.x, fuzz) && equaln(v1.y, v2.y, fuzz) && equaln(v1.z, v2.z, fuzz);
-}
-
 export function equal<T extends Vector>(v1: T, v2: T)
 {
     return v1.distanceToSquared(v2) < 1e-8;
@@ -82,21 +77,21 @@ export function angle(v: Vector3 | Vector2)
 /**
  * 求两个向量的夹角,顺时针为负,逆时针为正
  * 
- * @param {Vector3} v1
- * @param {Vector3} v2
- * @param {Vector3} [ref] 参考向量,如果为世界坐标系则为0,0,1
+ * @param {THREE.Vector3} v1 
+ * @param {THREE.Vector3} v2 
+ * @param {THREE.Vector3} [ref] 参考向量,如果为世界坐标系则为0,0,1
  * @returns 
  */
-export function angleTo(v1: Vector3, v2: Vector3, ref: Vector3 = new Vector3(0, 0, 1))
+export function angleTo(v1: THREE.Vector3, v2: THREE.Vector3, ref: THREE.Vector3 = new THREE.Vector3(0, 0, 1))
 {
     if (!ref.equals(new Vector3(0, 0, 1)))
     {
         //任意轴坐标系. 使用相机的构造矩阵.
         ref.multiplyScalar(-1);
         let up = getLoocAtUpVec(ref);
-        let refOcs = new Matrix4();
+        let refOcs = new THREE.Matrix4();
         refOcs.lookAt(cZeroVec, ref, up);
-        let refOcsInv = new Matrix4().getInverse(refOcs);
+        let refOcsInv = new THREE.Matrix4().getInverse(refOcs);
         v1.applyMatrix4(refOcsInv);
         v2.applyMatrix4(refOcsInv);
         v1.z = 0;
@@ -108,7 +103,7 @@ export function angleTo(v1: Vector3, v2: Vector3, ref: Vector3 = new Vector3(0,
     return cv.z === 0 ? v1.angleTo(v2) : v1.angleTo(v2) * cv.z;
 }
 
-export function getLoocAtUpVec(dir: Vector3): Vector3
+export function getLoocAtUpVec(dir: THREE.Vector3): THREE.Vector3
 {
     if (dir.equals(cZeroVec))
     {
@@ -117,37 +112,37 @@ export function getLoocAtUpVec(dir: Vector3): Vector3
     let norm = dir.clone().normalize();
     if (norm.equals(cZAxis))
     {
-        return new Vector3(0, 1, 0);
+        return new THREE.Vector3(0, 1, 0);
     }
     else if (norm.equals(cZAxis.clone().negate()))
     {
-        return new Vector3(0, -1, 0);
+        return new THREE.Vector3(0, -1, 0);
     }
     else
     {
-        let xv: Vector3 = new Vector3();
+        let xv: THREE.Vector3 = new THREE.Vector3();
         xv.crossVectors(cZAxis, norm);
 
-        let up = new Vector3();
+        let up = new THREE.Vector3();
         up.crossVectors(norm, xv);
         return up;
     }
 }
 
-export function createLookAtMat4(dir: Vector3): Matrix4
+export function createLookAtMat4(dir: THREE.Vector3): THREE.Matrix4
 {
     let up = getLoocAtUpVec(dir);
-    let mat = new Matrix4();
+    let mat = new THREE.Matrix4();
     mat.lookAt(cZeroVec, dir, up);
     return mat;
 }
 
-export function isParallelTo(v1: Vector3, v2: Vector3)
+export function isParallelTo(v1: THREE.Vector3, v2: THREE.Vector3)
 {
     return v1.clone().cross(v2).lengthSq() < 1e-9;
 }
 
-export function ptToString(v: Vector3, fractionDigits: number = 3): string
+export function ptToString(v: THREE.Vector3, fractionDigits: number = 3): string
 {
     return v.toArray().map(o =>
     {
@@ -155,16 +150,16 @@ export function ptToString(v: Vector3, fractionDigits: number = 3): string
     }).join(",")
 }
 
-export function midPoint(v1: Vector3, v2: Vector3): Vector3
+export function midPoint(v1: THREE.Vector3, v2: THREE.Vector3): THREE.Vector3
 {
     return v1.clone().add(v2).multiplyScalar(0.5);
 }
-export function midPoint2(v1: Vector2, v2: Vector2): Vector2
+export function midPoint2(v1: THREE.Vector2, v2: THREE.Vector2): THREE.Vector2
 {
     return v1.clone().add(v2).multiplyScalar(0.5);
 }
 
-export function midPtCir(v1: Vector3, v2: Vector3)
+export function midPtCir(v1: THREE.Vector3, v2: THREE.Vector3)
 {
     let baseline = new Vector3(1, 0, 0);
     let outLine = v2.clone().sub(v1);
@@ -179,7 +174,7 @@ export function midPtCir(v1: Vector3, v2: Vector3)
  * @param [updateMatrix] 是否应该更新对象矩阵
  * @returns box 
  */
-export function GetBox(obj: Object3D, updateMatrix?: boolean): Box3
+export function GetBox(obj: THREE.Object3D, updateMatrix?: boolean): THREE.Box3
 {
     let box = new Box3();
     if (updateMatrix) obj.updateMatrixWorld(false);
@@ -204,7 +199,7 @@ export function GetBox(obj: Object3D, updateMatrix?: boolean): Box3
     return box;
 }
 
-export function GetBoxArr(arr: Array<Object3D>): Box3
+export function GetBoxArr(arr: Array<THREE.Object3D>): THREE.Box3
 {
     let box = new Box3();
     for (let o of arr)
@@ -216,9 +211,9 @@ export function GetBoxArr(arr: Array<Object3D>): Box3
     return box;
 }
 
-export function MoveMatrix(v: Vector3): Matrix4
+export function MoveMatrix(v: THREE.Vector3): THREE.Matrix4
 {
-    let mat = new Matrix4();
+    let mat = new THREE.Matrix4();
     mat.makeTranslation(v.x, v.y, v.z);
     return mat;
 }
@@ -280,9 +275,9 @@ export function angleTo2Pi(an: number)
     if (an < 0) an += Math.PI * 2
     return an;
 }
-export function updateGeometry(l: Line | Mesh, geometry: Geometry)
+export function updateGeometry(l: THREE.Line | THREE.Mesh, geometry: Geometry)
 {
-    let geo = l.geometry as Geometry;
+    let geo = l.geometry as THREE.Geometry;
     geo.dispose();
     l.geometry = geometry;
     geometry.verticesNeedUpdate = true;

src/Orbit.ts

@@ -1,4 +1,4 @@
-import { MathUtils, Vector3 } from "three";
+import * as THREE from "three";
 
 /**
  * 轨道控制的数学类,观察向量和角度的互相转换
@@ -20,19 +20,19 @@ export class Orbit
     }
     set RoX(v)
     {
-        this.m_RoX = MathUtils.clamp(v, Math.PI * -0.5, Math.PI * 0.5);
+        this.m_RoX = THREE.Math.clamp(v, Math.PI * -0.5, Math.PI * 0.5);
     }
 
     /**
      * 使用旋转角度 计算观察向量
      * 
-     * @param {Vector3} [dir] 引用传入,如果传入,那么就不构造新的向量
-     * @returns {Vector3} 返回观察向量
+     * @param {THREE.Vector3} [dir] 引用传入,如果传入,那么就不构造新的向量
+     * @returns {THREE.Vector3} 返回观察向量
      * @memberof Orbit
      */
-    UpdateDirection(dir?: Vector3): Vector3
+    UpdateDirection(dir?: THREE.Vector3): THREE.Vector3
     {
-        let rtDir = dir ? dir : new Vector3();
+        let rtDir = dir ? dir : new THREE.Vector3();
 
         rtDir.z = Math.sin(this.m_RoX);
 
@@ -48,10 +48,10 @@ export class Orbit
     /**
      * 使用观察向量,计算旋转角度
      * 
-     * @param {Vector3} dir
+     * @param {THREE.Vector3} dir 
      * @memberof Orbit
      */
-    UpdateRoValue(dir: Vector3)
+    UpdateRoValue(dir: THREE.Vector3)
     {
         dir.normalize();
         this.m_RoX = Math.asin(dir.z);
@@ -66,26 +66,26 @@ export class Orbit
      * 根据观察向量 求头部的向量.
      * 
      * @static
-     * @param {Vector3} dir
-     * @param {Vector3} [up]
-     * @returns {Vector3}
+     * @param {THREE.Vector3} dir 
+     * @param {THREE.Vector3} [up] 
+     * @returns {THREE.Vector3} 
      * @memberof Orbit
      */
-    static ComputUpDirection(dir: Vector3, up?: Vector3): Vector3
+    static ComputUpDirection(dir: THREE.Vector3, up?: THREE.Vector3): THREE.Vector3
     {
-        let upRes = up ? up : new Vector3();
-        if (dir.equals(new Vector3(0, 0, -1)))
+        let upRes = up ? up : new THREE.Vector3();
+        if (dir.equals(new THREE.Vector3(0, 0, -1)))
         {
             upRes.set(0, 1, 0);
         }
-        else if (dir.equals(new Vector3(0, 0, 1)))
+        else if (dir.equals(new THREE.Vector3(0, 0, 1)))
         {
             upRes.set(0, -1, 0);
         }
         else
         {
-            let xv = new Vector3();
-            xv.crossVectors(new Vector3(0, 0, 1), dir);
+            let xv = new THREE.Vector3();
+            xv.crossVectors(new THREE.Vector3(0, 0, 1), dir);
             upRes.crossVectors(dir, xv);
             upRes.normalize();
         }

src/PlaneExt.ts

@@ -1,9 +1,9 @@
 import * as THREE from 'three';
-import { Vector3, Line3 } from "three";
+import { Vector3, Line3, Plane } from "three";
 
-export class PlaneExt extends THREE.Plane
+export class PlaneExt extends Plane
 {
-    constructor(normal?: THREE.Vector3, constant?: number)
+    constructor(normal?: Vector3, constant?: number)
     {
         super(normal, constant);
     }

src/Text.ts

@@ -1,4 +1,4 @@
-import { Font, FontLoader, Mesh, ShapeGeometry, Vector3 } from "three";
+import { Font, FontLoader, Mesh, ShapeGeometry, Vector3, Shape } from "three";
 import { ColorMaterial } from "./ColorPalette";
 import { MoveMatrix } from "./GeUtils";
 
@@ -30,7 +30,7 @@ export class DbText extends Mesh
   {
     let font = FontLoaderUtil.Load();
 
-    let shapes: THREE.Shape[] = font.generateShapes(str, height);
+    let shapes: Shape[] = font.generateShapes(str, height, 0.1);
     let geometry = new ShapeGeometry(shapes);
 
     geometry.computeBoundingBox();
@@ -38,6 +38,6 @@ export class DbText extends Mesh
     super(geometry, ColorMaterial.GetBasicMaterial(5));
 
     let center = geometry.boundingBox.getCenter(new Vector3());
-    this.applyMatrix4(MoveMatrix(new Vector3(-center.x, 0, 0)));
+    this.applyMatrix(MoveMatrix(new Vector3(-center.x, 0, 0)));
   }
 }

src/ThreeCSG.ts

@@ -71,8 +71,32 @@ export class ThreeBSP
                 vertex = new Vertex(vertex.x, vertex.y, vertex.z, face.vertexNormals[2], uvs);
                 vertex.applyMatrix4(this.matrix);
                 polygon.vertices.push(vertex);
-            }
-            else
+            } else if (typeof THREE.Face4)
+            {
+                vertex = geometry.vertices[face.a];
+                uvs = faceVertexUvs ? new THREE.Vector2(faceVertexUvs[0].x, faceVertexUvs[0].y) : null;
+                vertex = new Vertex(vertex.x, vertex.y, vertex.z, face.vertexNormals[0], uvs);
+                vertex.applyMatrix4(this.matrix);
+                polygon.vertices.push(vertex);
+
+                vertex = geometry.vertices[face.b];
+                uvs = faceVertexUvs ? new THREE.Vector2(faceVertexUvs[1].x, faceVertexUvs[1].y) : null;
+                vertex = new Vertex(vertex.x, vertex.y, vertex.z, face.vertexNormals[1], uvs);
+                vertex.applyMatrix4(this.matrix);
+                polygon.vertices.push(vertex);
+
+                vertex = geometry.vertices[face.c];
+                uvs = faceVertexUvs ? new THREE.Vector2(faceVertexUvs[2].x, faceVertexUvs[2].y) : null;
+                vertex = new Vertex(vertex.x, vertex.y, vertex.z, face.vertexNormals[2], uvs);
+                vertex.applyMatrix4(this.matrix);
+                polygon.vertices.push(vertex);
+
+                vertex = geometry.vertices[face.d];
+                uvs = faceVertexUvs ? new THREE.Vector2(faceVertexUvs[3].x, faceVertexUvs[3].y) : null;
+                vertex = new Vertex(vertex.x, vertex.y, vertex.z, face.vertexNormals[3], uvs);
+                vertex.applyMatrix4(this.matrix);
+                polygon.vertices.push(vertex);
+            } else
             {
                 throw 'Invalid face type at index ' + i;
             }

src/Utils.ts

@@ -1,5 +1,5 @@
-import { Object3D } from "three";
-import { createTemplateBoard, DrawDimension, Viewer } from ".";
+import { Object3D, Mesh } from "three";
+import { createTemplateBoard, DrawDimension, Viewer, selectMaterial } from ".";
 
 function dispose(m: Object3D)
 {
@@ -21,7 +21,8 @@ export function LoadBoard(view: Viewer, data: any[], clear: boolean = true)
 
     if (data.length === 0) return;
     //加板
-    let { meshs, edgesa } = createTemplateBoard(data);
+    let { meshs, edgesa, relations } = createTemplateBoard(data);
+
     //加标注
     let dims = DrawDimension(meshs);
 
@@ -32,4 +33,6 @@ export function LoadBoard(view: Viewer, data: any[], clear: boolean = true)
     view.ViewToSwiso();
     view.ZoomAll();
     view.Zoom(1.1);
+
+    return relations;
 }

src/ViewSrc/data.json

@@ -1,444 +0,0 @@
-[
-    {
-        "L": 4408.678960586129,
-        "W": 4408.678960586129,
-        "H": 18,
-        "CabName": "主卧",
-        "BoardName": "",
-        "BasePoint": {
-            "x": -82.91743119266054,
-            "y": 73.39449541284404,
-            "z": 0
-        },
-        "XVec": {
-            "x": 0,
-            "y": 1,
-            "z": 0
-        },
-        "YVec": {
-            "x": 0,
-            "y": 0,
-            "z": 1
-        },
-        "ZVec": {
-            "x": 1,
-            "y": 0,
-            "z": 0
-        },
-        "Grain": 0,
-        "Pts": [
-            {
-                "x": 4408.678960586129,
-                "y": 2204.3394802930643
-            },
-            {
-                "x": 0,
-                "y": 2204.3394802930648
-            },
-            {
-                "x": 4408.678960586129,
-                "y": 2204.3394802930643
-            }
-        ],
-        "Buls": [
-            -0.9999999999999999,
-            -0.9999999999999999,
-            0
-        ],
-        "SubBoardLocal": [
-            {
-                "L": 633.2307692307686,
-                "W": 633.2307692307686,
-                "H": 5,
-                "CabName": "",
-                "BoardName": "",
-                "BasePoint": {
-                    "x": -95.91743119266054,
-                    "y": 2910.9647449366785,
-                    "z": 1405.2625572161414
-                },
-                "XVec": {
-                    "x": 0,
-                    "y": 1,
-                    "z": 0
-                },
-                "YVec": {
-                    "x": 0,
-                    "y": 0,
-                    "z": 1
-                },
-                "ZVec": {
-                    "x": 1,
-                    "y": 0,
-                    "z": 0
-                },
-                "Grain": 0,
-                "Pts": [
-                    {
-                        "x": 633.2307692307686,
-                        "y": 316.6153846153843
-                    },
-                    {
-                        "x": 0,
-                        "y": 316.61538461538436
-                    },
-                    {
-                        "x": 633.2307692307686,
-                        "y": 316.6153846153843
-                    }
-                ],
-                "Buls": [
-                    -0.9999999999999999,
-                    -0.9999999999999999,
-                    0
-                ],
-                "SubBoardLocal": [],
-                "SubBoardAssoc": null,
-                "Drillings": null
-            },
-            {
-                "L": 557.8461538461524,
-                "W": 557.8461538461524,
-                "H": 5,
-                "CabName": "",
-                "BoardName": "",
-                "BasePoint": {
-                    "x": -82.91743119266054,
-                    "y": 3016.50320647514,
-                    "z": 2257.1087110622957
-                },
-                "XVec": {
-                    "x": 0,
-                    "y": 1,
-                    "z": 0
-                },
-                "YVec": {
-                    "x": 0,
-                    "y": 0,
-                    "z": 1
-                },
-                "ZVec": {
-                    "x": 1,
-                    "y": 0,
-                    "z": 0
-                },
-                "Grain": 0,
-                "Pts": [
-                    {
-                        "x": 557.8461538461524,
-                        "y": 278.9230769230762
-                    },
-                    {
-                        "x": 0,
-                        "y": 278.9230769230763
-                    },
-                    {
-                        "x": 557.8461538461524,
-                        "y": 278.9230769230762
-                    }
-                ],
-                "Buls": [
-                    -0.9999999999999999,
-                    -0.9999999999999999,
-                    0
-                ],
-                "SubBoardLocal": [],
-                "SubBoardAssoc": null,
-                "Drillings": null
-            },
-            {
-                "L": 444.76923076923117,
-                "W": 686,
-                "H": 5,
-                "CabName": "",
-                "BoardName": "",
-                "BasePoint": {
-                    "x": -95.91743119266054,
-                    "y": 1689.7339757059085,
-                    "z": 1556.0317879853721
-                },
-                "XVec": {
-                    "x": 0,
-                    "y": 1,
-                    "z": 0
-                },
-                "YVec": {
-                    "x": 0,
-                    "y": 0,
-                    "z": 1
-                },
-                "ZVec": {
-                    "x": 1,
-                    "y": 0,
-                    "z": 0
-                },
-                "Grain": 0,
-                "Pts": [
-                    {
-                        "x": 0,
-                        "y": 0
-                    },
-                    {
-                        "x": 686,
-                        "y": 0
-                    },
-                    {
-                        "x": 686,
-                        "y": 444.76923076923117
-                    },
-                    {
-                        "x": 0,
-                        "y": 444.76923076923117
-                    },
-                    {
-                        "x": 0,
-                        "y": 0
-                    }
-                ],
-                "Buls": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0
-                ],
-                "SubBoardLocal": [],
-                "SubBoardAssoc": null,
-                "Drillings": null
-            },
-            {
-                "L": 625.6923076923076,
-                "W": 1349.3846153846157,
-                "H": 5,
-                "CabName": "",
-                "BoardName": "",
-                "BasePoint": {
-                    "x": -82.91743119266054,
-                    "y": 1177.1185910905238,
-                    "z": 2626.493326446911
-                },
-                "XVec": {
-                    "x": 0,
-                    "y": 1,
-                    "z": 0
-                },
-                "YVec": {
-                    "x": 0,
-                    "y": 0,
-                    "z": 1
-                },
-                "ZVec": {
-                    "x": 1,
-                    "y": 0,
-                    "z": 0
-                },
-                "Grain": 0,
-                "Pts": [
-                    {
-                        "x": 0,
-                        "y": 0
-                    },
-                    {
-                        "x": 1349.3846153846157,
-                        "y": 0
-                    },
-                    {
-                        "x": 1349.3846153846157,
-                        "y": 625.6923076923076
-                    },
-                    {
-                        "x": 0,
-                        "y": 625.6923076923076
-                    },
-                    {
-                        "x": 0,
-                        "y": 0
-                    }
-                ],
-                "Buls": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0
-                ],
-                "SubBoardLocal": [],
-                "SubBoardAssoc": null,
-                "Drillings": null
-            }
-        ],
-        "SubBoardAssoc": null,
-        "Drillings": null
-    },
-    {
-        "L": 2000,
-        "W": 600,
-        "H": 18,
-        "CabName": "主卧",
-        "BoardName": "",
-        "BasePoint": {
-            "x": 1099.0825688073396,
-            "y": 73.39449541284404,
-            "z": 0
-        },
-        "XVec": {
-            "x": 0,
-            "y": 1,
-            "z": 0
-        },
-        "YVec": {
-            "x": 0,
-            "y": 0,
-            "z": 1
-        },
-        "ZVec": {
-            "x": 1,
-            "y": 0,
-            "z": 0
-        },
-        "Grain": 0,
-        "Pts": [
-            {
-                "x": 0,
-                "y": 0
-            },
-            {
-                "x": 600,
-                "y": 0
-            },
-            {
-                "x": 600,
-                "y": 2000
-            },
-            {
-                "x": 0,
-                "y": 2000
-            },
-            {
-                "x": 0,
-                "y": 0
-            }
-        ],
-        "Buls": [
-            0,
-            0,
-            0,
-            0,
-            0
-        ],
-        "SubBoardLocal": [
-            {
-                "L": 144.00000000000023,
-                "W": 170.42201834862385,
-                "H": 5,
-                "CabName": "",
-                "BoardName": "",
-                "BasePoint": {
-                    "x": 1099.0825688073396,
-                    "y": 288.2935779816515,
-                    "z": 1001.247706422018
-                },
-                "XVec": {
-                    "x": 0,
-                    "y": 1,
-                    "z": 0
-                },
-                "YVec": {
-                    "x": 0,
-                    "y": 0,
-                    "z": 1
-                },
-                "ZVec": {
-                    "x": 1,
-                    "y": 0,
-                    "z": 0
-                },
-                "Grain": 0,
-                "Pts": [
-                    {
-                        "x": 0,
-                        "y": 0
-                    },
-                    {
-                        "x": 170.42201834862385,
-                        "y": 0
-                    },
-                    {
-                        "x": 170.42201834862385,
-                        "y": 144.00000000000023
-                    },
-                    {
-                        "x": 0,
-                        "y": 144.00000000000023
-                    },
-                    {
-                        "x": 0,
-                        "y": 0
-                    }
-                ],
-                "Buls": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0
-                ],
-                "SubBoardLocal": [],
-                "SubBoardAssoc": null,
-                "Drillings": null
-            },
-            {
-                "L": 189.0974955047293,
-                "W": 189.0974955047293,
-                "H": 18,
-                "CabName": "",
-                "BoardName": "",
-                "BasePoint": {
-                    "x": 1099.0825688073396,
-                    "y": 234.6989586696538,
-                    "z": 1267.3595091283692
-                },
-                "XVec": {
-                    "x": 0,
-                    "y": 1,
-                    "z": 0
-                },
-                "YVec": {
-                    "x": 0,
-                    "y": 0,
-                    "z": 1
-                },
-                "ZVec": {
-                    "x": 1,
-                    "y": 0,
-                    "z": 0
-                },
-                "Grain": 0,
-                "Pts": [
-                    {
-                        "x": 189.0974955047293,
-                        "y": 94.54874775236476
-                    },
-                    {
-                        "x": -1.4210854715202004e-14,
-                        "y": 94.54874775236478
-                    },
-                    {
-                        "x": 189.0974955047293,
-                        "y": 94.54874775236476
-                    }
-                ],
-                "Buls": [
-                    -0.9999999999999999,
-                    -0.9999999999999999,
-                    0
-                ],
-                "SubBoardLocal": [],
-                "SubBoardAssoc": null,
-                "Drillings": null
-            }
-        ],
-        "SubBoardAssoc": null,
-        "Drillings": null
-    }
-]

src/ViewSrc/index.html

@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <title>WebCAD</title>
-</head>
-
-<body>
-</body>
-
-</html>

src/ViewSrc/style.css

@@ -1,12 +0,0 @@
-body {
-    font-size: 11px;
-    overflow: hidden;
-}
-
-html,
-body {
-    background: #5C7080;
-    height: 100%;
-    padding: 0;
-    margin: 0;
-}

src/Viewer.ts

@@ -37,18 +37,9 @@ export class Viewer
       this.OnSize();
     });
 
-    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 && mesh.material !== ColorMaterial.GetBasicMaterial(1))
-      {
-        oldMesh = mesh;
-        mesh.material = selectMaterial;
-      }
-      this.m_bNeedUpdate = true;
+      this.SelectByPoint(e.offsetX, e.offsetY);
     })
   }
 
@@ -196,4 +187,40 @@ export class Viewer
     this.m_Camera.LookAt(new Vector3(1, 1, -1));
     this.m_bNeedUpdate = true;
   }
+
+  oldMesh: Mesh;
+  SelectByPoint(x: number, y: number)
+  {
+    let mesh = PointPick(this, x, y);
+    if (this.oldMesh)
+      this.oldMesh.material = boardMaterial;
+    if (mesh && mesh.material !== ColorMaterial.GetBasicMaterial(1))
+    {
+      this.oldMesh = mesh;
+      mesh.material = selectMaterial;
+    }
+    this.m_bNeedUpdate = true;
+  }
+  SelectBlock(blockMeshMap: Map<number, number>, dataID: number)
+  {
+    if (blockMeshMap.has(dataID))
+    {
+      let meshId = blockMeshMap.get(dataID);
+      if (this.oldMesh)
+        this.oldMesh.material = boardMaterial;
+      this.m_Scene.children.forEach(obj =>
+      {
+        if (obj instanceof Mesh)
+        {
+          if (obj.id == meshId)
+          {
+            this.oldMesh = obj;
+            obj.material = selectMaterial;
+            this.m_bNeedUpdate = true;
+          }
+        }
+
+      })
+    }
+  }
 }

src/createBoard.ts

@@ -1,6 +1,7 @@
-import { CylinderGeometry, Geometry, LineSegments, Mesh, Shape, Vector2, Vector3, Matrix4, ExtrudeGeometry, EdgesGeometry } from 'three';
+import * as THREE from 'three';
+import { CylinderGeometry, Geometry, LineSegments, Mesh, Shape, Vector2 } from 'three';
 import { ColorMaterial } from './ColorPalette';
-import { equalv3, polar } from './GeUtils';
+import { polar } from './GeUtils';
 import { boardMaterial, edgeMaterial } from './Material';
 import { RotateUVs } from './RotateUV';
 import { ThreeBSP } from './ThreeCSG';
@@ -9,16 +10,16 @@ export class Arc2d
 {
     m_StartAn: number;
     m_EndAn: number;
-    m_StartPoint: Vector2;
-    m_EndPoint: Vector2;
-    m_Center: Vector2;
+    m_StartPoint: THREE.Vector2;
+    m_EndPoint: THREE.Vector2;
+    m_Center: THREE.Vector2;
     m_Radius: number;
-    constructor(p1: Vector2, p2: Vector2, bul: number)
+    constructor(p1: THREE.Vector2, p2: THREE.Vector2, bul: number)
     {
         this.m_StartPoint = p1.clone();
         this.m_EndPoint = p2.clone();
 
-        let vec: Vector2 = p2.clone().sub(p1);
+        let vec: THREE.Vector2 = p2.clone().sub(p1);
         let len = vec.length();
         let an = vec.angle();
         this.m_Radius = len / Math.sin(2 * Math.atan(bul)) / 2;
@@ -71,23 +72,23 @@ export function createPath(pts: Vector2[], buls: number[], shapeOut?: Shape): Sh
     }
     return shape;
 }
-export function getVec(data: object): Vector3
+export function getVec(data: object): THREE.Vector3
 {
-    return new Vector3(data["x"], data["y"], data["z"]);
+    return new THREE.Vector3(data["x"], data["y"], data["z"]);
 }
 
 //创建板件 暂时这么写
 export function createBoard(boardData: object)
 {
-    let pts: Vector2[] = [];
+    let pts: THREE.Vector2[] = [];
     let buls: number[] = [];
     let boardPts = boardData["Pts"];
     let boardBuls = boardData["Buls"];
 
     let boardHeight = boardData["H"];
 
-    let boardMat = new Matrix4();
-    let matInv: Matrix4 = new Matrix4();
+    let boardMat = new THREE.Matrix4();
+    let matInv: THREE.Matrix4 = new THREE.Matrix4();
     //InitBoardMat
     let xD = getVec(boardData["XVec"]);
     let yD = getVec(boardData["YVec"]);
@@ -96,7 +97,7 @@ export function createBoard(boardData: object)
 
     boardMat.makeBasis(xD, yD, ZD);
     boardMat.setPosition(pBase);
-    matInv.getInverse(boardMat);
+    matInv.getInverse(boardMat, true);
 
     if (boardPts && boardPts.length !== 0)
         for (let i = 0; i < boardPts.length; i++)
@@ -104,7 +105,7 @@ export function createBoard(boardData: object)
             let pt = getVec(boardPts[i]);
             if (boardPts[i].z !== undefined)
                 pt.applyMatrix4(matInv);
-            pts.push(new Vector2(pt.x, pt.y));
+            pts.push(new THREE.Vector2(pt.x, pt.y));
             buls.push(boardBuls[i]);
         }
     else
@@ -125,20 +126,14 @@ export function createBoard(boardData: object)
     let extrudeSettings = {
         steps: 1,
         bevelEnabled: false,
-        depth: boardHeight
+        amount: boardHeight
     };
 
-    let ext = new ExtrudeGeometry(sp, extrudeSettings) as Geometry;
+    let ext = new THREE.ExtrudeGeometry(sp, extrudeSettings) as Geometry;
     ext.computeBoundingSphere();
     ext.computeBoundingBox();
     ext.translate(0, 0, -boardHeight)
-    ext.applyMatrix4(boardMat);
-
-    if (!equalv3(xD.clone().cross(yD), ZD))
-    {
-        for (let f of ext.faces)
-            [f.a, f.c] = [f.c, f.a];
-    }
+    ext.applyMatrix(boardMat);
 
     //外边.
     let edges: (LineSegments | Mesh)[] = [createEdge(ext)];
@@ -172,7 +167,7 @@ export function createBoard(boardData: object)
                 else             //1反
                     geo.translate(dri.x, dri.y, dri.h * 0.5 - boardData["H"]);
 
-                geo.applyMatrix4(boardMat);
+                geo.applyMatrix(boardMat);
 
                 let mesh = new Mesh(geo, ColorMaterial.GetBasicMaterial(1));
                 edges.push(mesh);
@@ -190,7 +185,7 @@ export function createBoard(boardData: object)
     if (boardData["BoardName"] === "地脚线")
         RotateUVs(ext);
 
-    let mesh = new Mesh(ext, boardMaterial);
+    let mesh = new THREE.Mesh(ext, boardMaterial);
     mesh.userData = ZD;
     edges.forEach(e => e.userData = ZD);
     return { mesh, edges };
@@ -205,17 +200,28 @@ export function createTemplateBoard(brDataList: any[])
 {
     let meshs = [];
     let edgesa = [];
+
+    let relations = {
+        blockMeshMap: new Map<number, number>(),
+        meshBlockMap: new Map<number, number>()
+    };
     for (let d of brDataList)
     {
         let { mesh, edges } = createBoard(d);
         meshs.push(mesh);
         edgesa.push(...edges);
+
+        if (d['DataID'])
+        {
+            relations.blockMeshMap.set(d['DataID'], mesh.id);
+            relations.meshBlockMap.set(mesh.id, d['DataID']);
         }
-    return { meshs, edgesa };
+    }
+    return { meshs, edgesa, relations };
 }
 
 export function createEdge(geo: Geometry): LineSegments
 {
-    let edge = new EdgesGeometry(geo, 1);
+    let edge = new THREE.EdgesGeometry(geo, 1);
     return new LineSegments(edge, edgeMaterial);
 }

tsconfig.json

@@ -4,7 +4,7 @@
         "sourceMap": true,
         "declaration": true,
         "outDir": "./dist",
-        "target": "esnext",
+        "target": "es5",
         "lib": [
             "esnext",
             "dom"

utils/copy_type.ts

@@ -96,7 +96,7 @@ downloadTypes({
     urlPath: "https://gitee.com/BearCAD/DefinitelyType2/raw/master/three/",
     files: [
         // "index.d.ts",
-        // "three-core.d.ts",
+        "three-core.d.ts",
         // "three-outlinepass.d.ts",
         // "three-smaapass.d.ts"
     ]