build-dxf 0.1.80 → 0.1.81

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "build-dxf",
-  "version": "0.1.80",
+  "version": "0.1.81",
   "description": "线段构建双线墙壁的dxf版本",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",

package/src/DomEventRegister.js

@@ -107,7 +107,7 @@ const _Renderer = class _Renderer extends Component {
     this.description = description;
     const {
       scene = new THREE.Scene(),
-      camera = new THREE.PerspectiveCamera(45, 1, 0.01, 1e3)
+      camera = new THREE.PerspectiveCamera(45, 1, 1e-4, 1e3)
     } = description;
     this.camera = camera;
     this.scene = scene;

package/src/api/index.d.ts

@@ -0,0 +1,22 @@
+import { IRegion, ISpace } from './type';
+export declare function getSpaceListApi(): Promise<ISpace[]>;
+/** 获取区域列表api
+ * @param idSpace
+ * @returns
+ */
+export declare function getRegionListApi(idSpace: String): Promise<IRegion[]>;
+/** 获取名下所有区域列表 api
+ */
+export declare function getRegionListAllApi(): Promise<{
+    regionList: IRegion[][];
+    spaceList: ISpace[];
+}>;
+/**
+ * 更新三维家json
+ */
+export declare function updateThreeJiaJsonApi(body: {
+    schemeContent: string;
+    idRegion: string;
+    models: string;
+    dxf: string;
+}): Promise<boolean>;

package/src/api/type.d.ts

@@ -0,0 +1,30 @@
+export type ModelItemType = "dxf" | "gltf" | "jpg" | "glb" | "originalJson" | "json" | "obj" | "threeVJiaJson" | "publicInfoJson" | "trajectory";
+export interface IModelItem {
+    type: ModelItemType;
+    url: string;
+    data?: any;
+}
+export interface IRegion {
+    idRegion: string;
+    regionName: string;
+    type: string;
+    active: string;
+    createTime: string;
+    updateTime: number;
+    url: string;
+    idSpace: string;
+    username: string;
+    nickName: string;
+    headerImg: string;
+    dxf: string;
+    models: IModelItem[];
+    ext: string;
+    progress: number;
+}
+export interface ISpace {
+    idSpace: string;
+    spaceName: string;
+    accountRole: number;
+    active: number;
+    regionList: IRegion[];
+}

package/src/build.js

@@ -19294,15 +19294,14 @@ function removeShortDoubleWall(lineSegments) {
 function getNextPoint(point2, line, next, width) {
   if (next.length === 0) {
     const direct = point2.directionFrom(line.getAnotherPoint(point2));
-    return direct.multiplyScalar(width);
+    return point2.clone().add(direct.multiplyScalar(width));
   }
   const p2 = next[0].userData.projectPoint(point2, false);
   if (!p2) return false;
   return p2;
 }
-function stepElimination(lineSegments, onMerge) {
+function stepElimination(lineSegments, findMinWidth = 0.1, onMerge) {
   const grid = createPointVirtualGrid(lineSegments);
-  const minWidth = 0.1;
   function getIntersInfo(line, point2) {
     const intersList = grid.queryPoint(point2, true);
     if (intersList.length == 0) return;
@@ -19338,7 +19337,7 @@ function stepElimination(lineSegments, onMerge) {
   for (let i = 0; i < lineSegments.length; i++) {
     const line = lineSegments[i];
     const len = line.length();
-    if (len > minWidth) continue;
+    if (len > findMinWidth) continue;
     const startInfo = getIntersInfo(line, line.start);
     if (!startInfo) continue;
     const endInfo = getIntersInfo(line, line.end);
@@ -19359,19 +19358,28 @@ function stepElimination(lineSegments, onMerge) {
     const parallel2 = startInfo.parallel.concat(endInfo.parallel);
     const newPoint = getNextPoint(mainInfo.firstPoint, mainInfo.firstLine, secondaryInfo.next, secondaryInfo.length);
     if (!newPoint) continue;
+    removeLines.push(line);
+    line.points.forEach((p2) => grid.remove(p2));
     if (parallel2.length === 0) {
       const oldLine = mainInfo.firstLine.clone();
       mainInfo.firstPoint.copy(newPoint);
       secondaryInfo.next.forEach((d2) => d2.point.copy(newPoint));
-      removeLines.push(secondaryInfo.firstLine, line);
-      line.points.concat(secondaryInfo.firstLine.points).forEach((p2) => grid.remove(p2));
+      removeLines.push(secondaryInfo.firstLine);
+      secondaryInfo.firstLine.points.forEach((p2) => grid.remove(p2));
       mainInfo.firstLine.points.forEach((p2) => grid.update(p2));
       if (typeof onMerge === "function") onMerge(mainInfo.firstLine, line, secondaryInfo.firstLine, oldLine);
+    } else {
+      secondaryInfo.firstPoint.copy(mainInfo.firstPoint);
+      secondaryInfo.firstOtherPoint.copy(newPoint);
+      secondaryInfo.next.forEach((d2) => d2.point.copy(newPoint));
+      startInfo.parallel.concat(endInfo.parallel).forEach((item) => item.point.copy(mainInfo.firstPoint));
+      secondaryInfo.firstLine.points.forEach((p2) => grid.update(p2));
+      secondaryInfo.next.forEach((d2) => grid.update(d2.point));
+      startInfo.parallel.concat(endInfo.parallel).forEach((item) => grid.update(item.point));
     }
   }
   const removeLinesSet = new Set(removeLines);
   lineSegments = lineSegments.filter((line) => !removeLinesSet.has(line));
-  lineSegments = lineSegmentClipping(lineSegments, 0);
   return lineSegments;
 }
 function repetitiveTask(count, callfun) {
@@ -19403,7 +19411,8 @@ function stepEliminationMerge(target, _, source, oldLine) {
   WallInsertObject.recomputed([target]);
 }
 function linesSmoothing(lines, _) {
-  repetitiveTask(1, () => lines = stepElimination(lines, stepEliminationMerge));
+  repetitiveTask(2, () => lines = stepElimination(lines, 0.1, stepEliminationMerge));
+  WallInsertObject.recomputed(lines);
   return lines;
 }
 const PRE_PROCESSOR = {

package/src/index3.js

@@ -17248,9 +17248,20 @@ class StorageHelper {
     if (typeof v === "number") return v;
     return Number(v);
   }
+  static getJson(key, defaultValue) {
+    const v = this.get(key, defaultValue);
+    try {
+      if (v) return JSON.parse(v);
+    } catch (error) {
+    }
+    return defaultValue;
+  }
   static set(key, vaalue) {
     localStorage.setItem(key, String(vaalue));
   }
+  static setJson(key, value) {
+    this.set(key, JSON.stringify(value));
+  }
 }
 const _hoisted_1 = ["innerHTML"];
 const _sfc_main = /* @__PURE__ */ defineComponent({

package/src/utils/algorithmsStructures/mergeUShapedPath.d.ts

@@ -0,0 +1,6 @@
+import { LineSegment } from './LineSegment';
+/** 合并U形路径
+ * @param lineSegments
+ * @returns
+ */
+export declare function mergeUShapedPath(lineSegments: LineSegment[], findMinWidth?: number, onMerge?: (mainLine: LineSegment, sortLine: LineSegment, secondaryLine: LineSegment, oldLine: LineSegment) => void): LineSegment<Record<string, any>>[];

package/src/utils/algorithmsStructures/stepElimination.d.ts

@@ -3,4 +3,4 @@ import { LineSegment } from './LineSegment';
  * @param lineSegments
  * @returns
  */
-export declare function stepElimination(lineSegments: LineSegment[], onMerge?: (mainLine: LineSegment, sortLine: LineSegment, secondaryLine: LineSegment, oldLine: LineSegment) => void): LineSegment<Record<string, any>>[];
+export declare function stepElimination(lineSegments: LineSegment[], findMinWidth?: number, onMerge?: (mainLine: LineSegment, sortLine: LineSegment, secondaryLine: LineSegment, oldLine: LineSegment) => void): LineSegment<Record<string, any>>[];

package/src/utils/tools/StorageHelper.d.ts

@@ -2,5 +2,7 @@ export declare class StorageHelper {
     static get(key: string, defaultValue?: any): any;
     static getBoolean(key: string, defaultValue?: boolean): boolean;
     static getNumber(key: string, defaultValue?: number): number;
+    static getJson<T = any>(key: string, defaultValue: T): any;
     static set(key: string, vaalue: any): void;
+    static setJson<T = any>(key: string, value: T): void;
 }

package/src/utils/tools/getJson.d.ts

@@ -0,0 +1,5 @@
+/**
+ * 获取json
+ * @param url
+ */
+export declare function getJson(url: string): Promise<any>;