修改自定义编号判断

config/webpack.common.ts

@@ -20,18 +20,74 @@ const config: webpack.Configuration = {
     //模块加载器设置
     module: {
         rules: [
+            {
+                test: /\.worker\.ts$/,
+                exclude: /node_modules/,
+                use: [
+                    { loader: 'worker-loader', },
+                    ...TS_LOADER
+                ]
+            },
             {
                 test: /\.tsx?$/,
                 exclude: /node_modules/,
                 use: TS_LOADER,
             },
-            { test: /\.css$/, loader: ['style-loader', 'css-loader'] },
-            { test: /\.[(jpg)|(png)|(obj)|(json)]$/, loader: "url-loader" },
+            {
+                test: /\.[(png)|(obj)|(json)]$/,
+                loader: "file-loader"
+            },
+            //样式加载 css
+            {
+                test: /\.css$/,
+                use: ['style-loader', 'css-loader']
+            },
+            //样式加载 less
+            {
+                test: /\.less$/,
+                use: [
+                    { loader: "style-loader" },
+                    { loader: 'css-loader', options: { sourceMap: false } },
+                    {
+                        loader: "less-loader",
+                        options: {
+                            lessOptions: {
+                                strictMath: true,
+                                noIeCompat: true
+                            }
+                        }
+                    }
+                ]
+            },
+            //字体加载 blueprint
+            {
+                test: /\.(ttf|eot|svg|FBX)$/,
+                use: {
+                    loader: 'file-loader',
+                    options: { name: 'fonts/[contenthash].[ext]' }
+                }
+            },
+            //字体加载 blueprint
+            {
+                test: /\.(woff|woff2|jpg|png)$/,
+                use: {
+                    loader: 'url-loader',
+                    options: {
+                        name: 'fonts/[contenthash].[ext]',
+                        limit: 5000,
+                        mimetype: 'application/font-woff'
+                    }
+                }
+            },
+            {
+                test: /\.(glsl|vs|fs)$/,
+                loader: 'shader-loader'
+            }
         ]
     },
 
     plugins: [
     ]
-}
+};
 
 export default config;

config/webpack.view.ts

@@ -1,7 +1,7 @@
+import HtmlWebPackPlugin from "html-webpack-plugin";
 import * as webpack from 'webpack';
 import merge from 'webpack-merge';
 import common from './webpack.common';
-import HtmlWebPackPlugin from "html-webpack-plugin";
 
 const config: webpack.Configuration = merge(
     common,
@@ -11,12 +11,14 @@ const config: webpack.Configuration = merge(
         output: { pathinfo: false },
         devtool: "eval-source-map",
         devServer: {
-            contentBase: "./dist/",
+            // contentBase: "./dist/",
+            static: false,
             port: 7776,
+            host: "0.0.0.0",
             hot: true,
         },
         plugins: [
-            new webpack.NamedModulesPlugin(),//Hot
+            // new webpack.NamedModulesPlugin(),//Hot
             new webpack.HotModuleReplacementPlugin(),//Hot
             new HtmlWebPackPlugin({
                 title: "webCAD",

package.json

@@ -9,7 +9,7 @@
         "build": "tsc",
         "umd": "webpack --config ./config/webpack.umd.ts",
         "dev": "webpack-dev-server --config ./config/webpack.view.ts",
-        "postinstall": "ts-node ./utils/rmtype.ts"
+        "rmtype": "ts-node ./utils/rmtype.ts"
     },
     "repository": {
         "type": "git",
@@ -23,9 +23,7 @@
         "@types/three": "^0.103.2",
         "@types/uglifyjs-webpack-plugin": "^1.1.0",
         "@types/webpack": "^4.41.32",
-        "@types/webpack-dev-server": "^3.11.6",
-        "@types/webpack-env": "^1.15.2",
-        "@types/webpack-merge": "^4.1.5",
+        "@types/webpack-env": "^1.18.0",
         "awesome-typescript-loader": "^5.2.1",
         "cache-loader": "^4.1.0",
         "fork-ts-checker-webpack-plugin": "^4.1.6",
@@ -35,15 +33,18 @@
         "ts-node": "^8.10.2",
         "typescript": "^4.5.5",
         "uglifyjs-webpack-plugin": "^2.2.0",
-        "webpack": "^4.46.0",
-        "webpack-cli": "^3.3.12",
-        "webpack-dev-server": "^3.11.3",
-        "webpack-merge": "^4.2.2"
+        "webpack": "^5.75.0",
+        "webpack-cli": "^4.10.0",
+        "webpack-dev-server": "^4.11.1",
+        "webpack-merge": "^5.8.0"
     },
     "dependencies": {
-        "@jscad/modeling": "^2.7.1",
+        "@jscad/modeling": "^2.11.0",
         "flatbush": "^3.3.0",
-        "three": "^0.115.0",
-        "webcad_ue4_api": "http://gitea.cf/cx/webcad-ue4-api/archive/0.2.3.tar.gz"
+        "three": "npm:three-cf@0.122.5",
+        "js-angusj-clipper": "^1.2.1",
+        "polylabel": "^1.1.0",
+        "xaop": "^2.0.0",
+        "webcad_ue4_api": "http://gitea.cf/cx/webcad-ue4-api/archive/3.2.4.tar.gz"
     }
 }

src/ColorPalette.ts

@@ -1,5 +1,5 @@
 import * as THREE from 'three';
-import { LineBasicMaterial, MeshBasicMaterial, Color } from 'three';
+import { Color, LineBasicMaterial, MeshBasicMaterial } from 'three';
 const ColorPalette = [
     [255, 0, 0, 255],    //----- 0 - lets make it red for an example
     //[255, 255, 255, 255],//----- 0 - ByBlock - White
@@ -284,7 +284,7 @@ export class ColorMaterial
     {
         if (this.m_BasicMaterialMap.has(index))
             return this.m_BasicMaterialMap.get(index);
-        let mat = new MeshBasicMaterial({ color: this.GetColor(index) });
+        let mat = new MeshBasicMaterial({ color: this.GetColor(index), side: THREE.DoubleSide });
         this.m_BasicMaterialMap.set(index, mat);
         return mat;
     }

src/SimpleBoard.ts

@@ -0,0 +1,185 @@
+import { CylinderGeometry, LineSegments, Matrix4, Mesh, MeshBasicMaterial, Vector2, Vector3 } from "three";
+import { ExtrudeSolid, Polyline, boardUVGenerator2 } from "webcad_ue4_api";
+import { ColorMaterial } from "./ColorPalette";
+import { edgeMaterial } from "./Material";
+import { DbText } from "./Text";
+
+function getVec(data: object): Vector3
+{
+    return new Vector3(data["x"], data["y"], data["z"]);
+}
+
+enum BoardType
+{
+    Layer = 0,
+    Vertical = 1,
+    Behind = 2
+}
+export class SimpleBoard
+{
+    BoardName: string;
+    boardPts: any[];
+    boardBuls: any[];
+    xD: Vector3;
+    yD: Vector3;
+    zD: Vector3;
+    height: number;
+    width: number;
+
+    thickness: number;
+    pBase: Vector3;
+    SubBoardLocal: any[];
+    Drillings: any[];
+    DataID: number;
+    _BoardType: BoardType;
+    _CustomNumber: string;
+
+    constructor(boardData: any)
+    {
+        this.boardPts = boardData["Pts"];
+        this.boardBuls = boardData["Buls"];
+        this.pBase = getVec(boardData["BasePoint"]);
+
+        this.xD = getVec(boardData["XVec"]);
+        this.yD = getVec(boardData["YVec"]);
+        this.zD = getVec(boardData["ZVec"]);
+
+        this.SubBoardLocal = boardData["SubBoardLocal"] ?? [];
+
+        this.Drillings = boardData["Drillings"] ?? [];
+
+        this.height = boardData["L"];
+        this.width = boardData["W"];
+        this.thickness = boardData["H"];
+
+        this.BoardName = boardData["BoardName"];
+        this.DataID = boardData['DataID'];
+
+        this._BoardType = boardData['BoardType'];
+        this._CustomNumber = boardData['CustomNumber'];
+    }
+
+    public Conver2Ext(): ExtrudeSolid
+    {
+        let pts: Vector2[] = [];
+        let buls: number[] = [];
+
+
+        let boardMat = new Matrix4();
+        let matInv: Matrix4 = new Matrix4();
+        //InitBoardMat
+
+        this.pBase.add(this.zD.clone().multiplyScalar(-this.thickness));
+
+        boardMat.makeBasis(this.xD, this.yD, this.zD);
+        boardMat.setPosition(this.pBase);
+        matInv.getInverse(boardMat);
+
+        if (this.boardPts && this.boardPts.length !== 0)
+            for (let i = 0; i < this.boardPts.length; i++)
+            {
+                let pt = getVec(this.boardPts[i]);
+                if (this.boardPts[i].z !== undefined)
+                    pt.applyMatrix4(matInv);
+                pts.push(new Vector2(pt.x, pt.y));
+                buls.push(this.boardBuls[i]);
+            }
+        else
+        {
+
+            pts.push(new Vector2(0, 0),
+                new Vector2(this.width, 0),
+                new Vector2(this.width, this.height),
+                new Vector2(0, this.height),
+                new Vector2(0, 0)
+            );
+            buls.push(0, 0, 0, 0, 0);
+        }
+
+        let ext = new ExtrudeSolid();
+        ext.OCSNoClone.copy(boardMat);
+        let pl = new Polyline(pts.map((p, i) => { return { pt: p, bul: buls[i] }; }));
+        ext.Thickness = this.thickness;
+        ext.ContourCurve = pl;
+
+        if (this.SubBoardLocal.length > 0)
+            ext.Grooves.push(...this.SubBoardLocal.map(sub => new SimpleBoard(sub).Conver2Ext()));
+        return ext;
+    }
+
+    createBoard(boardMaterial: MeshBasicMaterial)
+    {
+        let ext = this.Conver2Ext();
+        if (this.BoardName === "地脚线")
+            Object.defineProperty(ext, "UCGenerator",
+                {
+                    get: function ()
+                    {
+                        return boardUVGenerator2;
+                    },
+                });
+
+        //板件被镜像时.
+        // if (!equalv3(xD.clone().cross(yD), ZD))
+        // {
+        //     for (let f of ext.faces)
+        //         [f.a, f.c] = [f.c, f.a];
+        // }
+
+        //边
+        let edges: (LineSegments | Mesh)[] = [new LineSegments(ext.EdgeGeometry, edgeMaterial)];
+        edges[0].applyMatrix4(ext.OCSNoClone);
+
+        if (this.Drillings.length > 0)
+        {
+            let dris = this.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 + this.thickness);
+                else             //1反
+                    geo.translate(dri.x, dri.y, dri.h * 0.5);
+
+                geo.applyMatrix4(ext.OCSNoClone);
+
+                let mesh = new Mesh(geo, ColorMaterial.GetBasicMaterial(1));
+                edges.push(mesh);
+            }
+        }
+
+        let mesh = new Mesh(ext.MeshGeometry, boardMaterial);
+        mesh.userData = ext.Normal;
+        edges.forEach(e => e.userData = ext.Normal);
+        // 自定义编号
+        if (this._CustomNumber)
+        {
+            mesh.add(this.createCustomNo());
+        }
+        mesh.applyMatrix4(ext.OCSNoClone);
+        mesh.updateWorldMatrix(false, true);
+
+
+
+        return { mesh, edges };
+    }
+    private createCustomNo()
+    {
+        let text = new DbText(this._CustomNumber?.toString(), 100);
+        let position = new Vector3(this.width * 0.5, this.height * 0.5, this.thickness * 0.5);
+        if (this._BoardType === BoardType.Layer)
+        {
+            text.applyMatrix4(new Matrix4().makeRotationZ(-Math.PI / 2).setPosition(position));
+        }
+        else
+        {
+            text.applyMatrix4(new Matrix4().setPosition(position));
+        }
+
+        // text.CreateDoubleMesh(this._BoardType === BoardType.Layer);
+
+        return text;
+    }
+}

src/Text.ts

@@ -1,6 +1,7 @@
-import { Font, FontLoader, Mesh, ShapeGeometry, Vector3, Shape } from "three";
+import { Font, FontLoader, Matrix4, Mesh, Shape, ShapeGeometry, Vector3 } from "three";
 import { ColorMaterial } from "./ColorPalette";
 import { MoveMatrix } from "./GeUtils";
+import { XAxis, XAxisN, YAxis, YAxisN, ZAxisN } from "./Utils";
 
 class FontLoaderUtil
 {
@@ -40,4 +41,19 @@ export class DbText extends Mesh
         let center = geometry.boundingBox.getCenter(new Vector3());
         this.applyMatrix4(MoveMatrix(new Vector3(-center.x, 0, 0)));
     }
+
+    CreateDoubleMesh(IsFsText: boolean)
+    {
+        let mesh2 = new Mesh(this.geometry, ColorMaterial.GetBasicMaterial(5));
+        //左右视图时应该这样,俯视图是X,-Y,-Z(y+=(xxx)
+        if (IsFsText)
+        {
+            mesh2.applyMatrix4(new Matrix4().makeBasis(XAxis, YAxisN, ZAxisN));
+        }
+        else
+        {
+            mesh2.applyMatrix4(new Matrix4().makeBasis(XAxisN, YAxis, ZAxisN));
+        }
+        this.add(mesh2);
+    }
 }

src/Utils.ts

@@ -1,5 +1,12 @@
-import { Object3D, Mesh } from "three";
-import { createTemplateBoard, DrawDimension, Viewer } from ".";
+import { Object3D, Vector3 } from "three";
+import { DrawDimension, Viewer, createTemplateBoard } from ".";
+
+export const XAxis = new Vector3(1, 0, 0);
+export const XAxisN = new Vector3(-1, 0, 0);
+export const YAxis = new Vector3(0, 1, 0);
+export const YAxisN = new Vector3(0, -1, 0);
+export const ZAxis = new Vector3(0, 0, 1);
+export const ZAxisN = new Vector3(0, 0, -1);
 
 function dispose(m: Object3D)
 {

src/ViewSrc/data.json

@@ -1,444 +1,197 @@
 [
     {
-        "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,
+        "DataID": 3996018,
+        "OrderNo": 20230727027642,
+        "L": 800,
         "W": 600,
         "H": 18,
-        "CabName": "主卧",
-        "BoardName": "",
+        "BoardName": "层板",
+        "Grain": 0,
+        "BoardType": 0,
+        "CustomNumber": "",
         "BasePoint": {
-            "x": 1099.0825688073396,
-            "y": 73.39449541284404,
-            "z": 0
+            "x": 1877.02062480031,
+            "y": -1.77635683940025e-13,
+            "z": 823.651271182857
         },
         "XVec": {
-            "x": 0,
+            "x": 2.22044604925031e-16,
             "y": 1,
             "z": 0
         },
         "YVec": {
+            "x": -1,
+            "y": 2.22044604925031e-16,
+            "z": 0
+        },
+        "ZVec": {
             "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
-                ],
+        "Pts": [],
+        "Buls": [],
         "SubBoardLocal": [],
-                "SubBoardAssoc": null,
-                "Drillings": null
+        "SubBoardAssoc": [],
+        "Drillings": [
+            {
+                "x": 50,
+                "y": 766,
+                "r": 7.5,
+                "h": 13.5,
+                "f": 0
             },
             {
-                "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": 300,
+                "y": 766,
+                "r": 7.5,
+                "h": 13.5,
+                "f": 0
             },
             {
-                        "x": -1.4210854715202004e-14,
-                        "y": 94.54874775236478
+                "x": 550,
+                "y": 766,
+                "r": 7.5,
+                "h": 13.5,
+                "f": 0
             },
             {
-                        "x": 189.0974955047293,
-                        "y": 94.54874775236476
-                    }
-                ],
-                "Buls": [
-                    -0.9999999999999999,
-                    -0.9999999999999999,
-                    0
-                ],
-                "SubBoardLocal": [],
-                "SubBoardAssoc": null,
-                "Drillings": null
-            }
-        ],
-        "SubBoardAssoc": null,
-        "Drillings": null
+                "x": 550,
+                "y": 34,
+                "r": 7.5,
+                "h": 13.5,
+                "f": 0
+            },
+            {
+                "x": 300,
+                "y": 34,
+                "r": 7.5,
+                "h": 13.5,
+                "f": 0
+            },
+            {
+                "x": 50,
+                "y": 34,
+                "r": 7.5,
+                "h": 13.5,
+                "f": 0
+            }
+        ]
+    },
+    {
+        "DataID": 3996019,
+        "OrderNo": 20230727027642,
+        "L": 1200,
+        "W": 600,
+        "H": 18,
+        "BoardName": "右侧板",
+        "Grain": 0,
+        "BoardType": 0,
+        "CustomNumber": "",
+        "BasePoint": {
+            "x": 1895.02062480031,
+            "y": 0,
+            "z": 214.651271182857
+        },
+        "XVec": {
+            "x": 4.93038065763132e-32,
+            "y": 1,
+            "z": -2.22044604925031e-16
+        },
+        "YVec": {
+            "x": -2.22044604925031e-16,
+            "y": 2.22044604925031e-16,
+            "z": 1
+        },
+        "ZVec": {
+            "x": 1,
+            "y": 0,
+            "z": 2.22044604925031e-16
+        },
+        "Pts": [],
+        "Buls": [],
+        "SubBoardLocal": [],
+        "SubBoardAssoc": [],
+        "Drillings": [
+            {
+                "x": 550,
+                "y": 600,
+                "r": 5,
+                "h": 13.5,
+                "f": 1
+            },
+            {
+                "x": 300,
+                "y": 600,
+                "r": 5,
+                "h": 13.5,
+                "f": 1
+            },
+            {
+                "x": 50,
+                "y": 600,
+                "r": 5,
+                "h": 13.5,
+                "f": 1
+            }
+        ]
+    },
+    {
+        "DataID": 3996020,
+        "OrderNo": 20230727027642,
+        "L": 1200,
+        "W": 600,
+        "H": 18,
+        "BoardName": "左侧板",
+        "Grain": 0,
+        "BoardType": 0,
+        "CustomNumber": "",
+        "BasePoint": {
+            "x": 1077.02062480031,
+            "y": 0,
+            "z": 214.651271182857
+        },
+        "XVec": {
+            "x": 4.93038065763132e-32,
+            "y": 1,
+            "z": -2.22044604925031e-16
+        },
+        "YVec": {
+            "x": -2.22044604925031e-16,
+            "y": 2.22044604925031e-16,
+            "z": 1
+        },
+        "ZVec": {
+            "x": 1,
+            "y": 0,
+            "z": 2.22044604925031e-16
+        },
+        "Pts": [],
+        "Buls": [],
+        "SubBoardLocal": [],
+        "SubBoardAssoc": [],
+        "Drillings": [
+            {
+                "x": 50,
+                "y": 600,
+                "r": 5,
+                "h": 13.5,
+                "f": 0
+            },
+            {
+                "x": 300,
+                "y": 600,
+                "r": 5,
+                "h": 13.5,
+                "f": 0
+            },
+            {
+                "x": 550,
+                "y": 600,
+                "r": 5,
+                "h": 13.5,
+                "f": 0
+            }
+        ]
     }
 ]

src/createBoard.ts

@@ -1,8 +1,7 @@
-import { CylinderGeometry, EdgesGeometry, Geometry, LineSegments, Matrix4, Mesh, MeshBasicMaterial, Shape, Vector2, Vector3 } from 'three';
-import { boardUVGenerator2, ExtrudeSolid, Polyline } from 'webcad_ue4_api';
-import { ColorMaterial } from './ColorPalette';
+import { EdgesGeometry, Geometry, LineSegments, MeshBasicMaterial, Shape, Vector2 } from 'three';
 import { polar } from './GeUtils';
 import { edgeMaterial } from './Material';
+import { SimpleBoard } from './SimpleBoard';
 //解析二维圆弧类.
 export class Arc2d
 {
@@ -70,122 +69,11 @@ export function createPath(pts: Vector2[], buls: number[], shapeOut?: Shape): Sh
     }
     return shape;
 }
-export function getVec(data: object): Vector3
-{
-    return new Vector3(data["x"], data["y"], data["z"]);
-}
 
-function Conver2Ext(boardData: object): ExtrudeSolid
-{
-    let pts: 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();
-    //InitBoardMat
-    let xD = getVec(boardData["XVec"]);
-    let yD = getVec(boardData["YVec"]);
-    let ZD = getVec(boardData["ZVec"]);
-    let pBase = getVec(boardData["BasePoint"]);
-    pBase.add(ZD.clone().multiplyScalar(-boardHeight));
-
-    boardMat.makeBasis(xD, yD, ZD);
-    boardMat.setPosition(pBase);
-    matInv.getInverse(boardMat);
-
-    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 Vector2(pt.x, pt.y));
-            buls.push(boardBuls[i]);
-        }
-    else
-    {
-        let length = boardData["L"];
-        let width = boardData["W"];
-        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 ext = new ExtrudeSolid();
-    ext.OCSNoClone.copy(boardMat);
-    let pl = new Polyline(pts.map((p, i) => { return { pt: p, bul: buls[i] }; }));
-    ext.Thickness = boardHeight;
-    ext.ContourCurve = pl;
-
-    if (checkObjectArray(boardData, "SubBoardLocal"))
-        ext.Grooves.push(...boardData["SubBoardLocal"].map(Conver2Ext));
-    return ext;
-}
 
 //创建板件 暂时这么写
-export function createBoard(boardData: object, boardMaterial: MeshBasicMaterial)
-{
-    let ext = Conver2Ext(boardData);
-    if (boardData["BoardName"] === "地脚线")
-        Object.defineProperty(ext, "UCGenerator",
-            {
-                get: function ()
-                {
-                    return boardUVGenerator2;
-                },
-            });
 
-    //板件被镜像时.
-    // if (!equalv3(xD.clone().cross(yD), ZD))
-    // {
-    //     for (let f of ext.faces)
-    //         [f.a, f.c] = [f.c, f.a];
-    // }
-
-    //边
-    let edges: (LineSegments | Mesh)[] = [new LineSegments(ext.EdgeGeometry, edgeMaterial)];
-    edges[0].applyMatrix4(ext.OCSNoClone);
-
-    if (checkObjectArray(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 + boardData["H"]);
-            else             //1反
-                geo.translate(dri.x, dri.y, dri.h * 0.5);
-
-            geo.applyMatrix4(ext.OCSNoClone);
-
-            let mesh = new Mesh(geo, ColorMaterial.GetBasicMaterial(1));
-            edges.push(mesh);
-        }
-    }
-
-    let mesh = new Mesh(ext.MeshGeometry, boardMaterial);
-    mesh.userData = ext.Normal;
-    edges.forEach(e => e.userData = ext.Normal);
-    mesh.applyMatrix4(ext.OCSNoClone);
-    mesh.updateWorldMatrix(false, true);
-    return { mesh, edges };
-}
-
-function checkObjectArray(obj: any, key: string)
-{
-    return obj[key] && obj[key].length > 0;
-}
 
 export function createTemplateBoard(brDataList: any[], material: MeshBasicMaterial)
 {
@@ -198,14 +86,15 @@ export function createTemplateBoard(brDataList: any[], material: MeshBasicMateri
     };
     for (let d of brDataList)
     {
-        let { mesh, edges } = createBoard(d, material);
+        let board = new SimpleBoard(d);
+        let { mesh, edges } = board.createBoard(material);
         meshs.push(mesh);
         edgesa.push(...edges);
 
-        if (d['DataID'])
+        if (board.DataID)
         {
-            relations.blockMeshMap.set(d['DataID'], mesh.id);
-            relations.meshBlockMap.set(mesh.id, d['DataID']);
+            relations.blockMeshMap.set(board.DataID, mesh.id);
+            relations.meshBlockMap.set(mesh.id, board.DataID);
         }
     }
     return { meshs, edgesa, relations };

src/data.ts

@@ -1,550 +0,0 @@
-export var data =
-    [
-        {
-            "L": 100.0,
-            "W": 800.0,
-            "H": 18.0,
-            "BasePoint": {
-                "x": 2076.407626150509,
-                "y": 1942.2104819571228,
-                "z": 1882.0
-            },
-            "XVec": {
-                "x": 1.0,
-                "y": 4.930380657631324e-32,
-                "z": -2.220446049250313e-16
-            },
-            "YVec": {
-                "x": 2.220446049250313e-16,
-                "y": 2.220446049250313e-16,
-                "z": 1.0
-            },
-            "ZVec": {
-                "x": 9.860761315262648e-32,
-                "y": -1.0,
-                "z": 2.220446049250313e-16
-            },
-            "Pts": [
-                {
-                    "x": 2076.407626150509,
-                    "y": 1942.2104819571228,
-                    "z": 1882.0
-                },
-                {
-                    "x": 2876.407626150509,
-                    "y": 1942.2104819571228,
-                    "z": 1881.9999999999998
-                },
-                {
-                    "x": 2876.407626150509,
-                    "y": 1942.2104819571228,
-                    "z": 1981.9999999999998
-                },
-                {
-                    "x": 2076.407626150509,
-                    "y": 1942.2104819571228,
-                    "z": 1982.0
-                },
-                {
-                    "x": 2076.407626150509,
-                    "y": 1942.2104819571228,
-                    "z": 1882.0
-                }
-            ],
-            "Buls": [
-                0.0,
-                0.0,
-                0.0,
-                0.0,
-                0.0
-            ],
-            "SubBoardLocal": [],
-            "SubBoardAssoc": []
-        },
-        {
-            "L": 800.0,
-            "W": 100.00000000000068,
-            "H": 18.0,
-            "MaterialId": "EE",
-            "BasePoint": {
-                "x": 2876.407626150509,
-                "y": 1960.2104819571226,
-                "z": 1900.0000000000005
-            },
-            "XVec": {
-                "x": 4.440892098500626e-16,
-                "y": 1.0,
-                "z": 2.2204460492503124e-16
-            },
-            "YVec": {
-                "x": -1.0,
-                "y": 4.440892098500626e-16,
-                "z": 2.220446049250314e-16
-            },
-            "ZVec": {
-                "x": 2.220446049250313e-16,
-                "y": -2.220446049250313e-16,
-                "z": 1.0
-            },
-            "Handle": "293",
-            "CabName": "1.标准柜上梁1",
-            "BoardName": "",
-            "Grain": 0,
-            "Pts": [
-                {
-                    "x": 2876.407626150509,
-                    "y": 1960.2104819571228,
-                    "z": 1900.0000000000005
-                },
-                {
-                    "x": 2876.407626150509,
-                    "y": 2060.210481957123,
-                    "z": 1900.0000000000005
-                },
-                {
-                    "x": 2076.407626150509,
-                    "y": 2060.210481957123,
-                    "z": 1900.0000000000005
-                },
-                {
-                    "x": 2076.407626150509,
-                    "y": 1960.210481957123,
-                    "z": 1900.0000000000005
-                },
-                {
-                    "x": 2876.407626150509,
-                    "y": 1960.2104819571228,
-                    "z": 1900.0000000000005
-                }
-            ],
-            "Buls": [
-                0.0,
-                0.0,
-                0.0,
-                0.0,
-                0.0
-            ],
-            "SubBoardLocal": [],
-            "SubBoardAssoc": []
-        },
-        {
-            "L": 1899.9999999999998,
-            "W": 800.0,
-            "H": 18.0,
-            "MaterialId": "EE",
-            "BasePoint": {
-                "x": 2076.407626150509,
-                "y": 2060.2104819571225,
-                "z": -1.816324868286756e-13
-            },
-            "XVec": {
-                "x": 1.0,
-                "y": 0.0,
-                "z": 0.0
-            },
-            "YVec": {
-                "x": 0.0,
-                "y": 4.440892098500626e-16,
-                "z": 1.0
-            },
-            "ZVec": {
-                "x": 0.0,
-                "y": -1.0,
-                "z": 4.440892098500626e-16
-            },
-            "Handle": "291",
-            "CabName": "1.标准柜上梁1",
-            "BoardName": "背板",
-            "Grain": 0,
-            "Pts": [
-                {
-                    "x": 2076.407626150509,
-                    "y": 2060.2104819571225,
-                    "z": -1.021405182655144e-13
-                },
-                {
-                    "x": 2876.407626150509,
-                    "y": 2060.2104819571225,
-                    "z": -1.816324868286756e-13
-                },
-                {
-                    "x": 2876.407626150509,
-                    "y": 2060.210481957123,
-                    "z": 1899.9999999999996
-                },
-                {
-                    "x": 2076.407626150509,
-                    "y": 2060.210481957123,
-                    "z": 1899.9999999999998
-                },
-                {
-                    "x": 2076.407626150509,
-                    "y": 2060.2104819571225,
-                    "z": -1.021405182655144e-13
-                }
-            ],
-            "Buls": [
-                0.0,
-                0.0,
-                0.0,
-                0.0,
-                0.0
-            ],
-            "SubBoardLocal": [],
-            "SubBoardAssoc": []
-        },
-        {
-            "L": 800.0,
-            "W": 482.0000000000002,
-            "H": 18.0,
-            "MaterialId": "EE",
-            "BasePoint": {
-                "x": 2876.407626150509,
-                "y": 1578.210481957122,
-                "z": 97.99999999999999
-            },
-            "XVec": {
-                "x": 4.440892098500626e-16,
-                "y": 1.0,
-                "z": 0.0
-            },
-            "YVec": {
-                "x": -1.0,
-                "y": 4.440892098500626e-16,
-                "z": 0.0
-            },
-            "ZVec": {
-                "x": 0.0,
-                "y": 0.0,
-                "z": 1.0
-            },
-            "Handle": "290",
-            "CabName": "1.标准柜上梁1",
-            "BoardName": "底板",
-            "Grain": 0,
-            "Pts": [
-                {
-                    "x": 2876.407626150509,
-                    "y": 1578.210481957122,
-                    "z": 97.99999999999999
-                },
-                {
-                    "x": 2876.407626150509,
-                    "y": 2060.2104819571225,
-                    "z": 97.99999999999999
-                },
-                {
-                    "x": 2076.407626150509,
-                    "y": 2060.2104819571225,
-                    "z": 97.99999999999999
-                },
-                {
-                    "x": 2076.407626150509,
-                    "y": 1578.2104819571226,
-                    "z": 97.99999999999999
-                },
-                {
-                    "x": 2876.407626150509,
-                    "y": 1578.210481957122,
-                    "z": 97.99999999999999
-                }
-            ],
-            "Buls": [
-                0.0,
-                0.0,
-                0.0,
-                0.0,
-                0.0
-            ],
-            "SubBoardLocal": [],
-            "SubBoardAssoc": []
-        },
-        {
-            "L": 80.0,
-            "W": 800.0,
-            "H": 18.0,
-            "MaterialId": "EE",
-            "BasePoint": {
-                "x": 2076.407626150509,
-                "y": 1578.2104819571223,
-                "z": 0.0
-            },
-            "XVec": {
-                "x": 1.0,
-                "y": 0.0,
-                "z": 0.0
-            },
-            "YVec": {
-                "x": 0.0,
-                "y": 4.440892098500626e-16,
-                "z": 1.0
-            },
-            "ZVec": {
-                "x": 0.0,
-                "y": -1.0,
-                "z": 4.440892098500626e-16
-            },
-            "Handle": "28E",
-            "CabName": "1.标准柜上梁1",
-            "BoardName": "地脚线",
-            "Grain": 1,
-            "Pts": [
-                {
-                    "x": 2076.407626150509,
-                    "y": 1578.2104819571223,
-                    "z": 0.0
-                },
-                {
-                    "x": 2876.407626150509,
-                    "y": 1578.2104819571223,
-                    "z": 0.0
-                },
-                {
-                    "x": 2876.407626150509,
-                    "y": 1578.2104819571223,
-                    "z": 80.0
-                },
-                {
-                    "x": 2076.407626150509,
-                    "y": 1578.2104819571223,
-                    "z": 80.0
-                },
-                {
-                    "x": 2076.407626150509,
-                    "y": 1578.2104819571223,
-                    "z": 0.0
-                }
-            ],
-            "Buls": [
-                0.0,
-                0.0,
-                0.0,
-                0.0,
-                0.0
-            ],
-            "SubBoardLocal": [],
-            "SubBoardAssoc": []
-        },
-        {
-            "L": 800.0,
-            "W": 482.0,
-            "H": 18.0,
-            "MaterialId": "EE",
-            "BasePoint": {
-                "x": 2876.4076261505085,
-                "y": 1478.210481957122,
-                "z": 1999.9999999999996
-            },
-            "XVec": {
-                "x": 4.440892098500626e-16,
-                "y": 1.0,
-                "z": 0.0
-            },
-            "YVec": {
-                "x": -1.0,
-                "y": 4.440892098500626e-16,
-                "z": 0.0
-            },
-            "ZVec": {
-                "x": 0.0,
-                "y": 0.0,
-                "z": 1.0
-            },
-            "Handle": "28C",
-            "CabName": "1.标准柜上梁1",
-            "BoardName": "顶板",
-            "Grain": 0,
-            "Pts": [
-                {
-                    "x": 2076.407626150509,
-                    "y": 1960.2104819571223,
-                    "z": 1999.9999999999996
-                },
-                {
-                    "x": 2076.407626150509,
-                    "y": 1478.2104819571226,
-                    "z": 1999.9999999999996
-                },
-                {
-                    "x": 2876.407626150509,
-                    "y": 1478.210481957122,
-                    "z": 1999.9999999999996
-                },
-                {
-                    "x": 2876.4076261505085,
-                    "y": 1960.210481957122,
-                    "z": 1999.9999999999996
-                },
-                {
-                    "x": 2076.407626150509,
-                    "y": 1960.2104819571223,
-                    "z": 1999.9999999999996
-                }
-            ],
-            "Buls": [
-                0.0,
-                0.0,
-                0.0,
-                0.0,
-                0.0
-            ],
-            "SubBoardLocal": [],
-            "SubBoardAssoc": []
-        },
-        {
-            "L": 1999.9999999999996,
-            "W": 600.0,
-            "H": 18.0,
-            "MaterialId": "EE",
-            "BasePoint": {
-                "x": 2894.4076261505094,
-                "y": 1478.2104819571223,
-                "z": -2.2737367544323197e-13
-            },
-            "XVec": {
-                "x": 4.930380657631324e-32,
-                "y": 1.0,
-                "z": -2.220446049250313e-16
-            },
-            "YVec": {
-                "x": -2.220446049250313e-16,
-                "y": 2.220446049250313e-16,
-                "z": 1.0
-            },
-            "ZVec": {
-                "x": 1.0,
-                "y": 0.0,
-                "z": 2.220446049250313e-16
-            },
-            "Handle": "28B",
-            "CabName": "1.标准柜上梁1",
-            "BoardName": "右侧板",
-            "Grain": 0,
-            "Pts": [
-                {
-                    "x": 2894.407626150509,
-                    "y": 1960.2104819571228,
-                    "z": 1899.9999999999989
-                },
-                {
-                    "x": 2894.407626150509,
-                    "y": 1960.2104819571228,
-                    "z": 1999.9999999999994
-                },
-                {
-                    "x": 2894.407626150509,
-                    "y": 1478.2104819571228,
-                    "z": 1999.9999999999994
-                },
-                {
-                    "x": 2894.4076261505094,
-                    "y": 1478.2104819571223,
-                    "z": -1.816324868286755e-13
-                },
-                {
-                    "x": 2894.4076261505094,
-                    "y": 2078.2104819571225,
-                    "z": -6.274980535181384e-13
-                },
-                {
-                    "x": 2894.407626150509,
-                    "y": 2078.2104819571229,
-                    "z": 1899.9999999999973
-                },
-                {
-                    "x": 2894.407626150509,
-                    "y": 1960.2104819571228,
-                    "z": 1899.9999999999989
-                }
-            ],
-            "Buls": [
-                0.0,
-                0.0,
-                0.0,
-                0.0,
-                0.0,
-                0.0,
-                0.0
-            ],
-            "SubBoardLocal": [],
-            "SubBoardAssoc": []
-        },
-        {
-            "L": 1999.9999999999996,
-            "W": 600.0,
-            "H": 18.0,
-            "MaterialId": "EE",
-            "BasePoint": {
-                "x": 2076.4076261505094,
-                "y": 1478.2104819571223,
-                "z": 1.0097419586828951e-28
-            },
-            "XVec": {
-                "x": 4.930380657631324e-32,
-                "y": 1.0,
-                "z": -2.220446049250313e-16
-            },
-            "YVec": {
-                "x": -2.220446049250313e-16,
-                "y": 2.220446049250313e-16,
-                "z": 1.0
-            },
-            "ZVec": {
-                "x": 1.0,
-                "y": 0.0,
-                "z": 2.220446049250313e-16
-            },
-            "Handle": "288",
-            "CabName": "1.标准柜上梁1",
-            "BoardName": "左侧板",
-            "Grain": 0,
-            "Pts": [
-                {
-                    "x": 2076.407626150509,
-                    "y": 1960.2104819571228,
-                    "z": 1899.999999999999
-                },
-                {
-                    "x": 2076.407626150509,
-                    "y": 1960.2104819571228,
-                    "z": 1999.9999999999996
-                },
-                {
-                    "x": 2076.407626150509,
-                    "y": 1478.2104819571228,
-                    "z": 1999.9999999999996
-                },
-                {
-                    "x": 2076.4076261505094,
-                    "y": 1478.2104819571223,
-                    "z": 1.0097419586828951e-28
-                },
-                {
-                    "x": 2076.4076261505094,
-                    "y": 2078.2104819571225,
-                    "z": -4.4586556668946279e-13
-                },
-                {
-                    "x": 2076.407626150509,
-                    "y": 2078.2104819571229,
-                    "z": 1899.9999999999978
-                },
-                {
-                    "x": 2076.407626150509,
-                    "y": 1960.2104819571228,
-                    "z": 1899.999999999999
-                }
-            ],
-            "Buls": [
-                0.0,
-                0.0,
-                0.0,
-                0.0,
-                0.0,
-                0.0,
-                0.0
-            ],
-            "SubBoardLocal": [],
-            "SubBoardAssoc": []
-        }
-    ]