|
|
@ -18,7 +18,6 @@ import { Database } from '../DatabaseServices/Database';
|
|
|
|
import { Board } from '../DatabaseServices/Entity/Board';
|
|
|
|
import { Board } from '../DatabaseServices/Entity/Board';
|
|
|
|
import { Entity } from '../DatabaseServices/Entity/Entity';
|
|
|
|
import { Entity } from '../DatabaseServices/Entity/Entity';
|
|
|
|
import { RoomHolePolyline } from '../DatabaseServices/Room/Entity/Wall/Hole/RoomHolePolyline';
|
|
|
|
import { RoomHolePolyline } from '../DatabaseServices/Room/Entity/Wall/Hole/RoomHolePolyline';
|
|
|
|
import { RoomWallRelevancyHoleParse } from '../DatabaseServices/Room/ParseService/Hole/RoomWallRelevancyHoleParse';
|
|
|
|
|
|
|
|
import { RoomParse } from '../DatabaseServices/Room/ParseService/RoomParseUtil';
|
|
|
|
import { RoomParse } from '../DatabaseServices/Room/ParseService/RoomParseUtil';
|
|
|
|
import { DisposeTextShapeCache } from '../DatabaseServices/Text/Text';
|
|
|
|
import { DisposeTextShapeCache } from '../DatabaseServices/Text/Text';
|
|
|
|
import { ViewportEntity } from '../DatabaseServices/ViewportEntity';
|
|
|
|
import { ViewportEntity } from '../DatabaseServices/ViewportEntity';
|
|
|
@ -27,6 +26,7 @@ import { GenerateRaycaster } from '../Editor/PointPick';
|
|
|
|
import { userConfig } from '../Editor/UserConfig';
|
|
|
|
import { userConfig } from '../Editor/UserConfig';
|
|
|
|
import { equaln, equalv3, GetBox, GetBoxArr, isIntersect, isPerpendicularityTo, ZAxis, ZeroVec } from '../Geometry/GeUtils';
|
|
|
|
import { equaln, equalv3, GetBox, GetBoxArr, isIntersect, isPerpendicularityTo, ZAxis, ZeroVec } from '../Geometry/GeUtils';
|
|
|
|
import { PlaneExt } from '../Geometry/Plane';
|
|
|
|
import { PlaneExt } from '../Geometry/Plane';
|
|
|
|
|
|
|
|
import { UpdateHoleFakerWallsAndUpdateDraw, UpdateWallHolesDataAndUpdateDraw } from '../Reactor/RoomHoleReactor';
|
|
|
|
import { DownPanelStore } from '../UI/Store/DownPanelStore';
|
|
|
|
import { DownPanelStore } from '../UI/Store/DownPanelStore';
|
|
|
|
import { LightStore } from '../UI/Store/RightPanelStore/LightStore';
|
|
|
|
import { LightStore } from '../UI/Store/RightPanelStore/LightStore';
|
|
|
|
import { CameraType, CameraUpdate } from './CameraUpdate';
|
|
|
|
import { CameraType, CameraUpdate } from './CameraUpdate';
|
|
|
@ -652,8 +652,10 @@ export class Viewer
|
|
|
|
let pre = Date.now();
|
|
|
|
let pre = Date.now();
|
|
|
|
|
|
|
|
|
|
|
|
let room = new RoomParse(false, undefined, true).Parse();
|
|
|
|
let room = new RoomParse(false, undefined, true).Parse();
|
|
|
|
|
|
|
|
for (let wall of room.walls) UpdateWallHolesDataAndUpdateDraw(wall);
|
|
|
|
let holes = app.Database.ModelSpace.Entitys.filter(e => e instanceof RoomHolePolyline) as RoomHolePolyline[];
|
|
|
|
let holes = app.Database.ModelSpace.Entitys.filter(e => e instanceof RoomHolePolyline) as RoomHolePolyline[];
|
|
|
|
new RoomWallRelevancyHoleParse().Parse(holes, room.walls);
|
|
|
|
for (let hole of holes) UpdateHoleFakerWallsAndUpdateDraw(hole);
|
|
|
|
|
|
|
|
// new RoomWallRelevancyHoleParse().Parse(holes, room.walls); //保持了墙和洞的关联关系,所以不再需要这个
|
|
|
|
|
|
|
|
|
|
|
|
for (let index = 0; index < db.ModelSpace.Entitys.length; index++)
|
|
|
|
for (let index = 0; index < db.ModelSpace.Entitys.length; index++)
|
|
|
|
{
|
|
|
|
{
|
|
|
|