!2220 优化:画左右侧板和模块插入时允许吸附冻结实体

pull/2222/MERGE
林三 1 year ago committed by ChenX
parent ed2c15cf3c
commit daeb607d81

@ -13,7 +13,7 @@ import { JigUtils } from '../../Editor/JigUtils';
import { PromptPointResult, PromptStatus } from '../../Editor/PromptResult'; import { PromptPointResult, PromptStatus } from '../../Editor/PromptResult';
import { ParsePlaceEntitys } from '../../Editor/TranstrolControl/ParsePlaceEntitys'; import { ParsePlaceEntitys } from '../../Editor/TranstrolControl/ParsePlaceEntitys';
import { ParsePlacePos, ParsePlacePosWithTemplate, ParsePlacePosWithTemplate2 } from '../../Editor/TranstrolControl/ParsePlacePos'; import { ParsePlacePos, ParsePlacePosWithTemplate, ParsePlacePosWithTemplate2 } from '../../Editor/TranstrolControl/ParsePlacePos';
import { equalv3, ZeroVec } from '../../Geometry/GeUtils'; import { ZeroVec, equalv3 } from '../../Geometry/GeUtils';
import { PointSelectSpaceClamp } from '../../Geometry/SpaceParse/PointSelectSpaceClamp'; import { PointSelectSpaceClamp } from '../../Geometry/SpaceParse/PointSelectSpaceClamp';
import { BoardModal } from '../../UI/Components/Board/BoardModal'; import { BoardModal } from '../../UI/Components/Board/BoardModal';
import { BoardModalType } from "../../UI/Components/Board/BoardModalType"; import { BoardModalType } from "../../UI/Components/Board/BoardModalType";
@ -160,6 +160,7 @@ export class DrawLeftRight implements Command
ptRes = await app.Editor.GetPoint({ ptRes = await app.Editor.GetPoint({
Msg: "请拾取基点:", Msg: "请拾取基点:",
Raycast: true, Raycast: true,
RaycastFilter: { selectFreeze: true },
KeyWordList: [ KeyWordList: [
{ key: "S", msg: "插入空间" }, { key: "S", msg: "插入空间" },
{ key: "B", msg: "基点" }, { key: "B", msg: "基点" },

@ -18,7 +18,7 @@ import { JigUtils } from "../../../Editor/JigUtils";
import { PromptStatus } from "../../../Editor/PromptResult"; import { PromptStatus } from "../../../Editor/PromptResult";
import { ParsePlaceEntitys } from "../../../Editor/TranstrolControl/ParsePlaceEntitys"; import { ParsePlaceEntitys } from "../../../Editor/TranstrolControl/ParsePlaceEntitys";
import { ParsePlacePos, ParsePlacePosWithTemplate, ParsePlacePosWithTemplate2 } from "../../../Editor/TranstrolControl/ParsePlacePos"; import { ParsePlacePos, ParsePlacePosWithTemplate, ParsePlacePosWithTemplate2 } from "../../../Editor/TranstrolControl/ParsePlacePos";
import { equaln, equalv3, ZeroVec } from "../../../Geometry/GeUtils"; import { ZeroVec, equaln, equalv3 } from "../../../Geometry/GeUtils";
import { DownPanelStore } from "../../Store/DownPanelStore"; import { DownPanelStore } from "../../Store/DownPanelStore";
import { IGetRoomInfo } from "./GetRoomCabName"; import { IGetRoomInfo } from "./GetRoomCabName";
@ -162,6 +162,7 @@ export async function InsertTemplateByBasePoint(template: TemplateRecord, roomIn
], ],
AllowNone: true, AllowNone: true,
Raycast: true, Raycast: true,
RaycastFilter: { selectFreeze: true },
Callback: ApplyPos Callback: ApplyPos
}); });
if (ptRes.Status === PromptStatus.Keyword) if (ptRes.Status === PromptStatus.Keyword)

Loading…
Cancel
Save