!1511 优化:干涉检查返回的数据结构

__test__/Interfere/interfere.test.ts

@@ -8,7 +8,7 @@ async function Check(data: any, count: number)
     for (let i = 0; i < boards.length; i++)
         boards[i].objectId = new ObjectId(i);
     await CheckInterfereTool.GetInstance().Check(boards as any[]);
-    expect(CheckInterfereTool.GetInstance().objMap.size).toBe(count);
+    expect(CheckInterfereTool.GetInstance().objMap.length).toBe(count);
 }
 
 

src/Add-on/Erp/ErpCommands.ts

@@ -183,10 +183,10 @@ async function ExecChaiDan(chaiDanRoute: ErpRoutes)
             originEns.add(b.__OriginalEnt__ ?? b);
         CheckInterfereTool.GetInstance().Check([...originEns, ...selction.metalsList]).then(objMap =>
         {
-            if (objMap.size > 0)
+            if (objMap.length > 0)
             {
                 AppToaster.show({
-                    message: `有${objMap.size}组实体干涉了,请退出检查确认`,
+                    message: `有${objMap.length}组实体干涉了,请退出检查确认`,
                     timeout: 5000,
                     intent: Intent.DANGER,
                 });

src/Add-on/interfere.ts

@@ -61,7 +61,7 @@ export class Interfere implements Command
 
         let objMap = this.checkInterfereTool.objMap;
 
-        if (objMap.size === 0)
+        if (objMap.length === 0)
         {
             AppToaster.show({
                 message: "未找到干涉对象",

src/Common/InterfereUtil.ts

@@ -35,7 +35,7 @@ export class CheckInterfereTool
     }
 
     entitySet: Set<Solid3D> = new Set();
-    objMap: Map<Mesh, [Solid3D, Solid3D]> = new Map();
+    objMap: [Mesh, [Solid3D, Solid3D]][] = [];
     GetEntitys(selectEnts: (HardwareCompositeEntity | ExtrudeSolid | SweepSolid)[])
     {
         let ens: Solid3D[] = [];
@@ -68,7 +68,7 @@ export class CheckInterfereTool
         let entitySet = this.entitySet;
         let objMap = this.objMap;
         entitySet.clear();
-        objMap.clear();
+        objMap.length = 0;
 
         for (let i = 0; i < ens.length; i++)
         {
@@ -170,7 +170,7 @@ export class CheckInterfereTool
                 {
                     let geo = CSG2Geometry(interCsg).applyMatrix4(e1.OCSNoClone);
                     let mesh = new Mesh(geo, this._MeshMaterial);
-                    objMap.set(mesh, [e1, e2]);
+                    objMap.push([mesh, [e1, e2]]);
                 }
             }
         }
@@ -183,7 +183,7 @@ export class CheckInterfereTool
     Clear()
     {
         this.entitySet.clear();
-        this.objMap.clear();
+        this.objMap.length = 0;
     }
 
     csgCache: Map<Entity, CSG> = new Map();

src/UI/Components/Modal/InterfereModal.tsx

@@ -2,7 +2,7 @@ import { Button, Card, Classes, Intent } from '@blueprintjs/core';
 import { observable } from 'mobx';
 import { observer } from 'mobx-react';
 import React, { Component } from 'react';
-import { Box3, Mesh, Vector3 } from 'three';
+import { Mesh } from 'three';
 import { app } from '../../../ApplicationServices/Application';
 import { Solid3D } from '../../../Common/InterfereUtil';
 import { ColorMaterial } from './../../../Common/ColorPalette';
@@ -12,7 +12,7 @@ import { CommonModal } from './ModalContainer';
 interface IInterfereProps
 {
     count: number,
-    data: Map<Mesh, [Solid3D, Solid3D]>;
+    data: [Mesh, [Solid3D, Solid3D]][];
 }
 
 @observer
@@ -42,7 +42,7 @@ export class InterfereModal extends Component<IInterfereProps, {}> {
                         <h5>共{count}个干涉对象</h5>
                         <div className="flex-between">
                             <span>找到干涉点对</span>
-                            <span>{data.size}</span>
+                            <span>{data.length}</span>
                         </div>
                     </div>
                     <div className="flex-col" style={{ width: "40%" }}>
@@ -57,7 +57,7 @@ export class InterfereModal extends Component<IInterfereProps, {}> {
                             intent={Intent.SUCCESS}
                             onClick={this.next}
                         />{
-                            this.currentIndex >= 0 && <span>第{this.currentIndex + 1}个，共{data.size}个</span>
+                            this.currentIndex >= 0 && <span>第{this.currentIndex + 1}个，共{data.length}个</span>
                         }
                     </div>
                 </Card>
@@ -67,40 +67,35 @@ export class InterfereModal extends Component<IInterfereProps, {}> {
     private close = () =>
     {
         app.Editor.ModalManage.Destory();
-        app.Viewer.OutlinePass.selectedObjects = [];
+        app.Editor.SetSelection([]);
     };
-    private restore = (os: Mesh[]) =>
+    private restore = () =>
     {
-        for (let o of os)
+        for (let lst of this.props.data)
-            o.material = ColorMaterial.GetConceptualMaterial(1);
+        {
-        app.Viewer.OutlinePass.selectedObjects = [];
+            let mesh = lst[0];
+            mesh.material = ColorMaterial.GetConceptualMaterial(1);
+        }
     };
     private next = () =>
     {
-        let os = [...this.props.data.keys()];
+        this.restore();
-        this.restore(os);
+        this.currentIndex = FixIndex(this.currentIndex + 1, this.props.data);
-        this.currentIndex = FixIndex(this.currentIndex + 1, os.length);
+        this.update(this.props.data[this.currentIndex]);
-        this.update(os[this.currentIndex]);
     };
     private previos = () =>
     {
-        let os = [...this.props.data.keys()];
+        this.restore();
-        this.restore(os);
+        this.currentIndex = FixIndex(this.currentIndex - 1, this.props.data);
-        if (this.currentIndex < 0)
+        if (this.currentIndex < 0) this.currentIndex = 0;
-            this.currentIndex = 0;
+        this.update(this.props.data[this.currentIndex]);
-        this.currentIndex = FixIndex(this.currentIndex - 1, os.length);
-        this.update(os[this.currentIndex]);
     };
-    private update = (o: Mesh) =>
+    private update = (group: [Mesh, [Solid3D, Solid3D]]) =>
     {
-        o.material = ColorMaterial.GetConceptualMaterial(5);
+        if (!group) return;
-        let box = new Box3();
+        let [mesh, ens] = group;
-        app.Viewer.OutlinePass.selectedObjects = this.props.data.get(o).map(e =>
+        mesh.material = ColorMaterial.GetConceptualMaterial(5);
-        {
+        app.Editor.SetSelection(ens);
-            box.union(e.BoundingBox);
+        app.Viewer.ZoomtoEntitys(ens);
-            return e.DrawObject;
-        });
-        app.Viewer.CameraCtrl.ZoomExtensBox3(box);
-        app.Viewer.Zoom(1, box.getCenter(new Vector3));
     };
 }