bill 4 年之前
父節點
當前提交
2f018fc8c8
共有 3 個文件被更改,包括 8 次插入7 次删除
  1. 3 3
      src/CAD/calcRoom.js
  2. 2 2
      src/CAD/core/additional/calcRoom.js
  3. 3 2
      src/CAD/core/base/processing/toEle.ts

+ 3 - 3
src/CAD/calcRoom.js

@@ -407,11 +407,11 @@ export default function calcRoom(data, cad) {
         pointEles: data.room[i].ground.map(point => cad.processing.points.find(({id}) => id === point.id).ele.real),
         lineEles: _roomsWalls[i].map(line => cad.processing.lines.find(({id}) => id === line.id).ele.real),
         center: point.real,
-        pointData: _roomsWalls[i],
-        lineData: _roomsPoints[i]
+        pointData: _roomsPoints[i],
+        lineData: _roomsWalls[i]
       }
 
-      console.log(ground)
+      console.log(_roomsPoints[i], _roomsPoints[i])
     })
   }
 

+ 2 - 2
src/CAD/core/additional/calcRoom.js

@@ -310,8 +310,8 @@ export default function calcRoom(data, cad) {
         pointEles: data.room[i].ground.map(point => cad.processing.points.find(({id}) => id === point.id).ele.real),
         lineEles: _roomsWalls[i].map(line => cad.processing.lines.find(({id}) => id === line.id).ele.real),
         center: point.real,
-        pointData: _roomsWalls[i],
-        lineData: _roomsPoints[i]
+        pointData: _roomsPoints[i],
+        lineData: _roomsWalls[i]
       }
 
       console.log(ground)

+ 3 - 2
src/CAD/core/base/processing/toEle.ts

@@ -304,9 +304,10 @@ export const methods: That = {
     let count = 0
     this.data = data
 
+    console.log(wall)
     vertex.forEach(a => this.addPoint(a))
-    wall.forEach(({p1, p2, border, exterior}) => {
-      this.addLine({p1, p2, id: ++count, border: border, exterior: exterior, isOut: false})
+    wall.forEach(({p1, p2, id, border, exterior}) => {
+      this.addLine({p1, p2, id: id, border: border, exterior: exterior, isOut: false})
     });
 
     [window, door, column, slideDoor, groundCase, bayCase, doubleDoor] =