architwin 1.14.12 → 1.14.14

package/lib/loaders/polydrawerLoader.js

@@ -40,6 +40,8 @@ export class TubeLine {
             polygonData: undefined,
             renderPolygonOnAdd: true,
             targetUUID: undefined,
+            isWindowEditing: false,
+            objectIndex: undefined
         };
         //@ts-expect-error
         this.outputs = {
@@ -87,7 +89,9 @@ export class TubeLine {
                             drawingMode: this.inputs.drawingMode,
                             targetIndex: this.inputs.targetIndex,
                             polygonData: this.inputs.polygonData,
-                            targetUUID: this.inputs.targetUUID
+                            targetUUID: this.inputs.targetUUID,
+                            isWindowEditing: this.inputs.isWindowEditing,
+                            objectIndex: this.inputs.objectIndex,
                         };
                         renderPolygon(this.inputs.path, options);
                     }
@@ -496,8 +500,7 @@ export class BufferGeometry {
             floorName: '',
             floorColor: 0x0000ff,
             wallColor: 0xffd150,
-            // windowColor : 0xEAF2EF,
-            windowColor: 0xC09672,
+            windowColor: 0x275c8b,
             floorOpacity: 0.3,
             wallOpacity: 0.6,
             visible: true,
@@ -512,7 +515,8 @@ export class BufferGeometry {
             targetIndex: undefined,
             targetUUID: undefined,
             deductWindowFromWallArea: true,
-            windowOutlineColor: 0x253D5B
+            windowOutlineColor: 0x65BBE9,
+            isWindowEditing: false
         };
         this.emits = {
             changed: true,
@@ -694,22 +698,17 @@ export class BufferGeometry {
                         const windowsPolyData = polyData.walls.reduce((acc, wall, index) => {
                             if (wall.windows && wall.windows.length > 0) {
                                 acc = [...acc, ...wall.windows];
-                                wallDataArray[index].windows = wall.windows;
-                                // if (this.inputs.deductWindowFromWallArea) {
-                                //   // Calculate total window area for this wall
-                                //   let totalWindowArea = 0;
-                                //   if (wall.windows && wall.windows.length > 0) {
-                                //     totalWindowArea = wall.windows.reduce((sum, window) => {
-                                //       return sum + (window.area || 0);
-                                //     }, 0);
-                                //   }
-                                //   // Subtract window area from wall area
-                                //   wallDataArray[index].area = Math.max(0, wallDataArray[index].area - totalWindowArea);
-                                // }
+                                wallDataArray[index].windows = wall.windows.map(window => {
+                                    window.wall_uuid = wall.uuid;
+                                    return window;
+                                });
                             }
                             return acc;
                         }, []);
-                        this.renderWindows(windowsPolyData);
+                        //this.renderWindows(windowsPolyData)
+                        for (let i = 0; i < polyData.walls.length; i++) {
+                            this.renderWindows(polyData.walls[i].windows);
+                        }
                     }
                 }
                 catch (error) {
@@ -755,7 +754,7 @@ export class BufferGeometry {
                         };
                         windowDataArray.push(windowEdges);
                     }
-                    let windowName = `${this.inputs.uuid}_window-${this.inputs.targetIndex + 1}`;
+                    let windowName = `Window ${this.inputs.targetIndex + 1}`;
                     let windowMaterial = undefined;
                     if (polyData.walls[targetWallIndex] && polyData.walls[targetWallIndex].windows[this.inputs.targetIndex]) {
                         const currWindow = polyData.walls[targetWallIndex].windows[this.inputs.targetIndex];
@@ -768,6 +767,7 @@ export class BufferGeometry {
                         path: this.inputs.path,
                         name: windowName,
                         index: this.inputs.targetIndex,
+                        wall_uuid: this.inputs.targetUUID,
                         options: {
                             color: this.inputs.windowColor,
                             is_visible: true,
@@ -792,7 +792,7 @@ export class BufferGeometry {
                                 return sum + (window.area || 0);
                             }, 0);
                         }
-                        polyData.walls[targetWallIndex].area = Math.max(0, polyData.walls[targetWallIndex].area - totalWindowArea);
+                        polyData.walls[targetWallIndex].netArea = Math.max(0, polyData.walls[targetWallIndex].area - totalWindowArea);
                     }
                     partitionData = polyData;
                 }
@@ -965,6 +965,7 @@ export class BufferGeometry {
             wallMesh.name = this.inputs.uuid != '' ? `${this.inputs.uuid}_wall-${i}` : `wall-${i}`;
             const wallLength = new THREE.Vector3(endPoint.x - startPoint.x, endPoint.y - startPoint.y, endPoint.z - startPoint.z).length();
             let wallArea = wallLength * WALL_HEIGHT;
+            let netWallArea = wallArea;
             if (this.inputs.deductWindowFromWallArea && metadata) {
                 const currentWallIndex = wallDataArray.length == 0 ? wallDataArray.length : wallDataArray.length - 1;
                 let totalWindowArea = 0;
@@ -975,7 +976,7 @@ export class BufferGeometry {
                     }, 0);
                 }
                 // Subtract window area from wall area
-                wallArea = Math.max(0, wallArea - totalWindowArea);
+                netWallArea = Math.max(0, wallArea - totalWindowArea);
             }
             // Create wall label
             let wallMaterial;
@@ -1083,6 +1084,7 @@ export class BufferGeometry {
                 },
                 index: i,
                 area: wallArea,
+                netArea: netWallArea,
                 width: wallDimensions.width,
                 perimeter: wallDimensions.perimeter,
                 wall_height: WALL_HEIGHT,
@@ -1151,10 +1153,11 @@ export class BufferGeometry {
                     transparent: true,
                     depthWrite: false
                 }));
-                windowMesh.name = windows[i].uuid ? `${windows[i].uuid}_window` : `window-${i}`;
+                windowMesh.name = windows[i].wall_uuid ? `${windows[i].wall_uuid}_window-${i}` : `window-${i}`;
                 const outlineGeometry = new THREE.EdgesGeometry(windowGeometry);
                 const outlineMaterial = new THREE.LineBasicMaterial({ color: this.inputs.windowOutlineColor, linewidth: 3 });
                 const outlineMesh = new THREE.LineSegments(outlineGeometry, outlineMaterial);
+                outlineMesh.name = windowMesh.name;
                 windowMesh.add(outlineMesh);
                 // Add window center label if material is defined
                 if (windows[i].material || windows[i].name) {
@@ -1205,8 +1208,9 @@ export class BufferGeometry {
                             .add(p0);
                         const labelOffset = 0.01;
                         windowCenterLabel.position.copy(center3D).addScaledVector(normal.clone().negate(), labelOffset);
+                        windowCenterLabel.name = windowMesh.name;
                         windowCenterLabel.lookAt(windowCenterLabel.position.clone().add(normal.clone().negate()));
-                        windowCenterLabel.name = windows[i].uuid ? `${windows[i].uuid}_windowLabel` : `windowLabel-${i}`;
+                        //windowCenterLabel.name = windows[i].uuid ? `${windows[i].uuid}_windowLabel` : `windowLabel-${i}`;
                         this.groupedMesh.add(windowCenterLabel);
                     }
                     catch (e) {

package/lib/types.d.ts

@@ -266,6 +266,7 @@ export interface IObjectData {
         node?: Scene.INode;
         type?: string;
         index?: number;
+        wallUUID?: string;
     }[];
 }
 export interface IObjectFilters {
@@ -462,6 +463,8 @@ export interface ComponentOptions {
     targetIndex?: number | undefined;
     targetUUID?: string | undefined;
     deductWindowFromWallArea?: boolean | undefined;
+    isWindowEditing?: boolean | undefined;
+    objectIndex?: number | undefined;
 }
 export interface VectorCoords {
     object_position: Vector3;
@@ -1110,6 +1113,7 @@ export interface WallPolyData {
     };
     material?: string | undefined;
     area: number;
+    netArea?: number | undefined;
     perimeter: number | undefined;
     width: number | undefined;
     wall_height: number;
@@ -1119,6 +1123,7 @@ export interface WallPolyData {
 export interface WindowPolyData {
     path: Array<Vector3>;
     uuid?: string | undefined;
+    wall_uuid?: string | undefined;
     name?: string | undefined;
     index?: number | undefined;
     options?: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "architwin",
-  "version": "1.14.12",
+  "version": "1.14.14",
   "description": "ArchiTwin Library for Matterport",
   "main": "./lib/architwin.js",
   "types": "./lib/architwin.d.ts",

package/static/atwinui.css

@@ -1460,11 +1460,6 @@
     padding: 10px 10px 5px 10px !important;
 }
 
-.at_disabled {
-    pointer-events: none;
-    opacity: 0.4;
-}
-
 /* Basic styling for the tree */
 /* .at_tree {
     list-style-type: none;
@@ -1545,7 +1540,7 @@
 
 .at_room_tree_child li {
     margin: 5px 0;
-    padding-left: 30px;
+    margin-left: 30px;
     padding-right: 5px;
     display: flex;
     justify-content: space-between;
@@ -2295,10 +2290,16 @@ dialog#at-screen-share-request-modal::backdrop {
 }
 
 .at_dropdown_item .at_subitem_right {
-    cursor: pointer;
+    cursor: default;
     display: flex;
 }
 
+.at_dropdown_item .at_subitem_right .mdi-check,
+.at_dropdown_item .at_subitem_right .mdi-pencil,
+.at_dropdown_item .at_subitem_right .mdi-delete-outline {
+    cursor: pointer;
+}
+
 .at_dropdown_item .at_subitem_right span:hover{
     color: var(--bg-accent-azusa)
 }
@@ -2405,8 +2406,40 @@ dialog#at-screen-share-request-modal::backdrop {
 
 .at_partition_wall_row_item {
     cursor: pointer;
+    display: flex;
+    flex-direction: column;
+}
+
+.at_partition_child_header {
+    width: 100%;
+    padding-left: 5px;
+    padding-right: 5px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
 }
 
 .at_partition_floor_row_item {
-     cursor: pointer;
+    cursor: pointer;
+}
+
+.at_partition_child_expand_icon {
+    padding: unset !important;
+}
+
+li.at_partition_floor_row_item,
+li.at_partition_wall_row_item {
+    padding-right: unset !important;
+}
+
+.at_partition_child_header.selected {
+    padding-right: 5px !important;
+}
+
+.at_hidden {
+    display: none;
+}
+
+.at_wall_window_row_item.selected {
+    padding-left: 5px;
 }

package/static/utility.css

@@ -283,7 +283,7 @@
 }
 
 .at_disabled {
-  pointer-events: none;
+  pointer-events: none !important;
   opacity: 0.6;
 }