diff --git a/__test__/ALG/region.test.ts b/__test__/ALG/region.test.ts index 2ee66041e..427ddc81f 100644 --- a/__test__/ALG/region.test.ts +++ b/__test__/ALG/region.test.ts @@ -1,19 +1,17 @@ import { Vector3 } from 'three'; -import { CADFiler } from '../../src/DatabaseServices/CADFiler'; -import { Curve } from '../../src/DatabaseServices/Entity/Curve'; import { Line } from '../../src/DatabaseServices/Entity/Line'; -import { RegionParse } from './../../src/Geometry/RegionParse'; import { LoadCurvesFromFileData } from '../Utils/LoadEntity.util'; +import { RegionParse } from './../../src/Geometry/RegionParse'; function expectReg(alg: RegionParse) { - let data1 = alg.m_RegionsInternal.map(o => + let data1 = alg.RegionsInternal.map(o => { let res = []; o.forEach(r => { res.push(r.to.position.toArray()) }) return res; }); - let data2 = alg.m_RegionsOutline.map(o => + let data2 = alg.RegionsOutline.map(o => { let res = []; o.forEach(r => { res.push(r.to.position.toArray()) }) @@ -43,10 +41,10 @@ test('两个相连的区域', () => culist.push(l1, l2, l3, l4, l5, l6, l7); let g = new RegionParse(culist); - g.m_RegionsOutline.length //? - g.m_RegionsInternal.length //? - expect(g.m_RegionsOutline.length).toBe(2); - expect(g.m_RegionsInternal.length).toBe(0); + g.RegionsOutline.length //? + g.RegionsInternal.length //? + expect(g.RegionsOutline.length).toBe(2); + expect(g.RegionsInternal.length).toBe(0); expectReg(g); }); @@ -67,10 +65,10 @@ test('区域内有分割-三角形', () => culist.push(l1, l2, l3, l4, l5); let g = new RegionParse(culist); - g.m_RegionsOutline.length //? - g.m_RegionsInternal.length //? - expect(g.m_RegionsOutline.length).toBe(1); - expect(g.m_RegionsInternal.length).toBe(2); + g.RegionsOutline.length //? + g.RegionsInternal.length //? + expect(g.RegionsOutline.length).toBe(1); + expect(g.RegionsInternal.length).toBe(2); expectReg(g); }); @@ -90,10 +88,10 @@ test('区域有延长线', () => culist.push(l1, l2, l3, l4, l5, l6); let g = new RegionParse(culist); - g.m_RegionsOutline.length //? - g.m_RegionsInternal.length //? - expect(g.m_RegionsOutline.length).toBe(1); - expect(g.m_RegionsInternal.length).toBe(2); + g.RegionsOutline.length //? + g.RegionsInternal.length //? + expect(g.RegionsOutline.length).toBe(1); + expect(g.RegionsInternal.length).toBe(2); expectReg(g); }); @@ -115,10 +113,10 @@ test('区域内多条线', () => culist.push(l1, l2, l3, l4, l5, l6, l7); let g = new RegionParse(culist); - g.m_RegionsOutline.length //? - g.m_RegionsInternal.length //? - expect(g.m_RegionsOutline.length).toBe(1); - expect(g.m_RegionsInternal.length).toBe(3); + g.RegionsOutline.length //? + g.RegionsInternal.length //? + expect(g.RegionsOutline.length).toBe(1); + expect(g.RegionsInternal.length).toBe(3); expectReg(g); }); @@ -142,10 +140,10 @@ test('包含区域', () => culist.push(l1, l2, l3, l4, l5, l6, l7, l8); let g = new RegionParse(culist); - g.m_RegionsOutline.length //? - g.m_RegionsInternal.length //? - expect(g.m_RegionsOutline.length).toBe(2); - expect(g.m_RegionsInternal.length).toBe(0); + g.RegionsOutline.length //? + g.RegionsInternal.length //? + expect(g.RegionsOutline.length).toBe(2); + expect(g.RegionsInternal.length).toBe(0); expectReg(g); }); @@ -173,10 +171,10 @@ test('测试复杂形状', () => ] let g = new RegionParse(culist); - g.m_RegionsOutline.length //? - g.m_RegionsInternal.length //? - expect(g.m_RegionsOutline.length).toBe(1); - expect(g.m_RegionsInternal.length).toBe(8); + g.RegionsOutline.length //? + g.RegionsInternal.length //? + expect(g.RegionsOutline.length).toBe(1); + expect(g.RegionsInternal.length).toBe(8); expectReg(g); }); @@ -199,10 +197,10 @@ test('矩形套矩形', () => ] let g = new RegionParse(culist); - g.m_RegionsOutline.length //? - g.m_RegionsInternal.length //? - expect(g.m_RegionsOutline.length).toBe(1); - expect(g.m_RegionsInternal.length).toBe(4); + g.RegionsOutline.length //? + g.RegionsInternal.length //? + expect(g.RegionsOutline.length).toBe(1); + expect(g.RegionsInternal.length).toBe(4); expectReg(g); }); @@ -221,10 +219,10 @@ test('保护伞', () => new Line(new Vector3().fromArray([-0.33498759305210946, 0.5583126550868487, 0]), new Vector3().fromArray([-2.0843672456575684, 1.9106699751861045, 0])), ] let g = new RegionParse(culist); - g.m_RegionsOutline.length //? - g.m_RegionsInternal.length //? - expect(g.m_RegionsOutline.length).toBe(3); - expect(g.m_RegionsInternal.length).toBe(0); + g.RegionsOutline.length //? + g.RegionsInternal.length //? + expect(g.RegionsOutline.length).toBe(3); + expect(g.RegionsInternal.length).toBe(0); expectReg(g); }); @@ -237,6 +235,6 @@ test('带圆弧的复杂图形测试', () => ) let g = new RegionParse(cus); - expect(g.m_RegionsInternal.length).toBe(7); - expect(g.m_RegionsOutline.length).toBe(1); + expect(g.RegionsInternal.length).toBe(7); + expect(g.RegionsOutline.length).toBe(1); }); diff --git a/__test__/Fillet/polyline.test.ts b/__test__/Fillet/polyline.test.ts index 640ec19e5..18e657469 100644 --- a/__test__/Fillet/polyline.test.ts +++ b/__test__/Fillet/polyline.test.ts @@ -66,7 +66,7 @@ function TestFilletPolyline( ) { let pl = LoadEntityFromFileData(curveData)[0] as Polyline; - fillet.m_FilletRadius = radius; + fillet.FilletRadius = radius; let es1 = new PromptEntityResult(pl, undefined); diff --git a/src/Add-on/AddPtOnBoard.ts b/src/Add-on/AddPtOnBoard.ts index c9322ce06..1795a54b1 100644 --- a/src/Add-on/AddPtOnBoard.ts +++ b/src/Add-on/AddPtOnBoard.ts @@ -10,19 +10,19 @@ abstract class PtOnBoard implements Command prompt: string; async exec() { - app.m_Viewer._GripScene.visible = true; + app.Viewer.GripScene.visible = true; //获取板件 - let br = app.m_Editor.m_SelectCtrl.SelectSet.SelectEntityList[0] as Board; + let br = app.Editor.SelectCtrl.SelectSet.SelectEntityList[0] as Board; if (!br || !(br instanceof Board)) return; - let olducs = app.m_Editor.UCSMatrix; - app.m_Editor.UCSMatrix = br.OCS; + let olducs = app.Editor.UCSMatrix; + app.Editor.UCSMatrix = br.OCS; //增删点 while (true) { - let ptRes = await app.m_Editor.GetPoint({ + let ptRes = await app.Editor.GetPoint({ AllowDrawRubberBand: true, AllowNone: true, Msg: `点击需要${this.prompt}的点` @@ -31,16 +31,16 @@ abstract class PtOnBoard implements Command if (ptRes.Status !== PromptStatus.OK) break; - app.m_Database.hm.StartMark(); + app.Database.hm.StartMark(); let newContour = this.operation(br, ptRes); if (newContour === undefined) continue; br.ContourCurve = newContour; - let brObj = app.m_Editor.m_SelectCtrl.SelectSet.SelectObjectList[0]; - app.m_Viewer._GripScene.Update(brObj); + let brObj = app.Editor.SelectCtrl.SelectSet.SelectObjectList[0]; + app.Viewer.GripScene.Update(brObj); } - app.m_Editor.UCSMatrix = olducs; + app.Editor.UCSMatrix = olducs; } abstract operation(br: Board, ptRes: PromptPointResult): Polyline; } @@ -58,12 +58,12 @@ export class AddPtOnBoard extends PtOnBoard let index = brContour.GetParamAtPoint(npt); if (isNaN(index)) { - app.m_Editor.Prompt('加点出错了'); + app.Editor.Prompt('加点出错了'); return undefined; } if (index % 1 === 0) { - app.m_Editor.Prompt('检测加点位置在点的位置.加点失败.'); + app.Editor.Prompt('检测加点位置在点的位置.加点失败.'); return undefined; } newPt.applyMatrix4(brContour.OCSInv); @@ -90,19 +90,19 @@ export class DeletePtOnBoard extends PtOnBoard } if (!pindex) { - app.m_Editor.Prompt("该位置没有点，无法删除"); + app.Editor.Prompt("该位置没有点，无法删除"); return undefined; } newPt.applyMatrix4(br.OCSInv).setZ(0); let index = brContour.GetParamAtPoint(newPt); if (isNaN(index)) { - app.m_Editor.Prompt('删点出错了'); + app.Editor.Prompt('删点出错了'); return undefined; } if (index % 1 === 0.5) { - app.m_Editor.Prompt('中点无法删除'); + app.Editor.Prompt('中点无法删除'); return undefined; } brContour.RemoveVertexAt(index); diff --git a/src/Add-on/Array.ts b/src/Add-on/Array.ts index 8c57a7be0..fa52fd578 100644 --- a/src/Add-on/Array.ts +++ b/src/Add-on/Array.ts @@ -99,8 +99,8 @@ export class ArrayStore extends Singleton } _Return(state: number) { - app.m_Editor.m_ModalManage.m_PromisRes({ Status: state }); - app.m_Editor.m_ModalManage.Clear(); + app.Editor.ModalManage.m_PromisRes({ Status: state }); + app.Editor.ModalManage.Clear(); } } export class Command_Array implements Command @@ -111,7 +111,7 @@ export class Command_Array implements Command { let option = this.arrayStore.m_Option; - let ssRes = await app.m_Editor.GetSelection({ Msg: "请选择阵列对象:", UseSelect: true }); + let ssRes = await app.Editor.GetSelection({ Msg: "请选择阵列对象:", UseSelect: true }); if (ssRes.Status !== PromptStatus.OK) return; let ss = ssRes.SelectSet; @@ -121,25 +121,25 @@ export class Command_Array implements Command unionBoxs.union(selectEnt.BoundingBox); //渲染模态框 - app.m_Editor.m_ModalManage.RenderModal(ArrayModal, ModalPosition.Right, { store: this.arrayStore }); + app.Editor.ModalManage.RenderModal(ArrayModal, ModalPosition.Right, { store: this.arrayStore }); //鼠标点选 while (true) { - app.m_Database.hm.StartMark(); + app.Database.hm.StartMark(); - let res = await app.m_Editor.m_ModalManage.Wait(); + let res = await app.Editor.ModalManage.Wait(); if (res.Status === ModalState.Cancel) return; //数据准备 - let item_total = option.itemTotal; - let fill_angle = option.fillAngle; - let between_angle = option.betweenAngle; - let ucsInv = app.m_Editor.UCSMatrixInv; + let itemTotal = option.itemTotal; + let fillAngle = option.fillAngle; + let betweenAngle = option.betweenAngle; + let ucsInv = app.Editor.UCSMatrixInv; switch (res.Status) { case Pick.centerPoint: - let ptRes1 = await app.m_Editor.GetPoint({ Msg: "请选择中心点:" }); + let ptRes1 = await app.Editor.GetPoint({ Msg: "请选择中心点:" }); if (ptRes1.Status === PromptStatus.OK) { let pt1Ucs = ptRes1.Point.applyMatrix4(ucsInv); @@ -149,7 +149,7 @@ export class Command_Array implements Command break; case Pick.rowOffset: - let disRes1 = await app.m_Editor.GetDistance({ + let disRes1 = await app.Editor.GetDistance({ Msg: "请指定行偏移:", CalcDistance: (baseP, p: Vector3) => { @@ -161,7 +161,7 @@ export class Command_Array implements Command break; case Pick.colOffset: - let disRes2 = await app.m_Editor.GetDistance({ + let disRes2 = await app.Editor.GetDistance({ Msg: "请指定列偏移:", CalcDistance: (baseP, p: Vector3) => { @@ -173,81 +173,81 @@ export class Command_Array implements Command break; case Pick.arrayAngle: - let ptRes4 = await app.m_Editor.GetAngle({ Msg: "请指定阵列角度:" }); + let ptRes4 = await app.Editor.GetAngle({ Msg: "请指定阵列角度:" }); if (ptRes4.Status === PromptStatus.OK) option.arrayAngle = Math.round(ptRes4.Distance); break; case Pick.fillAngle: - let ptRes6 = await app.m_Editor.GetAngle({ Msg: "请指定填充角度:" }); + let ptRes6 = await app.Editor.GetAngle({ Msg: "请指定填充角度:" }); if (ptRes6.Status === PromptStatus.OK) { - fill_angle = Math.round(ptRes6.Distance); - if (fill_angle === 0 || between_angle === 0) + fillAngle = Math.round(ptRes6.Distance); + if (fillAngle === 0 || betweenAngle === 0) { - app.m_Editor.Prompt("错误:填充角度或者项目间角度为0!"); + app.Editor.Prompt("错误:填充角度或者项目间角度为0!"); } else if (option.method === CirArrMethod.itemsAndAngle) { - if (item_total === 1) + if (itemTotal === 1) { - item_total = 2; - between_angle = fill_angle; + itemTotal = 2; + betweenAngle = fillAngle; } else { - if (fill_angle === 360) - between_angle = Math.round(fill_angle / (item_total)); + if (fillAngle === 360) + betweenAngle = Math.round(fillAngle / (itemTotal)); else - between_angle = Math.round(fill_angle / (item_total - 1)); + betweenAngle = Math.round(fillAngle / (itemTotal - 1)); } } else if (option.method === CirArrMethod.fillAngleAndBeAngle) { - if (between_angle > fill_angle) - between_angle = fill_angle; - item_total = Math.ceil(fill_angle / between_angle); + if (betweenAngle > fillAngle) + betweenAngle = fillAngle; + itemTotal = Math.ceil(fillAngle / betweenAngle); } } break; case Pick.betweenAngle: - let ptRes8 = await app.m_Editor.GetAngle({ Msg: "请指定项目间角度:" }); + let ptRes8 = await app.Editor.GetAngle({ Msg: "请指定项目间角度:" }); if (ptRes8.Status === PromptStatus.OK) { - between_angle = Math.round(ptRes8.Distance); + betweenAngle = Math.round(ptRes8.Distance); //关联计算 if (option.method === CirArrMethod.itemsAndBeAngle) { - let biggest_Bangle = Math.round(360 / item_total); - if (between_angle > biggest_Bangle) + let biggestBAngle = Math.round(360 / itemTotal); + if (betweenAngle > biggestBAngle) { - AppToaster.show({ message: `拾取角度超过当前允许最大值(${biggest_Bangle})，请减小项目总数或项目间角度`, timeout: 2000 }); - between_angle = biggest_Bangle; - fill_angle = 360; + AppToaster.show({ message: `拾取角度超过当前允许最大值(${biggestBAngle})，请减小项目总数或项目间角度`, timeout: 2000 }); + betweenAngle = biggestBAngle; + fillAngle = 360; } else { - if (item_total === 1) - fill_angle = 360; + if (itemTotal === 1) + fillAngle = 360; else - fill_angle = between_angle * (item_total - 1); + fillAngle = betweenAngle * (itemTotal - 1); } } else if (option.method === CirArrMethod.fillAngleAndBeAngle) { - if (between_angle !== 0 && fill_angle !== 0) + if (betweenAngle !== 0 && fillAngle !== 0) { - if (between_angle > fill_angle) - between_angle = fill_angle; - item_total = Math.floor(fill_angle / between_angle); + if (betweenAngle > fillAngle) + betweenAngle = fillAngle; + itemTotal = Math.floor(fillAngle / betweenAngle); } } } break; case Pick.rowAndColOffset: - let ptRes = await app.m_Editor.GetPoint({ Msg: "指定第一个角点:" }); + let ptRes = await app.Editor.GetPoint({ Msg: "指定第一个角点:" }); if (ptRes.Status != PromptStatus.OK) break; @@ -255,7 +255,7 @@ export class Command_Array implements Command let rec = new Polyline(); rec.CloseMark = true; - rec.ApplyMatrix(app.m_Editor.UCSMatrix); + rec.ApplyMatrix(app.Editor.UCSMatrix); JigUtils.Draw(rec); let row: number; @@ -281,7 +281,7 @@ export class Command_Array implements Command { pt: px4, bul: 0 }]; } - ptRes = await app.m_Editor.GetPoint({ + ptRes = await app.Editor.GetPoint({ Msg: "指定另一个角点:", Callback: (p) => updateRect(p1, p), RelativeBasePoint: p1 @@ -301,11 +301,11 @@ export class Command_Array implements Command if (res.Status === ModalState.Ok) break; //数据提交 - option.itemTotal = item_total; - option.fillAngle = fill_angle; - option.betweenAngle = between_angle; + option.itemTotal = itemTotal; + option.fillAngle = fillAngle; + option.betweenAngle = betweenAngle; //呼出模态框 - app.m_Editor.m_ModalManage.RenderModal(ArrayModal, ModalPosition.Old, { store: this.arrayStore }); + app.Editor.ModalManage.RenderModal(ArrayModal, ModalPosition.Old, { store: this.arrayStore }); } //根据模态框tab的选择，构造阵列 @@ -336,14 +336,14 @@ export class Command_Array implements Command betweenAngle = -betweenAngle; CirArray(ss, ptRes, ArrayNum, THREE.Math.degToRad(betweenAngle)); } - app.m_Editor.UpdateScreen(); + app.Editor.UpdateScreen(); } } //构造矩形阵列 function recArray(ss: SelectSet, rowNum: number, colNum: number, rowOffset: number, colOffset: number, arrayAngle: number = 0) { - let mat = new Matrix4().extractRotation(app.m_Editor.UCSMatrix) + let mat = new Matrix4().extractRotation(app.Editor.UCSMatrix) let xVec = rotatePoint(new Vector3(colOffset), arrayAngle).applyMatrix4(mat); let yVec = rotatePoint(new Vector3(0, rowOffset), arrayAngle).applyMatrix4(mat); @@ -361,7 +361,7 @@ function recArray(ss: SelectSet, rowNum: number, colNum: number, rowOffset: numb { let e = en.Clone(); e.ApplyMatrix(moveMat); - app.m_Database.ModelSpace.Append(e); + app.Database.ModelSpace.Append(e); } } } @@ -370,7 +370,7 @@ function recArray(ss: SelectSet, rowNum: number, colNum: number, rowOffset: numb //构造环形阵列 function CirArray(ss: SelectSet, ptRes: Vector3, itemTotal: number, betweenAngle: number) { - let mat = new Matrix4().extractRotation(app.m_Editor.UCSMatrix); + let mat = new Matrix4().extractRotation(app.Editor.UCSMatrix); let pt = ptRes.clone().applyMatrix4(mat); //平移变换矩阵 let moveMat = MoveMatrix(pt); @@ -388,7 +388,7 @@ function CirArray(ss: SelectSet, ptRes: Vector3, itemTotal: number, betweenAngle newEnt.ApplyMatrix(moveMatInv); newEnt.ApplyMatrix(roMat); newEnt.ApplyMatrix(moveMat); - app.m_Database.ModelSpace.Append(newEnt); + app.Database.ModelSpace.Append(newEnt); } } } diff --git a/src/Add-on/BoardBatchCurtail.ts b/src/Add-on/BoardBatchCurtail.ts index f286a028d..223b14405 100644 --- a/src/Add-on/BoardBatchCurtail.ts +++ b/src/Add-on/BoardBatchCurtail.ts @@ -27,7 +27,7 @@ export class BoardBatchCurtail implements Command { let store = BoardBatchCurtailStore.GetInstance() as BoardBatchCurtailStore; - let enRes = await app.m_Editor.GetSelection({ + let enRes = await app.Editor.GetSelection({ Msg: "选择需要修改的板件", Filter: { filterTypes: [Board] @@ -85,9 +85,9 @@ export class BoardBatchCurtail implements Command store.checkValue[key] = d.allowDist / 2; } - app.m_Editor.m_ModalManage.RenderModal(BoardBatchCurtailModal, ModalPosition.Center, { store }); + app.Editor.ModalManage.RenderModal(BoardBatchCurtailModal, ModalPosition.Center, { store }); - let res = await app.m_Editor.m_ModalManage.Wait(); + let res = await app.Editor.ModalManage.Wait(); if (res.Status === ModalState.Ok) { diff --git a/src/Add-on/BoardCutting/AutoCuttingReactor.ts b/src/Add-on/BoardCutting/AutoCuttingReactor.ts index 1ba22def2..7d5c9e451 100644 --- a/src/Add-on/BoardCutting/AutoCuttingReactor.ts +++ b/src/Add-on/BoardCutting/AutoCuttingReactor.ts @@ -12,7 +12,7 @@ export class AutoCuttingReactor const cuttingCommands = ["QG2", "QG", "QG4", "COPY"]; - app.m_CommandReactor.OnCommandEnd((cmdName, changeObjects, createObjects) => + app.CommandReactor.OnCommandEnd((cmdName, changeObjects, createObjects) => { if (!this.Enable) return; @@ -27,7 +27,7 @@ export class AutoCuttingReactor { let nc = new NonAssociativeCutting(); let brs: Board[] = []; - for (let ent of app.m_Viewer.VisibleEntitys) + for (let ent of app.Viewer.VisibleEntitys) { if (ent instanceof Board && !ents.includes(ent)) brs.push(ent); diff --git a/src/Add-on/BoardCutting/LinearCutting.ts b/src/Add-on/BoardCutting/LinearCutting.ts index c1227de34..d8c022c6d 100644 --- a/src/Add-on/BoardCutting/LinearCutting.ts +++ b/src/Add-on/BoardCutting/LinearCutting.ts @@ -14,7 +14,7 @@ export class LinearCutting implements Command { async exec() { - let brsRes = await app.m_Editor.GetSelection({ + let brsRes = await app.Editor.GetSelection({ Msg: "选择被切割的板件（空格选择全部）", UseSelect: true, Filter: { filterTypes: [Board] }, @@ -27,7 +27,7 @@ export class LinearCutting implements Command let brs: Board[] = brsRes.SelectSet.SelectEntityList as Board[]; if (brs.length === 0) { - for (let ent of app.m_Viewer.VisibleEntitys) + for (let ent of app.Viewer.VisibleEntitys) { if (ent instanceof Board) brs.push(ent); @@ -35,16 +35,16 @@ export class LinearCutting implements Command } //如果只有一个板并且UCS和视图不平行,那么将坐标系临时改成板件坐标系 - let ucsDir = new Vector3().setFromMatrixColumn(app.m_Editor.UCSMatrix, 2); - let oldUcs: Matrix4 = app.m_Editor.UCSMatrix; - if (brs.length === 1 && !isParallelTo(ucsDir, app.m_Viewer.m_CameraCtrl.Direction)) - app.m_Editor.UCSMatrix = brs[0].OCS; + let ucsDir = new Vector3().setFromMatrixColumn(app.Editor.UCSMatrix, 2); + let oldUcs: Matrix4 = app.Editor.UCSMatrix; + if (brs.length === 1 && !isParallelTo(ucsDir, app.Viewer.CameraCtrl.Direction)) + app.Editor.UCSMatrix = brs[0].OCS; let pts: Vector3[] = []; while (true) { - let ptRes = await app.m_Editor.GetPoint({ + let ptRes = await app.Editor.GetPoint({ BasePoint: pts.length !== 0 ? arrayLast(pts) : undefined, AllowDrawRubberBand: true, AllowNone: true, @@ -52,7 +52,7 @@ export class LinearCutting implements Command }); if (ptRes.Status === PromptStatus.Cancel) { - app.m_Editor.UCSMatrix = oldUcs; + app.Editor.UCSMatrix = oldUcs; return; } @@ -63,13 +63,13 @@ export class LinearCutting implements Command } if (pts.length < 2) { - app.m_Editor.Prompt("切割必须有2个点以上!"); - app.m_Editor.UCSMatrix = oldUcs; + app.Editor.Prompt("切割必须有2个点以上!"); + app.Editor.UCSMatrix = oldUcs; return; } - let ucsInv = app.m_Editor.UCSMatrixInv; - let ucs = app.m_Editor.UCSMatrix; + let ucsInv = app.Editor.UCSMatrixInv; + let ucs = app.Editor.UCSMatrix; let ptsWcs = pts;//缓存世界坐标系,支持UCS不同时使用捕捉. pts = pts.map(p => p.clone().applyMatrix4(ucsInv).setZ(0).applyMatrix4(ucs)); @@ -153,7 +153,7 @@ export class LinearCutting implements Command let regionParse = new RegionParse([...brSplitCus, ...allSplitPls]); - let cus = regionParse.m_RegionsInternal.map(r => + let cus = regionParse.RegionsInternal.map(r => { let pl = new Polyline(); for (let route of r) @@ -173,15 +173,15 @@ export class LinearCutting implements Command let br2 = br.Clone(); br2.ContourCurve = cus[i]; br2.GrooveCheckAll(splitBoards); - app.m_Database.ModelSpace.Append(br2); + app.Database.ModelSpace.Append(br2); } br.ContourCurve = cus[0]; br.GrooveCheckAll(splitBoards); for (let nb of splitBoards) - app.m_Database.ModelSpace.Append(nb); + app.Database.ModelSpace.Append(nb); } - app.m_Editor.UCSMatrix = oldUcs; + app.Editor.UCSMatrix = oldUcs; } } diff --git a/src/Add-on/BoardCutting/NonAssociativeCutting.ts b/src/Add-on/BoardCutting/NonAssociativeCutting.ts index b69f86a9b..d7000df08 100644 --- a/src/Add-on/BoardCutting/NonAssociativeCutting.ts +++ b/src/Add-on/BoardCutting/NonAssociativeCutting.ts @@ -8,7 +8,7 @@ export class NonAssociativeCutting implements Command { async exec() { - let brsRes2 = await app.m_Editor.GetSelection({ + let brsRes2 = await app.Editor.GetSelection({ Msg: "选择切割的板件", UseSelect: true, Filter: { filterTypes: [Board] } @@ -17,9 +17,9 @@ export class NonAssociativeCutting implements Command if (brsRes2.Status !== PromptStatus.OK) return; let brs2 = brsRes2.SelectSet.SelectEntityList as Board[]; - app.m_Editor.Prompt(`选择切割的板件: 总计${brs2.length}个`); + app.Editor.Prompt(`选择切割的板件: 总计${brs2.length}个`); - let brsRes = await app.m_Editor.GetSelection({ + let brsRes = await app.Editor.GetSelection({ Msg: "选择被切割的板件<全部选择>", UseSelect: true, Filter: { @@ -38,13 +38,13 @@ export class NonAssociativeCutting implements Command let brs: Board[] = brsRes.SelectSet.SelectEntityList as Board[]; if (brs.length === 0) { - for (let ent of app.m_Viewer.VisibleEntitys) + for (let ent of app.Viewer.VisibleEntitys) { if (ent instanceof Board && !brs2.includes(ent)) brs.push(ent); } } - app.m_Editor.Prompt(`选择了被切割的板件: 总计${brs.length}个`); + app.Editor.Prompt(`选择了被切割的板件: 总计${brs.length}个`); for (let br of brs) this.CuttingBoard(br, brs2); @@ -69,7 +69,7 @@ export class NonAssociativeCutting implements Command for (let br of splitBoard) { - app.m_Database.ModelSpace.Append(br); + app.Database.ModelSpace.Append(br); } } } diff --git a/src/Add-on/BoardCutting/ReferenceCutting.ts b/src/Add-on/BoardCutting/ReferenceCutting.ts index 14c0ca365..f940da097 100644 --- a/src/Add-on/BoardCutting/ReferenceCutting.ts +++ b/src/Add-on/BoardCutting/ReferenceCutting.ts @@ -15,7 +15,7 @@ export class ReferenceCutting implements Command { async exec() { - let brRes = await app.m_Editor.GetSelection({ + let brRes = await app.Editor.GetSelection({ Once: true, Msg: "选择切割的板件(单块)", Filter: { @@ -26,7 +26,7 @@ export class ReferenceCutting implements Command if (brRes.Status !== PromptStatus.OK) return; let brKnife = brRes.SelectSet.SelectEntityList[0] as Board; - brRes = await app.m_Editor.GetSelection({ + brRes = await app.Editor.GetSelection({ Msg: "选择被切割的板件（空格选择剩余全部）", Filter: { filterTypes: [Board], @@ -41,13 +41,13 @@ export class ReferenceCutting implements Command let brs: Board[] = brRes.SelectSet.SelectEntityList as Board[]; if (brs.length === 0) { - for (let ent of app.m_Viewer.VisibleEntitys) + for (let ent of app.Viewer.VisibleEntitys) { if (ent instanceof Board && ent !== brKnife) brs.push(ent); } } - app.m_Editor.Prompt(`选择了被切割的板件: 总计${brs.length}个`); + app.Editor.Prompt(`选择了被切割的板件: 总计${brs.length}个`); //偏移量 let offset: number; @@ -56,8 +56,8 @@ export class ReferenceCutting implements Command let option = referenceCuttingStore.m_Option; option.halfThickness = brKnife.Thickness / 2; option.boardType = brKnife.BoardType; - app.m_Editor.m_ModalManage.RenderModal(ReferenceCuttingModal, ModalPosition.Center, { store: referenceCuttingStore }); - let res = await app.m_Editor.m_ModalManage.Wait(); + app.Editor.ModalManage.RenderModal(ReferenceCuttingModal, ModalPosition.Center, { store: referenceCuttingStore }); + let res = await app.Editor.ModalManage.Wait(); if (res.Status === ModalState.Ok) { @@ -87,7 +87,7 @@ export class ReferenceCutting implements Command if (!equaln(brNorm.dot(brKnifNorm), 0))//垂直测试 { failCount++; - app.m_Editor.Prompt('板件不垂直,无法切割！'); + app.Editor.Prompt('板件不垂直,无法切割！'); continue; } @@ -109,7 +109,7 @@ export class ReferenceCutting implements Command if (pts1.length < 2 && pts2.length < 2) { failCount++; - app.m_Editor.Prompt("板件与板件没有交集."); + app.Editor.Prompt("板件与板件没有交集."); continue; } @@ -132,7 +132,7 @@ export class ReferenceCutting implements Command cutCus = cutCus.filter(c => brContour.PtInCurve(c.GetPointAtParam(0.5))); let regionParse = new RegionParse([...brCus, ...cutCus]); - let contours = regionParse.m_RegionsInternal.map(r => + let contours = regionParse.RegionsInternal.map(r => { let pl = new Polyline(); for (let route of r) @@ -144,7 +144,7 @@ export class ReferenceCutting implements Command if (contours.length === 0) { //预期之外. - app.m_Editor.Prompt(`切割中断：第${i}个切割失败了!`); + app.Editor.Prompt(`切割中断：第${i}个切割失败了!`); return; } @@ -153,10 +153,10 @@ export class ReferenceCutting implements Command { let br2 = br.Clone(); br2.ContourCurve = contours[i]; - app.m_Database.ModelSpace.Append(br2); + app.Database.ModelSpace.Append(br2); } br.ContourCurve = contours[0]; } - app.m_Editor.Prompt(`切割成功: 有效${brs.length - failCount}个, 无效${failCount}个`); + app.Editor.Prompt(`切割成功: 有效${brs.length - failCount}个, 无效${failCount}个`); } } diff --git a/src/Add-on/BoardCutting/ReferenceCuttingModal.tsx b/src/Add-on/BoardCutting/ReferenceCuttingModal.tsx index 34ff204c2..357f124f6 100644 --- a/src/Add-on/BoardCutting/ReferenceCuttingModal.tsx +++ b/src/Add-on/BoardCutting/ReferenceCuttingModal.tsx @@ -53,8 +53,8 @@ export class ReferenceCuttingStore extends Singleton } _Return(state: number) { - app.m_Editor.m_ModalManage.m_PromisRes({ Status: state }); - app.m_Editor.m_ModalManage.Clear(); + app.Editor.ModalManage.m_PromisRes({ Status: state }); + app.Editor.ModalManage.Clear(); } HasInvailValue() { @@ -95,8 +95,8 @@ export class ReferenceCuttingModal extends React.Component<{ store: ReferenceCut } registerEvent() { - app.m_Editor.m_ModalManage.events.push( - begin(app.m_Editor.m_ModalManage, app.m_Editor.m_ModalManage.OnKeyDown, (e: KeyboardEvent) => + app.Editor.ModalManage.events.push( + begin(app.Editor.ModalManage, app.Editor.ModalManage.OnKeyDown, (e: KeyboardEvent) => { if (e.keyCode === KeyBoard.Enter || e.keyCode === KeyBoard.Space) { diff --git a/src/Add-on/BoardFindModify.ts b/src/Add-on/BoardFindModify.ts index 0e66f3c64..2a69daa74 100644 --- a/src/Add-on/BoardFindModify.ts +++ b/src/Add-on/BoardFindModify.ts @@ -23,10 +23,10 @@ export class BoardFindModify implements Command async exec() { const store = BoardFindStore.GetInstance() as BoardFindStore; - app.m_Editor.m_ModalManage.RenderModeless(BoardFindModifyModal, ModalPosition.Right, { store }); - app.m_Editor.m_SelectCtrl.Cancel(); + app.Editor.ModalManage.RenderModeless(BoardFindModifyModal, ModalPosition.Right, { store }); + app.Editor.SelectCtrl.Cancel(); - app.m_Editor.m_ModalManage.Callback = async (res) => + app.Editor.ModalManage.Callback = async (res) => { switch (res.type) { @@ -47,22 +47,22 @@ export class BoardFindModify implements Command default: break; } - app.m_Editor.m_ModalManage.ToggleShow(); + app.Editor.ModalManage.ToggleShow(); if (store.m_Option.isClose) { - app.m_Editor.m_ModalManage.Clear(); - app.m_Editor.m_ModalManage.EndCmd(); + app.Editor.ModalManage.Clear(); + app.Editor.ModalManage.EndCmd(); } else { - app.m_Editor.m_MaskManage.ShowMask(); + app.Editor.MaskManage.ShowMask(); } } } private async GetBoards(otherEnts = []) { - let enRes = await app.m_Editor.GetSelection({ + let enRes = await app.Editor.GetSelection({ Msg: "选择板件", Filter: { filterTypes: [Board, ...otherEnts] } }); @@ -73,10 +73,10 @@ export class BoardFindModify implements Command } private PutSelectList(brs: Board[]) { - let selectData = new SelectSetBase(app.m_Viewer); + let selectData = new SelectSetBase(app.Viewer); selectData.m_SelectList.push(...brs.map(e => e.DrawObject)); - app.m_Editor.m_SelectCtrl.SelectSet.AddSelect(selectData); - app.m_Editor.m_SelectCtrl.UpdateView(); + app.Editor.SelectCtrl.SelectSet.AddSelect(selectData); + app.Editor.SelectCtrl.UpdateView(); } private async FindBrs(option: IBoardFindOption) { @@ -224,7 +224,7 @@ export class BoardFindModify implements Command } private async ModifyBrs(option: IBoardFindOption) { - let brs = app.m_Editor.m_SelectCtrl.SelectSet.SelectEntityList as Board[]; + let brs = app.Editor.SelectCtrl.SelectSet.SelectEntityList as Board[]; if (brs.length === 0) brs = await this.GetBoards(); @@ -329,7 +329,7 @@ export class BoardFindModify implements Command } private async GetBoardOption(option: IBoardFindOption, data: { key: string, content: string }) { - let brRes = await app.m_Editor.GetEntity({ + let brRes = await app.Editor.GetEntity({ Msg: data.content, Filter: { filterTypes: [Board] } }); diff --git a/src/Add-on/BoolOperation.ts b/src/Add-on/BoolOperation.ts index 3ee1e440a..91af87e86 100644 --- a/src/Add-on/BoolOperation.ts +++ b/src/Add-on/BoolOperation.ts @@ -19,7 +19,7 @@ function RegionsBoolOperate(regs: Region[], boolType: BoolOpeartionType): Region async function SelectRegions(): Promise { - let enRes = await app.m_Editor.GetSelection({ + let enRes = await app.Editor.GetSelection({ Msg: "选择面域" }); if (enRes.Status === PromptStatus.OK) diff --git a/src/Add-on/Break.ts b/src/Add-on/Break.ts index a1f97624c..3cb6702b2 100644 --- a/src/Add-on/Break.ts +++ b/src/Add-on/Break.ts @@ -8,7 +8,7 @@ export class Command_Break implements Command { async exec() { - let cuRes = await app.m_Editor.GetEntity({ + let cuRes = await app.Editor.GetEntity({ Msg: "请选择被打断的曲线:" }); if (cuRes.Status !== PromptStatus.OK) @@ -21,8 +21,8 @@ export class Command_Break implements Command while (true) { - app.m_Database.hm.StartMark(); - let ptRes = await app.m_Editor.GetPoint({ + app.Database.hm.StartMark(); + let ptRes = await app.Editor.GetPoint({ Msg: "请点击被打断的点:" , KeyWordList: breakPts.length === 0 ? [{ key: "D", msg: "定距等分" }, { key: "S", msg: "定数等分" }] : [] }); @@ -37,13 +37,13 @@ export class Command_Break implements Command { if (ptRes.StringResult === "D") { - let divRes = await app.m_Editor.GetDistance({ Msg: "请输入等分距离:" }); + let divRes = await app.Editor.GetDistance({ Msg: "请输入等分距离:" }); if (divRes.Status !== PromptStatus.OK) return; if (divRes.Distance === 0) { - app.m_Editor.Prompt("距离不能为0!"); + app.Editor.Prompt("距离不能为0!"); continue; } let lenDiv = cu.Length / divRes.Distance; @@ -52,13 +52,13 @@ export class Command_Break implements Command } else if (ptRes.StringResult === "S") { - let divRes = await app.m_Editor.GetDistance({ Msg: "请输入等分个数:" }); + let divRes = await app.Editor.GetDistance({ Msg: "请输入等分个数:" }); if (divRes.Status !== PromptStatus.OK) return; if (divRes.Distance === 0) { - app.m_Editor.Prompt("个数不能为0!"); + app.Editor.Prompt("个数不能为0!"); return; } let divCount = cu.Length / divRes.Distance; @@ -67,7 +67,7 @@ export class Command_Break implements Command } else { - app.m_Editor.Prompt("未知输入!"); + app.Editor.Prompt("未知输入!"); continue; } @@ -83,7 +83,7 @@ export class Command_Break implements Command cu.Erase(); cus.forEach(c => { - app.m_Database.ModelSpace.Append(c); + app.Database.ModelSpace.Append(c); }); } } diff --git a/src/Add-on/ChangeColor.ts b/src/Add-on/ChangeColor.ts index 98d35384d..69016e3bc 100644 --- a/src/Add-on/ChangeColor.ts +++ b/src/Add-on/ChangeColor.ts @@ -10,7 +10,7 @@ export class ChangeColor implements Command } async exec() { - let enRes = await app.m_Editor.GetSelection({ + let enRes = await app.Editor.GetSelection({ Msg: '选择对象', UseSelect: true }); diff --git a/src/Add-on/CommandFeeding.ts b/src/Add-on/CommandFeeding.ts index 6de8fea34..0f0aee41f 100644 --- a/src/Add-on/CommandFeeding.ts +++ b/src/Add-on/CommandFeeding.ts @@ -12,7 +12,7 @@ export class FeedingCommand implements Command { async exec() { - let brRes = await app.m_Editor.GetSelection({ + let brRes = await app.Editor.GetSelection({ Msg: "选择板件", UseSelect: true, Filter: { filterTypes: [Board] } @@ -29,7 +29,7 @@ export class FeedingCommand implements Command let retCus = brs.map(br => feedingTool.TestCalcPath(br)); - let ptRes = await app.m_Editor.GetPoint({ Msg: "点取位置" }); + let ptRes = await app.Editor.GetPoint({ Msg: "点取位置" }); if (ptRes.Status === PromptStatus.OK) { @@ -45,8 +45,8 @@ export class FeedingCommand implements Command for (let cu of cus) { cu.ApplyMatrix(MoveMatrix(pos)); - app.m_Database.ModelSpace.Append(cu); - app.m_Database.ModelSpace.Append(new Point(cu.StartPoint)); + app.Database.ModelSpace.Append(cu); + app.Database.ModelSpace.Append(new Point(cu.StartPoint)); } } } diff --git a/src/Add-on/Command_CommandPanel.ts b/src/Add-on/Command_CommandPanel.ts index 98461206c..4750f2e83 100644 --- a/src/Add-on/Command_CommandPanel.ts +++ b/src/Add-on/Command_CommandPanel.ts @@ -7,7 +7,7 @@ export class Command_CommandPanel implements Command { async exec() { - let store = app.m_Editor.m_CommandStore; - app.m_Editor.m_ModalManage.RenderModal(CommandPanel, ModalPosition.Top, { store }); + let store = app.Editor.CommandStore; + app.Editor.ModalManage.RenderModal(CommandPanel, ModalPosition.Top, { store }); } } diff --git a/src/Add-on/Command_Option.ts b/src/Add-on/Command_Option.ts index 9d513dea2..75ecc360c 100644 --- a/src/Add-on/Command_Option.ts +++ b/src/Add-on/Command_Option.ts @@ -8,6 +8,6 @@ export class Command_Options implements Command async exec() { let OptionStore = OptionModalStore.GetInstance() as OptionModalStore; - app.m_Editor.m_ModalManage.RenderModal(OptionModal, ModalPosition.Center, { store: OptionStore }); + app.Editor.ModalManage.RenderModal(OptionModal, ModalPosition.Center, { store: OptionStore }); } } diff --git a/src/Add-on/Copy.ts b/src/Add-on/Copy.ts index 3395f8c39..aa7b4902f 100644 --- a/src/Add-on/Copy.ts +++ b/src/Add-on/Copy.ts @@ -13,11 +13,11 @@ export class Command_Copy implements Command { async exec() { - let ssRes = await app.m_Editor.GetSelection({ Msg: "请选择需要拷贝的实体:", UseSelect: true }); + let ssRes = await app.Editor.GetSelection({ Msg: "请选择需要拷贝的实体:", UseSelect: true }); if (ssRes.Status !== PromptStatus.OK) return; - let ptRes = await app.m_Editor.GetPoint({ Msg: "请选择复制基点:" }); + let ptRes = await app.Editor.GetPoint({ Msg: "请选择复制基点:" }); if (ptRes.Status !== PromptStatus.OK) return; @@ -37,8 +37,8 @@ export class Command_Copy implements Command let jigEns = orgEns.map(e => JigUtils.Draw(e)); while (true) { - app.m_Database.hm.StartMark(); - let ptRes2 = await app.m_Editor.GetPoint({ + app.Database.hm.StartMark(); + let ptRes2 = await app.Editor.GetPoint({ Msg: "请选择复制终点:", Callback: (p) => { @@ -53,7 +53,7 @@ export class Command_Copy implements Command if (ptRes2.Status === PromptStatus.OK) { let moveM = MoveMatrix(ptRes2.Point.sub(ptBase)); - let cloneEns = app.m_Database.DeepCloneObjects(orgEns, app.m_Database.ModelSpace) as Entity[]; + let cloneEns = app.Database.DeepCloneObjects(orgEns, app.Database.ModelSpace) as Entity[]; for (let en of cloneEns) { diff --git a/src/Add-on/CopyClip.ts b/src/Add-on/CopyClip.ts index a3681d5ab..3b598a8c9 100644 --- a/src/Add-on/CopyClip.ts +++ b/src/Add-on/CopyClip.ts @@ -9,7 +9,7 @@ export class CopyClip { async exec() { - let ss = app.m_Editor.m_SelectCtrl.SelectSet; + let ss = app.Editor.SelectCtrl.SelectSet; if (ss.SelectEntityList.length === 0) return; let ens = ss.SelectEntityList; @@ -21,7 +21,7 @@ export class CopyClip ens.forEach(e => f.WriteObject(e)); copyTextToClipboard(JSON.stringify({ file: f.Data, - basePt: app.m_Editor.m_MouseCtrl.m_CurMousePointWCS, + basePt: app.Editor.MouseCtrl.m_CurMousePointWCS, })); } } diff --git a/src/Add-on/CopyPoint.ts b/src/Add-on/CopyPoint.ts index 4814bcc34..ef0fb91e2 100644 --- a/src/Add-on/CopyPoint.ts +++ b/src/Add-on/CopyPoint.ts @@ -6,7 +6,7 @@ export class Command_CopyPoint { async exec() { - let ptRes = await app.m_Editor.GetPoint(); + let ptRes = await app.Editor.GetPoint(); if (ptRes.Status === PromptStatus.OK) copyTextToClipboard(`new Vector3().fromArray(${JSON.stringify(ptRes.Point.toArray())});`); diff --git a/src/Add-on/CostumUCS.ts b/src/Add-on/CostumUCS.ts index cc2c8ff03..8534cf8bb 100644 --- a/src/Add-on/CostumUCS.ts +++ b/src/Add-on/CostumUCS.ts @@ -8,7 +8,7 @@ export class CustomUcs implements Command { async exec() { - let p1Res = await app.m_Editor.GetPoint( + let p1Res = await app.Editor.GetPoint( { Msg: "请点击坐标原点或", KeyWordList: [{ key: "W", msg: "世界" }] @@ -18,30 +18,30 @@ export class CustomUcs implements Command { if (p1Res.StringResult === "W") { - app.m_Editor.UCSMatrix = new Matrix4(); + app.Editor.UCSMatrix = new Matrix4(); } } if (p1Res.Status != PromptStatus.OK) return; - let mat = app.m_Editor.UCSMatrix; + let mat = app.Editor.UCSMatrix; let oldMat = mat.clone(); mat.setPosition(p1Res.Point); - app.m_Editor.UCSMatrix = mat; + app.Editor.UCSMatrix = mat; let xv: Vector3, yv: Vector3, zv: Vector3; while (true) { - let xRes = await app.m_Editor.GetPoint({ Msg: "请点击X轴方向:", BasePoint: p1Res.Point, AllowDrawRubberBand: true }); + let xRes = await app.Editor.GetPoint({ Msg: "请点击X轴方向:", BasePoint: p1Res.Point, AllowDrawRubberBand: true }); if (xRes.Status !== PromptStatus.OK) { - app.m_Editor.UCSMatrix = oldMat; + app.Editor.UCSMatrix = oldMat; return; } else { if (equalv3(xRes.Point, p1Res.Point)) { - app.m_Editor.Prompt("与第一个点重复!"); + app.Editor.Prompt("与第一个点重复!"); } else { @@ -57,7 +57,7 @@ export class CustomUcs implements Command while (true) { - let yRes = await app.m_Editor.GetPoint({ + let yRes = await app.Editor.GetPoint({ Msg: "XY轴平面上的点(接受):", BasePoint: p1Res.Point, AllowDrawRubberBand: true, @@ -68,7 +68,7 @@ export class CustomUcs implements Command else if (yRes.Status === PromptStatus.OK) { if (equalv3(yRes.Point, p1Res.Point)) - app.m_Editor.Prompt("与第一个点重复!"); + app.Editor.Prompt("与第一个点重复!"); else { yv = yRes.Point.sub(p1Res.Point).normalize(); @@ -80,7 +80,7 @@ export class CustomUcs implements Command } else { - app.m_Editor.UCSMatrix = oldMat; + app.Editor.UCSMatrix = oldMat; return; } } @@ -90,6 +90,6 @@ export class CustomUcs implements Command { mat.makeBasis(xv.normalize(), yv.normalize(), zv.normalize()); mat.setPosition(p1Res.Value); - app.m_Editor.UCSMatrix = mat; + app.Editor.UCSMatrix = mat; } } diff --git a/src/Add-on/CreateBoardFromData.ts b/src/Add-on/CreateBoardFromData.ts index ada76075b..df4e7f0a4 100644 --- a/src/Add-on/CreateBoardFromData.ts +++ b/src/Add-on/CreateBoardFromData.ts @@ -29,7 +29,7 @@ export async function CreateBoardFromData(data: Object) br.material = boardMaterial; br.castShadow = true; br.receiveShadow = true; - app.m_Viewer.Scene.add(board); + app.Viewer.Scene.add(board); } //加载fbx文件 @@ -51,10 +51,10 @@ export async function CreateBoardFromData(data: Object) { let meshC = mesh.clone(); meshC.applyMatrix(fbxState.object.matrix); - app.m_Viewer.Scene.add(meshC); + app.Viewer.Scene.add(meshC); } } } - app.m_Viewer.m_bNeedUpdate = true; + app.Viewer.UpdateRender(); } diff --git a/src/Add-on/DXFLoad.ts b/src/Add-on/DXFLoad.ts index 9e20d50be..346ff7971 100644 --- a/src/Add-on/DXFLoad.ts +++ b/src/Add-on/DXFLoad.ts @@ -38,24 +38,24 @@ export class Command_DXFImport }; }); pl.CloseMark = en.shape; - app.m_Database.ModelSpace.Append(pl); + app.Database.ModelSpace.Append(pl); } else if (en.type === "ARC") { let arc = new Arc(AsVector3(en.center), en.radius, en.startAngle, en.endAngle, false); - app.m_Database.ModelSpace.Append(arc); + app.Database.ModelSpace.Append(arc); } else if (en.type === "CIRCLE") { let cir = new Circle(AsVector3(en.center), en.radius); - app.m_Database.ModelSpace.Append(cir); + app.Database.ModelSpace.Append(cir); } else if (en.type === "LINE") { if (!(en.vertices.length === 2)) return; let line = new Line(AsVector3(en.vertices[0]), AsVector3(en.vertices[1])); - app.m_Database.ModelSpace.Append(line); + app.Database.ModelSpace.Append(line); } } } diff --git a/src/Add-on/Divide.ts b/src/Add-on/Divide.ts index dde0850a9..502baefac 100644 --- a/src/Add-on/Divide.ts +++ b/src/Add-on/Divide.ts @@ -8,7 +8,7 @@ export class CMD_Divide implements Command { async exec() { - let enRes = await app.m_Editor.GetEntity( + let enRes = await app.Editor.GetEntity( { Msg: "请选择定数等分的对象", KeyWordList: [{ key: "D", msg: "定数等分" }, { key: "S", msg: "定距等分" }] @@ -43,14 +43,14 @@ export class CMD_Divide implements Command async Divided(enRes: PromptEntityResult)//定数等分 { - let numRes = await app.m_Editor.GetDistance({ Msg: "请输入段数" }); + let numRes = await app.Editor.GetDistance({ Msg: "请输入段数" }); if (numRes.Status != PromptStatus.OK) return; let divCount = numRes.Distance; if (divCount === 0) { - app.m_Editor.Prompt("您不能等分0"); + app.Editor.Prompt("您不能等分0"); return; } if (enRes.Entity instanceof Curve) @@ -66,19 +66,19 @@ export class CMD_Divide implements Command { let pt = cu.GetPointAtDistance(divLen * (i + 1)); let ptEnt = new Point(pt); - app.m_Database.ModelSpace.Append(ptEnt); + app.Database.ModelSpace.Append(ptEnt); } } } async Measured()//定距等分 { - let enRes = await app.m_Editor.GetEntity({ Msg: "请选择定距等分的对象" }); - let numRes = await app.m_Editor.GetDistance({ Msg: "请指定分段的长度" }); + let enRes = await app.Editor.GetEntity({ Msg: "请选择定距等分的对象" }); + let numRes = await app.Editor.GetDistance({ Msg: "请指定分段的长度" }); let divLen = numRes.Distance; if (divLen === 0) { - app.m_Editor.Prompt("分段长度不能为0"); + app.Editor.Prompt("分段长度不能为0"); return; } if (enRes.Entity instanceof Curve) @@ -87,7 +87,7 @@ export class CMD_Divide implements Command let len = cu.Length; if (divLen > len) { - app.m_Editor.Prompt("分段长度不能超过对象长度"); + app.Editor.Prompt("分段长度不能超过对象长度"); return; } let divCount = len / divLen; @@ -95,7 +95,7 @@ export class CMD_Divide implements Command { let pt = cu.GetPointAtDistance(divLen * (i + 1)); let ptEnt = new Point(pt); - app.m_Database.ModelSpace.Append(ptEnt); + app.Database.ModelSpace.Append(ptEnt); } } } diff --git a/src/Add-on/DrawArc.ts b/src/Add-on/DrawArc.ts index cda0fca0c..f6353dc2d 100644 --- a/src/Add-on/DrawArc.ts +++ b/src/Add-on/DrawArc.ts @@ -9,17 +9,17 @@ export class DrawArc implements Command { async exec() { - let ptRes = await app.m_Editor.GetPoint({ Msg: "请输入第一个点:" }); + let ptRes = await app.Editor.GetPoint({ Msg: "请输入第一个点:" }); if (ptRes.Status != PromptStatus.OK) return; let pt1 = ptRes.Point; - let ptRes2 = await app.m_Editor.GetPoint({ Msg: "请输入第二个点:", BasePoint: pt1, AllowDrawRubberBand: true }); + let ptRes2 = await app.Editor.GetPoint({ Msg: "请输入第二个点:", BasePoint: pt1, AllowDrawRubberBand: true }); if (ptRes2.Status != PromptStatus.OK) return; let pt2 = ptRes2.Point; let arc = new Arc(); - arc.ApplyMatrix(app.m_Editor.UCSMatrix); + arc.ApplyMatrix(app.Editor.UCSMatrix); const updateArc = (p) => { @@ -31,7 +31,7 @@ export class DrawArc implements Command } JigUtils.Draw(arc); - let ptRes3 = await app.m_Editor.GetPoint({ + let ptRes3 = await app.Editor.GetPoint({ Msg: "请输入第三个点:", Callback: updateArc }); @@ -39,7 +39,7 @@ export class DrawArc implements Command if (ptRes3.Status === PromptStatus.OK) { updateArc(ptRes3.Point); - app.m_Database.ModelSpace.Append(arc); + app.Database.ModelSpace.Append(arc); } JigUtils.End(); } diff --git a/src/Add-on/DrawBoard/DrawBehindBoard.ts b/src/Add-on/DrawBoard/DrawBehindBoard.ts index 664ebd922..c5f81db51 100644 --- a/src/Add-on/DrawBoard/DrawBehindBoard.ts +++ b/src/Add-on/DrawBoard/DrawBehindBoard.ts @@ -87,7 +87,7 @@ export class DrawBehindBoard extends DrawBoardTool ))); b.ApplyMatrix(spaceOcs); - app.m_Database.ModelSpace.Append(b); + app.Database.ModelSpace.Append(b); } } } diff --git a/src/Add-on/DrawBoard/DrawBoardTool.ts b/src/Add-on/DrawBoard/DrawBoardTool.ts index 1cae6194d..d3a960b8e 100644 --- a/src/Add-on/DrawBoard/DrawBoardTool.ts +++ b/src/Add-on/DrawBoard/DrawBoardTool.ts @@ -32,12 +32,12 @@ export abstract class DrawBoardTool implements Command this.store = BehindBoardStore.GetInstance(); this.modalType = BoardModalType.Be; } - app.m_Editor.m_ModalManage.RenderModeless( + app.Editor.ModalManage.RenderModeless( BoardModal, ModalPosition.Center, { store: this.store, type: this.modalType }); - app.m_Editor.m_ModalManage.Callback = async () => + app.Editor.ModalManage.Callback = async () => { await this.SelectAndBuildBoard(); } @@ -45,8 +45,8 @@ export abstract class DrawBoardTool implements Command private async SelectAndBuildBoard() { //原来禁用捕捉开启状态 - let oldSnapState = app.m_Editor.GetPointServices.snapServices.Disabled; - app.m_Editor.GetPointServices.snapServices.Disabled = true; + let oldSnapState = app.Editor.GetPointServices.snapServices.Disabled; + app.Editor.GetPointServices.snapServices.Disabled = true; while (true) { @@ -55,7 +55,7 @@ export abstract class DrawBoardTool implements Command if (selectSpace.GetPointRes.Status === PromptStatus.None) { - app.m_Editor.m_ModalManage.RenderModeless( + app.Editor.ModalManage.RenderModeless( BoardModal, ModalPosition.Old, { store: this.store, type: this.modalType }); @@ -71,13 +71,13 @@ export abstract class DrawBoardTool implements Command this.buildBoard(); - app.m_Editor.UpdateScreen(); + app.Editor.UpdateScreen(); if (!userConfig.isContinuousDraw) break; } //恢复原先状态 - app.m_Editor.GetPointServices.snapServices.Disabled = oldSnapState; + app.Editor.GetPointServices.snapServices.Disabled = oldSnapState; } //构建板件 diff --git a/src/Add-on/DrawBoard/DrawClosingStrip.ts b/src/Add-on/DrawBoard/DrawClosingStrip.ts index 635e931f9..f25c42352 100644 --- a/src/Add-on/DrawBoard/DrawClosingStrip.ts +++ b/src/Add-on/DrawBoard/DrawClosingStrip.ts @@ -19,7 +19,7 @@ export class DrawClosingStrip implements Command private store: ClosingStripStore; async exec() { - let exSsRes = await app.m_Editor.GetSelection({ Msg: "请选择对象<全部选择>:", UseSelect: true, Filter: { filterTypes: [Board] } }); + let exSsRes = await app.Editor.GetSelection({ Msg: "请选择对象<全部选择>:", UseSelect: true, Filter: { filterTypes: [Board] } }); if (exSsRes.Status === PromptStatus.Cancel) return; @@ -28,7 +28,7 @@ export class DrawClosingStrip implements Command if (boards.length > 0) { this.store = ClosingStripStore.GetInstance(); - app.m_Editor.m_ModalManage.RenderModeless(BoardModal, ModalPosition.Center, { store: this.store, type: BoardModalType.Skt }); + app.Editor.ModalManage.RenderModeless(BoardModal, ModalPosition.Center, { store: this.store, type: BoardModalType.Skt }); let useOptionCallback = begin(this.store, this.store.UpdateOption, (cof) => { @@ -44,7 +44,7 @@ export class DrawClosingStrip implements Command useOptionCallback(); useOptionCallback = null; }) - let res = await app.m_Editor.m_ModalManage.Wait(); + let res = await app.Editor.ModalManage.Wait(); if (res.Status !== ModalState.Ok) return; @@ -58,7 +58,7 @@ export class DrawClosingStrip implements Command message: "收口条已绘制", timeout: 1000 }); - res = await app.m_Editor.m_ModalManage.Wait(); + res = await app.Editor.ModalManage.Wait(); if (res.Status !== ModalState.Ok) break; } @@ -157,9 +157,9 @@ export class DrawClosingStrip implements Command //收口条颜色 b.ColorIndex = 4; b.ApplyMatrix(rot); - app.m_Database.ModelSpace.Append(b); + app.Database.ModelSpace.Append(b); } - app.m_Editor.UpdateScreen(); + app.Editor.UpdateScreen(); } } diff --git a/src/Add-on/DrawBoard/DrawDoor.ts b/src/Add-on/DrawBoard/DrawDoor.ts index 859a7df07..ca53a1724 100644 --- a/src/Add-on/DrawBoard/DrawDoor.ts +++ b/src/Add-on/DrawBoard/DrawDoor.ts @@ -33,8 +33,8 @@ export class DrawDoor implements Command store.totalDepth = parseFloat(ToFixed(size.y, 2)); store.m_Option.depth = store.totalDepth; - app.m_Editor.m_ModalManage.RenderModal(DoorModal, ModalPosition.Center, { store }); - let res = await app.m_Editor.m_ModalManage.Wait(); + app.Editor.ModalManage.RenderModal(DoorModal, ModalPosition.Center, { store }); + let res = await app.Editor.ModalManage.Wait(); if (res.Status === ModalState.Ok) { @@ -129,7 +129,7 @@ export class DrawDoor implements Command for (let br of brs) { br.ApplyMatrix(spaceParse.m_SpaceOCS); - app.m_Database.ModelSpace.Append(br); + app.Database.ModelSpace.Append(br); } } } diff --git a/src/Add-on/DrawBoard/DrawDrawer.ts b/src/Add-on/DrawBoard/DrawDrawer.ts index 59f6739ed..bc2103824 100644 --- a/src/Add-on/DrawBoard/DrawDrawer.ts +++ b/src/Add-on/DrawBoard/DrawDrawer.ts @@ -25,8 +25,8 @@ export class DrawDrawrer implements Command store.totalDepth = parseFloat(FixedNotZero(size.y, 2)); store.m_Option.depth = store.totalDepth; - app.m_Editor.m_ModalManage.RenderModal(DoorModal, ModalPosition.Center, { store }); - let res = await app.m_Editor.m_ModalManage.Wait(); + app.Editor.ModalManage.RenderModal(DoorModal, ModalPosition.Center, { store }); + let res = await app.Editor.ModalManage.Wait(); if (res.Status === ModalState.Ok) { diff --git a/src/Add-on/DrawBoard/DrawLayerBoard.ts b/src/Add-on/DrawBoard/DrawLayerBoard.ts index 6ac6917f1..26399d6a5 100644 --- a/src/Add-on/DrawBoard/DrawLayerBoard.ts +++ b/src/Add-on/DrawBoard/DrawLayerBoard.ts @@ -86,7 +86,7 @@ export class DrawLayerBoard extends DrawBoardTool b.ApplyMatrix(spaceOCS); //绘制层板钉 this.buildLayerNail(b); - app.m_Database.ModelSpace.Append(b); + app.Database.ModelSpace.Append(b); } } //初始化层板钉 @@ -284,7 +284,7 @@ export class DrawLayerBoard extends DrawBoardTool for (let nailProps of buildNails) { nailProps.nail.ApplyMatrix(br.OCS); - app.m_Database.ModelSpace.Append(nailProps.nail); + app.Database.ModelSpace.Append(nailProps.nail); nailIDs.push(nailProps.nail.Id); if (nailProps.pos === NailPos.Left) diff --git a/src/Add-on/DrawBoard/DrawLeftRightBoard.ts b/src/Add-on/DrawBoard/DrawLeftRightBoard.ts index d119842d0..47a6d945a 100644 --- a/src/Add-on/DrawBoard/DrawLeftRightBoard.ts +++ b/src/Add-on/DrawBoard/DrawLeftRightBoard.ts @@ -15,9 +15,9 @@ export class DrawLeftRight implements Command { let store = SideBoardStore.GetInstance(); - app.m_Editor.m_ModalManage.RenderModeless(BoardModal, ModalPosition.Center, { store, type: BoardModalType.LR }); + app.Editor.ModalManage.RenderModeless(BoardModal, ModalPosition.Center, { store, type: BoardModalType.LR }); - app.m_Editor.m_ModalManage.Callback = async () => + app.Editor.ModalManage.Callback = async () => { let data = store.m_Option; let lenght = data.height; @@ -29,7 +29,7 @@ export class DrawLeftRight implements Command let rightBoard = JigUtils.Draw(Board.CreateBoard(lenght, width, thickness, BoardType.Vertical)); rightBoard.ApplyMatrix(MoveMatrix(new Vector3(spacing - thickness))); - let ptRes = await app.m_Editor.GetPoint({ + let ptRes = await app.Editor.GetPoint({ Msg: "请拾取基点:", Callback: (v) => { @@ -51,8 +51,8 @@ export class DrawLeftRight implements Command rightBoard.Name = "右侧板" rightBoard.BoardProcessOption = store.BoardProcessOption; - app.m_Database.ModelSpace.Append(leftBoard); - app.m_Database.ModelSpace.Append(rightBoard); + app.Database.ModelSpace.Append(leftBoard); + app.Database.ModelSpace.Append(rightBoard); } JigUtils.End(); diff --git a/src/Add-on/DrawBoard/DrawSingleBoard.ts b/src/Add-on/DrawBoard/DrawSingleBoard.ts index 8fb6903b6..69d2abe58 100644 --- a/src/Add-on/DrawBoard/DrawSingleBoard.ts +++ b/src/Add-on/DrawBoard/DrawSingleBoard.ts @@ -14,9 +14,9 @@ export class DrawSingleBoard implements Command async exec() { let store = SingleBoardStore.GetInstance(); - app.m_Editor.m_ModalManage.RenderModeless(BoardModal, ModalPosition.Center, { store, type: BoardModalType.Sg }); + app.Editor.ModalManage.RenderModeless(BoardModal, ModalPosition.Center, { store, type: BoardModalType.Sg }); - app.m_Editor.m_ModalManage.Callback = async () => + app.Editor.ModalManage.Callback = async () => { const opt = store.m_Option; let board = JigUtils.Draw(Board.CreateBoard(opt.height, opt.width, opt.thickness, opt.type)); @@ -28,7 +28,7 @@ export class DrawSingleBoard implements Command board.RotateBoard(rx, ry, rz); - let ptRes = await app.m_Editor.GetPoint({ + let ptRes = await app.Editor.GetPoint({ Msg: "选择基点", Callback: v => { @@ -41,7 +41,7 @@ export class DrawSingleBoard implements Command { let vec = ptRes.Point.sub(board.MinPoint); board.ApplyMatrix(MoveMatrix(vec)); - app.m_Database.ModelSpace.Append(board); + app.Database.ModelSpace.Append(board); } JigUtils.End(); diff --git a/src/Add-on/DrawBoard/DrawSpecialShapeBoardTool.ts b/src/Add-on/DrawBoard/DrawSpecialShapeBoardTool.ts index e24683f9f..fbd970adb 100644 --- a/src/Add-on/DrawBoard/DrawSpecialShapeBoardTool.ts +++ b/src/Add-on/DrawBoard/DrawSpecialShapeBoardTool.ts @@ -23,7 +23,7 @@ export async function selectOutlinePosition(cus: Curve[] | Curve) else moveCus = cus; - let ptRes = await app.m_Editor.GetPoint({ + let ptRes = await app.Editor.GetPoint({ Msg: "点取位置", Callback: v => { @@ -33,7 +33,7 @@ export async function selectOutlinePosition(cus: Curve[] | Curve) }); if (ptRes.Status === PromptStatus.OK) - moveCus.forEach(cu => app.m_Database.ModelSpace.Append(cu)); + moveCus.forEach(cu => app.Database.ModelSpace.Append(cu)); JigUtils.End(); } @@ -55,7 +55,7 @@ export function BoardApplyContour(contour: ExtureContour, brs: Board[], isKeepSi br.Width = oldWidth; } } - app.m_Editor.UpdateScreen(); + app.Editor.UpdateScreen(); } @@ -72,7 +72,7 @@ export async function SelectExtrudeContour(selectInside = false, useExtrude = fa let Msg = useExtrude ? "请选择(拉伸实体,面域或曲线):" : "请选择(面域或曲线):"; let filterTypes = useExtrude ? [Region, ExtureSolid, Curve] : [Region, Curve]; - let ssRes = await app.m_Editor.GetSelection({ + let ssRes = await app.Editor.GetSelection({ Msg, Filter: { filterTypes }, Once: true @@ -87,7 +87,7 @@ export async function SelectExtrudeContour(selectInside = false, useExtrude = fa { if (selectInside || !en.IsClose) { - let cus = app.m_Viewer.VisibleEntitys.filter(e => e instanceof Curve) as Curve[]; + let cus = app.Viewer.VisibleEntitys.filter(e => e instanceof Curve) as Curve[]; let cuGroups = curveLinkGroup(cus); @@ -148,9 +148,9 @@ export function ExtrudeApplyContour(ext: ExtureSolid, contour: ExtureContour): M applyMatrix = ext.OCSInv; else if (isParallelTo( contour.Normal, - new Vector3().setFromMatrixColumn(app.m_Editor.UCSMatrix, 2) + new Vector3().setFromMatrixColumn(app.Editor.UCSMatrix, 2) )) - applyMatrix = app.m_Editor.UCSMatrixInv; + applyMatrix = app.Editor.UCSMatrixInv; else applyMatrix = contour.OCSInv; diff --git a/src/Add-on/DrawBoard/DrawSpecialShapedBoard.ts b/src/Add-on/DrawBoard/DrawSpecialShapedBoard.ts index 20b8169ca..731011b11 100644 --- a/src/Add-on/DrawBoard/DrawSpecialShapedBoard.ts +++ b/src/Add-on/DrawBoard/DrawSpecialShapedBoard.ts @@ -25,9 +25,9 @@ export class DrawSpecialShapedBoard implements Command store.m_Option.height = parseFloat(FixedNotZero(this.ext.Height, 2)); store.m_Option.width = parseFloat(FixedNotZero(this.ext.Width, 2)); - app.m_Editor.m_ModalManage.RenderModeless(SpecialShapeBoardModal, ModalPosition.Center, { store }); + app.Editor.ModalManage.RenderModeless(SpecialShapeBoardModal, ModalPosition.Center, { store }); - app.m_Editor.m_ModalManage.Callback = async () => + app.Editor.ModalManage.Callback = async () => { let br = new Board(); br.BoardType = store.m_Option.type; @@ -61,7 +61,7 @@ export class DrawSpecialShapedBoard implements Command } br.ApplyMatrix(toCurve); ExtrudeApplyContour(br, contour); - app.m_Database.ModelSpace.Append(br); + app.Database.ModelSpace.Append(br); //删除被应用的轮廓 if (useCurves) @@ -70,6 +70,6 @@ export class DrawSpecialShapedBoard implements Command } } else - app.m_Editor.Prompt('选择对象无效') + app.Editor.Prompt('选择对象无效') } } diff --git a/src/Add-on/DrawBoard/DrawSpecialShapedBoardByContour.ts b/src/Add-on/DrawBoard/DrawSpecialShapedBoardByContour.ts index 0baf51632..1946b721d 100644 --- a/src/Add-on/DrawBoard/DrawSpecialShapedBoardByContour.ts +++ b/src/Add-on/DrawBoard/DrawSpecialShapedBoardByContour.ts @@ -8,7 +8,7 @@ export class DrawSpecialShapedBoardByContour implements Command { async exec() { - let brRes = await app.m_Editor.GetSelection({ + let brRes = await app.Editor.GetSelection({ Msg: "请选择应用异形轮廓的板件", Filter: { filterTypes: [Board] } }) @@ -24,7 +24,7 @@ export class DrawSpecialShapedBoardByContour implements Command return; } - let keyWord = await app.m_Editor.GetKeyWords({ + let keyWord = await app.Editor.GetKeyWords({ Msg: "不改变板件大小:", KeyWordList: [{ key: "Y", msg: "是" }, { key: "N", msg: "否" }] }); diff --git a/src/Add-on/DrawBoard/DrawTopBottomBoard.ts b/src/Add-on/DrawBoard/DrawTopBottomBoard.ts index 131b09d55..ae7be9a84 100644 --- a/src/Add-on/DrawBoard/DrawTopBottomBoard.ts +++ b/src/Add-on/DrawBoard/DrawTopBottomBoard.ts @@ -18,9 +18,9 @@ export class DrawTopBottomBoard implements Command async exec() { this.store = TopBottomBoardStore.GetInstance(); - app.m_Editor.m_ModalManage.RenderModal(BoardModal, ModalPosition.Center, { store: this.store, type: BoardModalType.TB }); + app.Editor.ModalManage.RenderModal(BoardModal, ModalPosition.Center, { store: this.store, type: BoardModalType.TB }); - let res = await app.m_Editor.m_ModalManage.Wait(); + let res = await app.Editor.ModalManage.Wait(); if (res.Status === ModalState.Ok) { @@ -149,7 +149,7 @@ export class DrawTopBottomBoard implements Command basePt.add(new Vector3(rightExt, -frontDist)); board.ApplyMatrix(MoveMatrix(basePt)); board.ApplyMatrix(spaceParse.m_SpaceOCS); - app.m_Database.ModelSpace.Append(board); + app.Database.ModelSpace.Append(board); } private DrawFoolBoard(opt: TBBoardOption, spaceParse: ISpaceParse) @@ -166,7 +166,7 @@ export class DrawTopBottomBoard implements Command footBoard.BoardProcessOption.lines = LinesType.Reverse; footBoard.ApplyMatrix(MoveMatrix(spaceParse.m_SpaceBox.min.add(new Vector3(0, opt.footThickness + opt.footBehindShrink)))); footBoard.ApplyMatrix(spaceParse.m_SpaceOCS); - app.m_Database.ModelSpace.Append(footBoard); + app.Database.ModelSpace.Append(footBoard); } } } diff --git a/src/Add-on/DrawBoard/DrawVerticalBoard.ts b/src/Add-on/DrawBoard/DrawVerticalBoard.ts index e1783e79f..1678476f7 100644 --- a/src/Add-on/DrawBoard/DrawVerticalBoard.ts +++ b/src/Add-on/DrawBoard/DrawVerticalBoard.ts @@ -70,7 +70,7 @@ export class DrawVerticalBoard extends DrawBoardTool ))); b.ApplyMatrix(spaceOCS); - app.m_Database.ModelSpace.Append(b); + app.Database.ModelSpace.Append(b); } } } diff --git a/src/Add-on/DrawCircle.ts b/src/Add-on/DrawCircle.ts index 710762fe1..a000f49b8 100644 --- a/src/Add-on/DrawCircle.ts +++ b/src/Add-on/DrawCircle.ts @@ -10,7 +10,7 @@ export class DrawCircle implements Command { async exec() { - let ptRes = await app.m_Editor.GetPoint({ + let ptRes = await app.Editor.GetPoint({ Msg: "指定圆的圆心", KeyWordList: [{ key: "3P", msg: "三点" }, { key: "2P", msg: "二点" }, { key: "T", msg: "切点、切点、半径" }] }); @@ -44,10 +44,10 @@ export class DrawCircle implements Command async DrawCircleUseRadious(val: Vector3) { let cir = new Circle(); - cir.ApplyMatrix(app.m_Editor.UCSMatrix); + cir.ApplyMatrix(app.Editor.UCSMatrix); cir.Center = val; JigUtils.Draw(cir); - let disRes = await app.m_Editor.GetDistance({ + let disRes = await app.Editor.GetDistance({ Msg: "指定圆的半径:", BasePoint: val, Callback: (v) => cir.Radius = v, @@ -55,18 +55,18 @@ export class DrawCircle implements Command if (disRes.Status === PromptStatus.OK) { cir.Radius = disRes.Distance; - app.m_Database.ModelSpace.Append(cir); + app.Database.ModelSpace.Append(cir); } JigUtils.Destroy(); } async DrawCicleUseTwoPoint() { - let ptRes1 = await app.m_Editor.GetPoint({ Msg: "指定圆直径的第一个端点:" }); + let ptRes1 = await app.Editor.GetPoint({ Msg: "指定圆直径的第一个端点:" }); if (ptRes1.Status != PromptStatus.OK) return; let cir = new Circle(); JigUtils.Draw(cir); - let ptRes2 = await app.m_Editor.GetPoint({ + let ptRes2 = await app.Editor.GetPoint({ Msg: "指定圆直径的第二个端点:", BasePoint: ptRes1.Point, AllowDrawRubberBand: true, @@ -80,18 +80,18 @@ export class DrawCircle implements Command { cir.Radius = ptRes2.Point.distanceTo(ptRes1.Point) / 2; cir.Center = midPoint(ptRes2.Point, ptRes1.Point); - app.m_Database.ModelSpace.Append(cir); + app.Database.ModelSpace.Append(cir); } JigUtils.Destroy(); } async DrawCicleUseThreePoint() { - let ptRes1 = await app.m_Editor.GetPoint({ Msg: "指定圆上第一个点:" }); + let ptRes1 = await app.Editor.GetPoint({ Msg: "指定圆上第一个点:" }); if (ptRes1.Status != PromptStatus.OK) return; let cir = new Circle(); let ar = new Arc(); - let ptRes2 = await app.m_Editor.GetPoint({ + let ptRes2 = await app.Editor.GetPoint({ Msg: "指定圆上第二个点:", BasePoint: ptRes1.Point, AllowDrawRubberBand: true @@ -99,7 +99,7 @@ export class DrawCircle implements Command if (ptRes2.Status != PromptStatus.OK) return; JigUtils.Draw(cir); - let ptRes3 = await app.m_Editor.GetPoint({ + let ptRes3 = await app.Editor.GetPoint({ Msg: "指定圆上第三个点:", BasePoint: ptRes2.Point, AllowDrawRubberBand: true, @@ -115,7 +115,7 @@ export class DrawCircle implements Command ar.FromThreePoint(ptRes1.Point, ptRes2.Point, ptRes3.Point); cir.Radius = ar.Radius; cir.Center = ar.Center; - app.m_Database.ModelSpace.Append(cir); + app.Database.ModelSpace.Append(cir); } JigUtils.Destroy(); } diff --git a/src/Add-on/DrawCylinder.ts b/src/Add-on/DrawCylinder.ts index 6a6c28253..7dc49055f 100644 --- a/src/Add-on/DrawCylinder.ts +++ b/src/Add-on/DrawCylinder.ts @@ -8,14 +8,14 @@ export class DrawCylineder implements Command { async exec() { - let ptRes = await app.m_Editor.GetPoint({ Msg: "指定底面中心点" }); + let ptRes = await app.Editor.GetPoint({ Msg: "指定底面中心点" }); if (ptRes.Status === PromptStatus.Cancel) return; let cylineder = JigUtils.Draw(new Cylineder()); cylineder.Center = ptRes.Point; - let disRes = await app.m_Editor.GetDistance({ + let disRes = await app.Editor.GetDistance({ Msg: "指定底圆的半径:", BasePoint: ptRes.Point, Callback: (v) => cylineder.Radius = v, @@ -24,7 +24,7 @@ export class DrawCylineder implements Command return; cylineder.Radius = disRes.Distance; - disRes = await app.m_Editor.GetDistance({ + disRes = await app.Editor.GetDistance({ Msg: "指定圆柱高度:", BasePoint: ptRes.Point, Callback: (v) => cylineder.Height = v, @@ -34,7 +34,7 @@ export class DrawCylineder implements Command if (disRes.Status === PromptStatus.OK) { cylineder.Height = disRes.Distance; - app.m_Database.ModelSpace.Append(cylineder); + app.Database.ModelSpace.Append(cylineder); } } } diff --git a/src/Add-on/DrawDim/Command_DimContinue.ts b/src/Add-on/DrawDim/Command_DimContinue.ts index 5e3b37690..6ad19fd6c 100644 --- a/src/Add-on/DrawDim/Command_DimContinue.ts +++ b/src/Add-on/DrawDim/Command_DimContinue.ts @@ -28,7 +28,7 @@ export class Command_DimContinue implements Command { async exec() { - let dimRes = await app.m_Editor.GetEntity({ + let dimRes = await app.Editor.GetEntity({ Msg: "选择连续标注", Filter: { filterTypes: [AlignedDimension, LineAngularDimension, LinearDimension] } }); diff --git a/src/Add-on/DrawDim/DimContinue.ts b/src/Add-on/DrawDim/DimContinue.ts index 7b51b4af0..9d7461261 100644 --- a/src/Add-on/DrawDim/DimContinue.ts +++ b/src/Add-on/DrawDim/DimContinue.ts @@ -11,13 +11,13 @@ export class DimContinue async StartDraw(lastDim: Dimension) { this.m_LastDim = lastDim.Clone(); - let oldUcs = app.m_Editor.UCSMatrix; - app.m_Editor.UCSMatrix = this.m_LastDim.OCS; + let oldUcs = app.Editor.UCSMatrix; + app.Editor.UCSMatrix = this.m_LastDim.OCS; while (true) { let newDim = this.CloneDimension(this.m_LastDim); JigUtils.Draw(newDim); - let ptRes = await app.m_Editor.GetPoint({ + let ptRes = await app.Editor.GetPoint({ AllowNone: true, BasePoint: this.m_BasePoint, Msg: "指定第二个尺寸原点", @@ -27,14 +27,14 @@ export class DimContinue { let p = ptRes.Point; this.UpdateNextPoint(p, newDim); - app.m_Database.ModelSpace.Append(newDim); + app.Database.ModelSpace.Append(newDim); this.Drawed(newDim, p); } else break; } this.EndDraw(); - app.m_Editor.UCSMatrix = oldUcs; + app.Editor.UCSMatrix = oldUcs; } /** * 重载: 当绘制开始时,会拷贝标注,此时你可以进行一些操作 diff --git a/src/Add-on/DrawDim/Draw2LineAngularDim.ts b/src/Add-on/DrawDim/Draw2LineAngularDim.ts index ea581557a..fb983695e 100644 --- a/src/Add-on/DrawDim/Draw2LineAngularDim.ts +++ b/src/Add-on/DrawDim/Draw2LineAngularDim.ts @@ -23,7 +23,7 @@ export class Command_Draw2LineAngularDim { if (l1) msg = "请选择第二条直线"; - let lineRes = await app.m_Editor.GetEntity({ + let lineRes = await app.Editor.GetEntity({ Msg: msg, Filter: { filterTypes: [Curve], @@ -85,7 +85,7 @@ export class Command_Draw2LineAngularDim { if (!cenPt) { - let cenPtRes = await app.m_Editor.GetPoint({ + let cenPtRes = await app.Editor.GetPoint({ Msg: "指定角的顶点" }) if (cenPtRes.Status === PromptStatus.Cancel) @@ -94,7 +94,7 @@ export class Command_Draw2LineAngularDim } if (!p1) { - let ptRes = await app.m_Editor.GetPoint({ + let ptRes = await app.Editor.GetPoint({ Msg: "指定角的第一个端点", BasePoint: cenPt, AllowDrawRubberBand: true @@ -104,7 +104,7 @@ export class Command_Draw2LineAngularDim p1 = ptRes.Point; } - let ptRes = await app.m_Editor.GetPoint({ + let ptRes = await app.Editor.GetPoint({ Msg: "指定角的第二个端点", BasePoint: cenPt, AllowDrawRubberBand: true @@ -124,14 +124,14 @@ export class Command_Draw2LineAngularDim let derv2 = l2.GetFistDeriv(0).normalize(); if (isParallelTo(derv1, derv2)) { - app.m_Editor.Prompt("两直线平行!"); + app.Editor.Prompt("两直线平行!"); return; } let norm = derv1.clone().cross(derv2); let ocs: Matrix4; - for (const mat of [app.m_Editor.UCSMatrix, l1.OCS, l2.OCS]) + for (const mat of [app.Editor.UCSMatrix, l1.OCS, l2.OCS]) { if (isParallelTo( new Vector3().setFromMatrixColumn(mat, 2), @@ -144,7 +144,7 @@ export class Command_Draw2LineAngularDim } if (!ocs) { - app.m_Editor.Prompt("绘制的标注实体和当前的UCS坐标系不一致,绘制失败."); + app.Editor.Prompt("绘制的标注实体和当前的UCS坐标系不一致,绘制失败."); return; } let dim = new LineAngularDimension(); @@ -160,7 +160,7 @@ export class Command_Draw2LineAngularDim JigUtils.Draw(dim); - let ptRes = await app.m_Editor.GetPoint({ + let ptRes = await app.Editor.GetPoint({ Callback: (p) => { dim.UpdateDimData(undefined, undefined, undefined, undefined, p); @@ -169,7 +169,7 @@ export class Command_Draw2LineAngularDim if (ptRes.Status === PromptStatus.OK) { - app.m_Database.ModelSpace.Append(dim); + app.Database.ModelSpace.Append(dim); await ContinueDrawDimension(dim); } } diff --git a/src/Add-on/DrawDim/DrawAlignedDimension.ts b/src/Add-on/DrawDim/DrawAlignedDimension.ts index c76caca45..6b3cbd9fb 100644 --- a/src/Add-on/DrawDim/DrawAlignedDimension.ts +++ b/src/Add-on/DrawDim/DrawAlignedDimension.ts @@ -23,7 +23,7 @@ export class DrawAlignedDimension implements Command protected DimType = DimensionType.Align; async exec() { - let ptRes = await app.m_Editor.GetPoint({ Msg: "请指定第一条尺寸线原点:", AllowNone: true }); + let ptRes = await app.Editor.GetPoint({ Msg: "请指定第一条尺寸线原点:", AllowNone: true }); if (ptRes.Status === PromptStatus.OK) await this.SelectPointDim(ptRes.Point); @@ -33,7 +33,7 @@ export class DrawAlignedDimension implements Command } private async SelectPointDim(footPt1: Vector3) { - let ptRes = await app.m_Editor.GetPoint({ + let ptRes = await app.Editor.GetPoint({ Msg: "请输入第二条尺寸线原点:", BasePoint: footPt1, AllowDrawRubberBand: true, @@ -47,7 +47,7 @@ export class DrawAlignedDimension implements Command } private async PickUpDim() { - let enRes = await app.m_Editor.GetEntity({ + let enRes = await app.Editor.GetEntity({ Msg: "选择对象", Filter: { filterTypes: [Curve] } }); @@ -84,7 +84,7 @@ export class DrawAlignedDimension implements Command else alDim = new LinearDimension(); - alDim.ApplyMatrix(app.m_Editor.UCSMatrix); + alDim.ApplyMatrix(app.Editor.UCSMatrix); alDim.FootP1 = footPt1; alDim.ArmP1 = footPt1; @@ -105,7 +105,7 @@ export class DrawAlignedDimension implements Command return p; } - let ptRes = await app.m_Editor.GetPoint({ + let ptRes = await app.Editor.GetPoint({ Msg: "指定尺寸线位置:", Callback: (v) => { alDim.TextPosition = getPt(v); } }); @@ -113,7 +113,7 @@ export class DrawAlignedDimension implements Command if (ptRes.Status == PromptStatus.OK) { alDim.TextPosition = getPt(ptRes.Point); - app.m_Database.ModelSpace.Append(alDim); + app.Database.ModelSpace.Append(alDim); await ContinueDrawDimension(alDim); } } diff --git a/src/Add-on/DrawDim/DrawRadiusDim.ts b/src/Add-on/DrawDim/DrawRadiusDim.ts index 7281bffa9..19c6b15a9 100644 --- a/src/Add-on/DrawDim/DrawRadiusDim.ts +++ b/src/Add-on/DrawDim/DrawRadiusDim.ts @@ -22,7 +22,7 @@ export class DrawRadiusDim implements Command let cu: Arc | Circle; while (true) { - let enRes = await app.m_Editor.GetEntity({ + let enRes = await app.Editor.GetEntity({ Msg: "选择圆或者圆弧", Filter: { filterTypes: [Circle, Arc] } }); @@ -45,7 +45,7 @@ export class DrawRadiusDim implements Command JigUtils.Draw(dim); - let ptRes = await app.m_Editor.GetPoint({ + let ptRes = await app.Editor.GetPoint({ Msg: "指定尺寸线位置", Callback: (p) => { @@ -55,7 +55,7 @@ export class DrawRadiusDim implements Command if (ptRes.Status === PromptStatus.OK) { this.UpdateDim(dim, ptRes.Point, startPt, rad); - app.m_Database.ModelSpace.Append(dim); + app.Database.ModelSpace.Append(dim); } } private UpdateDim(dim: RadiusDimension, endPt: Vector3, startPt: Vector3, rad: number) diff --git a/src/Add-on/DrawDrilling/DeleteDrill.ts b/src/Add-on/DrawDrilling/DeleteDrill.ts index 8dddcbab5..4aa0f359e 100644 --- a/src/Add-on/DrawDrilling/DeleteDrill.ts +++ b/src/Add-on/DrawDrilling/DeleteDrill.ts @@ -54,7 +54,7 @@ export class DeleteDrill implements Command break; } - let brRes = await app.m_Editor.GetSelection({ + let brRes = await app.Editor.GetSelection({ Msg: promptMsg, KeyWordList: kw, Filter: { filterTypes } diff --git a/src/Add-on/DrawDrilling/DrawDrilling.ts b/src/Add-on/DrawDrilling/DrawDrilling.ts index ec4d71c96..cc08a7bed 100644 --- a/src/Add-on/DrawDrilling/DrawDrilling.ts +++ b/src/Add-on/DrawDrilling/DrawDrilling.ts @@ -9,7 +9,7 @@ export class DrawDrilling implements Command { async exec() { - let brsRes = await app.m_Editor.GetSelection({ + let brsRes = await app.Editor.GetSelection({ Msg: "选择板件", UseSelect: true, Filter: { filterTypes: [Board] } diff --git a/src/Add-on/DrawDrilling/DrawDrillingTool.ts b/src/Add-on/DrawDrilling/DrawDrillingTool.ts index d22557f11..a05ac3bdc 100644 --- a/src/Add-on/DrawDrilling/DrawDrillingTool.ts +++ b/src/Add-on/DrawDrilling/DrawDrillingTool.ts @@ -220,7 +220,7 @@ export class DrawDrillingTool extends Singleton cloneD.FId = this.m_Face.m_LocalBoard.Id; cloneD.ApplyMatrix(MoveMatrix(new Vector3(dist))) .ApplyMatrix(this.m_Face.OCS); - app.m_Database.ModelSpace.Append(cloneD); + app.Database.ModelSpace.Append(cloneD); newDrillEnts.push(cloneD.Id); } newDrillentList.push(newDrillEnts); @@ -420,7 +420,7 @@ export class DrawDrillingTool extends Singleton if (!suitableOption) { - app.m_Editor.Prompt("长度" + f.m_Length + "没有合适的规则,或者当前配置不存在" + f.drillType + "类型排钻"); + app.Editor.Prompt("长度" + f.m_Length + "没有合适的规则,或者当前配置不存在" + f.drillType + "类型排钻"); continue; } let notGangDist = suitableOption.notGangDist; diff --git a/src/Add-on/DrawDrilling/DrillConfig.ts b/src/Add-on/DrawDrilling/DrillConfig.ts index 2246500fc..88620d0ba 100644 --- a/src/Add-on/DrawDrilling/DrillConfig.ts +++ b/src/Add-on/DrawDrilling/DrillConfig.ts @@ -9,6 +9,6 @@ export class DrillConfig implements Command async exec() { let store = DrillStore.GetInstance(); - app.m_Editor.m_ModalManage.RenderModal(DrillModal, ModalPosition.Center, { store }); + app.Editor.ModalManage.RenderModal(DrillModal, ModalPosition.Center, { store }); } } diff --git a/src/Add-on/DrawDrilling/DrillingReactor.ts b/src/Add-on/DrawDrilling/DrillingReactor.ts index fd0291704..2e4c163d4 100644 --- a/src/Add-on/DrawDrilling/DrillingReactor.ts +++ b/src/Add-on/DrawDrilling/DrillingReactor.ts @@ -13,7 +13,7 @@ export class DrillingReactor constructor() { this.Enable = userConfig.openDrillingReactor; - app.m_CommandReactor.OnCommandEnd((cmdName: string, changeObjects, createObjects) => + app.CommandReactor.OnCommandEnd((cmdName: string, changeObjects, createObjects) => { if (!this.Enable) return; @@ -47,7 +47,7 @@ export class DrillingReactor private GetSurroundBoards(brList: Board[]) { let brs: Board[] = []; - for (let ent of app.m_Viewer.VisibleEntitys) + for (let ent of app.Viewer.VisibleEntitys) { if (ent instanceof Board && !brList.includes(ent)) brs.push(ent); diff --git a/src/Add-on/DrawEllipse.ts b/src/Add-on/DrawEllipse.ts index fb0a9d6af..c5afff632 100644 --- a/src/Add-on/DrawEllipse.ts +++ b/src/Add-on/DrawEllipse.ts @@ -15,7 +15,7 @@ export class DrawEllipse implements Command { async exec() { - let ptRes = await app.m_Editor.GetPoint({ + let ptRes = await app.Editor.GetPoint({ Msg: "指定椭圆中心", }); @@ -23,7 +23,7 @@ export class DrawEllipse implements Command return; //椭圆X轴半径点 - let radXRes = await app.m_Editor.GetPoint({ + let radXRes = await app.Editor.GetPoint({ Msg: "指定轴端点:", BasePoint: ptRes.Point, AllowDrawRubberBand: true, @@ -32,7 +32,7 @@ export class DrawEllipse implements Command return; let disVec = radXRes.Point.sub(ptRes.Point); - let ucs = app.m_Editor.UCSMatrix; + let ucs = app.Editor.UCSMatrix; disVec.applyMatrix4(new Matrix4().getInverse(ucs)); //实例化椭圆 let ellipse = new Ellipse(new Vector3(), disVec.length(), 0, Math.atan2(disVec.y, disVec.x)); @@ -41,7 +41,7 @@ export class DrawEllipse implements Command JigUtils.Draw(ellipse); //椭圆Y轴 - let radYRes = await app.m_Editor.GetDistance({ + let radYRes = await app.Editor.GetDistance({ Msg: "指定轴端点:", BasePoint: ptRes.Point, Callback: (v) => ellipse.RadY = v, @@ -50,7 +50,7 @@ export class DrawEllipse implements Command if (radYRes.Status === PromptStatus.OK) { ellipse.RadY = radYRes.Distance; - app.m_Database.ModelSpace.Append(ellipse); + app.Database.ModelSpace.Append(ellipse); } JigUtils.Destroy(); } diff --git a/src/Add-on/DrawFloor.ts b/src/Add-on/DrawFloor.ts index 1e9db8e3f..0ce813fe2 100644 --- a/src/Add-on/DrawFloor.ts +++ b/src/Add-on/DrawFloor.ts @@ -11,7 +11,7 @@ export class DrawFloor implements Command get scene() { - return app.m_Viewer.Scene; + return app.Viewer.Scene; } constructor() { @@ -19,7 +19,7 @@ export class DrawFloor implements Command } async exec() { - app.m_Viewer.Camera.position.set(0, 0, 2); + app.Viewer.Camera.position.set(0, 0, 2); this.drawFloor(); this.drawLight(); @@ -34,7 +34,7 @@ export class DrawFloor implements Command this.loadMaterial(); - app.m_Viewer.m_Render.toneMappingExposure = Math.pow(0.68, 5.0); // to allow for very bright scenes. + app.Viewer.Renderer.toneMappingExposure = Math.pow(0.68, 5.0); // to allow for very bright scenes. } async loadFbx() @@ -153,12 +153,12 @@ export class DrawFloor implements Command var clock = new THREE.Clock(); - begin(app.m_Viewer, app.m_Viewer.StartRender, () => + begin(app.Viewer, app.Viewer.StartRender, () => { var time = Date.now() * 0.0005; var delta = clock.getDelta(); bulbLight.position.z = Math.cos(time) * 0.75 + 1.25; - app.m_Viewer.m_bNeedUpdate = true; + app.Viewer.UpdateRender(); }) } private drawHemiLight() diff --git a/src/Add-on/DrawGripStretch.ts b/src/Add-on/DrawGripStretch.ts index 5d6936010..ddb004d17 100644 --- a/src/Add-on/DrawGripStretch.ts +++ b/src/Add-on/DrawGripStretch.ts @@ -14,9 +14,9 @@ export class DrawGripStretch implements Command { async exec() { - if (app.m_Viewer.m_OutlinePass.selectedObjects.length === 0) + if (app.Viewer.OutlinePass.selectedObjects.length === 0) { - app.m_Editor.Prompt("未选择对象:"); + app.Editor.Prompt("未选择对象:"); return; } @@ -30,7 +30,7 @@ export class DrawGripStretch implements Command }); - for (let en of app.m_Viewer.m_OutlinePass.selectedObjects) + for (let en of app.Viewer.OutlinePass.selectedObjects) { if (en instanceof THREE.Mesh || en instanceof THREE.Line) { @@ -43,7 +43,7 @@ export class DrawGripStretch implements Command } } let pts = new THREE.Points(geometry, material); - app.m_Viewer.Scene.add(pts); + app.Viewer.Scene.add(pts); } } } diff --git a/src/Add-on/DrawLight/DrawPointLight.ts b/src/Add-on/DrawLight/DrawPointLight.ts index 9a4422a35..443e5245d 100644 --- a/src/Add-on/DrawLight/DrawPointLight.ts +++ b/src/Add-on/DrawLight/DrawPointLight.ts @@ -9,12 +9,12 @@ export class DrawPointLight implements Command { let light = JigUtils.Draw(new PointLight()); - let ptRes = await app.m_Editor.GetPoint({ + let ptRes = await app.Editor.GetPoint({ Msg: "选择点光源位置", Callback: p => light.Position = p }); - let valRes = await app.m_Editor.GetDistance({ + let valRes = await app.Editor.GetDistance({ Msg: "设置点光源强度", Default: 1 }); @@ -23,7 +23,7 @@ export class DrawPointLight implements Command return; light.Intensity = valRes.Distance; - valRes = await app.m_Editor.GetDistance({ + valRes = await app.Editor.GetDistance({ Msg: "设置点光源照射距离", Default: 100 }); @@ -31,7 +31,7 @@ export class DrawPointLight implements Command if (ptRes.Status === PromptStatus.OK) { light.Distance = valRes.Distance; - app.m_Database.ModelSpace.Append(light); + app.Database.ModelSpace.Append(light); } } } @@ -41,7 +41,7 @@ export class DrawPointLight2 implements Command { let light = JigUtils.Draw(new PointLight()); - let ptRes = await app.m_Editor.GetPoint({ + let ptRes = await app.Editor.GetPoint({ Msg: "选择点光源位置", Callback: p => light.Position = p }); @@ -49,7 +49,7 @@ export class DrawPointLight2 implements Command if (ptRes.Status === PromptStatus.OK) { light.Position = ptRes.Point; - app.m_Database.ModelSpace.Append(light); + app.Database.ModelSpace.Append(light); } } } diff --git a/src/Add-on/DrawLight/DrawRectAreaLight.ts b/src/Add-on/DrawLight/DrawRectAreaLight.ts index 384b68dda..dc6f72fa7 100644 --- a/src/Add-on/DrawLight/DrawRectAreaLight.ts +++ b/src/Add-on/DrawLight/DrawRectAreaLight.ts @@ -10,24 +10,24 @@ export class DrawRectAreaLight implements Command { async exec() { - let ptRes = await app.m_Editor.GetPoint({ + let ptRes = await app.Editor.GetPoint({ Msg: "选择矩形光范围点" }); if (ptRes.Status === PromptStatus.Cancel) return; let light = JigUtils.Draw(new RectAreaLight()); - light.ApplyMatrix(app.m_Editor.UCSMatrix); + light.ApplyMatrix(app.Editor.UCSMatrix); let p1 = ptRes.Point; - ptRes = await app.m_Editor.GetPoint({ + ptRes = await app.Editor.GetPoint({ Msg: "选择矩形光范围点2", Callback: p => this.UpdateLight(p1, p, light) }); if (ptRes.Status === PromptStatus.OK) { this.UpdateLight(p1, ptRes.Point, light); - app.m_Database.ModelSpace.Append(light); + app.Database.ModelSpace.Append(light); } } private UpdateLight(p1: Vector3, p2: Vector3, light: RectAreaLight) @@ -37,7 +37,7 @@ export class DrawRectAreaLight implements Command light.Target = cen.add(light.Normal.multiplyScalar(100).negate()); let box = new Box3(); - box.setFromPoints([p1, p2].map(p => p.clone().applyMatrix4(app.m_Editor.UCSMatrixInv))); + box.setFromPoints([p1, p2].map(p => p.clone().applyMatrix4(app.Editor.UCSMatrixInv))); let size = box.getSize(new Vector3()); if (equaln(size.x, 0) || equaln(size.y, 0)) return; if (!equaln(light.Normal.x, 0)) diff --git a/src/Add-on/DrawLight/DrawSpotLight.ts b/src/Add-on/DrawLight/DrawSpotLight.ts index b56601f1f..ba7d97109 100644 --- a/src/Add-on/DrawLight/DrawSpotLight.ts +++ b/src/Add-on/DrawLight/DrawSpotLight.ts @@ -10,7 +10,7 @@ export class DrawSpotLight implements Command { async exec() { - let ptRes = await app.m_Editor.GetPoint({ + let ptRes = await app.Editor.GetPoint({ Msg: "选择光源位置" }); @@ -18,10 +18,10 @@ export class DrawSpotLight implements Command return; let light = JigUtils.Draw(new SpotLight()); - light.ApplyMatrix(app.m_Editor.UCSMatrix); + light.ApplyMatrix(app.Editor.UCSMatrix); light.Position = ptRes.Point; - ptRes = await app.m_Editor.GetPoint({ + ptRes = await app.Editor.GetPoint({ Msg: "选择照射目标点", BasePoint: ptRes.Point, Callback: p => light.Target = p @@ -30,7 +30,7 @@ export class DrawSpotLight implements Command if (ptRes.Status === PromptStatus.OK) { light.Target = ptRes.Point; - app.m_Database.ModelSpace.Append(light); + app.Database.ModelSpace.Append(light); } } @@ -40,8 +40,8 @@ export class DrawSpotLight2 implements Command async exec() { let light = JigUtils.Draw(new SpotLight()); - light.ApplyMatrix(app.m_Editor.UCSMatrix); - let ptRes = await app.m_Editor.GetPoint({ + light.ApplyMatrix(app.Editor.UCSMatrix); + let ptRes = await app.Editor.GetPoint({ Msg: "选择射灯位置", Callback: p => this.update(light, p) }); @@ -49,13 +49,13 @@ export class DrawSpotLight2 implements Command if (ptRes.Status === PromptStatus.OK) { this.update(light, ptRes.Point); - app.m_Database.ModelSpace.Append(light); + app.Database.ModelSpace.Append(light); } } update(light: SpotLight, p: Vector3) { - let ucs = app.m_Editor.UCSMatrix; - let ucsInv = app.m_Editor.UCSMatrixInv; + let ucs = app.Editor.UCSMatrix; + let ucsInv = app.Editor.UCSMatrixInv; light.Position = p; let target = p.clone().applyMatrix4(ucsInv) .setZ(0).applyMatrix4(ucs); diff --git a/src/Add-on/DrawLine.ts b/src/Add-on/DrawLine.ts index 70bafe3e9..9de540958 100644 --- a/src/Add-on/DrawLine.ts +++ b/src/Add-on/DrawLine.ts @@ -13,7 +13,7 @@ export class DrawLine implements Command { async exec() { - let ptRes = await app.m_Editor.GetPoint({ Msg: "请输入第一个点:" }); + let ptRes = await app.Editor.GetPoint({ Msg: "请输入第一个点:" }); if (ptRes.Status != PromptStatus.OK) return; @@ -22,8 +22,8 @@ export class DrawLine implements Command let cir: Circle | Arc; if (isTan) { - let pick = new SelectPick(app.m_Viewer, app.m_Viewer.WorldToScreen(ptRes.Point)); - pick.Select(app.m_Viewer.VisibleObjects, { filterTypes: [Circle, Arc] }); + let pick = new SelectPick(app.Viewer, app.Viewer.WorldToScreen(ptRes.Point)); + pick.Select(app.Viewer.VisibleObjects, { filterTypes: [Circle, Arc] }); let cirs = pick.SelectEntityList as Circle[]; for (let e of cirs) @@ -37,7 +37,7 @@ export class DrawLine implements Command while (true) { let line = new Line(); - let ucsMatrix = app.m_Editor.UCSMatrix; + let ucsMatrix = app.Editor.UCSMatrix; line.ApplyMatrix(ucsMatrix); line.StartPoint = ptLast; @@ -59,7 +59,7 @@ export class DrawLine implements Command line.EndPoint = p; } - ptRes = await app.m_Editor.GetPoint({ + ptRes = await app.Editor.GetPoint({ Msg: "请输入点2:", BasePoint: isFirstAndTan ? undefined : ptLast, AllowDrawRubberBand: true, @@ -75,7 +75,7 @@ export class DrawLine implements Command { updateEndPt(ptRes.Point); - app.m_Database.ModelSpace.Append(line); + app.Database.ModelSpace.Append(line); drawLines.push(line); ptLast = ptRes.Point; continue; @@ -87,7 +87,7 @@ export class DrawLine implements Command if (drawLines.length > 0) { let lastLine = drawLines[drawLines.length - 1]; - app.m_Database.ModelSpace.Remove(lastLine); + app.Database.ModelSpace.Remove(lastLine); drawLines.pop(); ptLast = lastLine.StartPoint; @@ -98,7 +98,7 @@ export class DrawLine implements Command if (drawLines.length > 1) { let line = new Line(ptLast, drawLines[0].StartPoint); - app.m_Database.ModelSpace.Append(line); + app.Database.ModelSpace.Append(line); break; } } diff --git a/src/Add-on/DrawPoint.ts b/src/Add-on/DrawPoint.ts index 35b2da698..d0e477689 100644 --- a/src/Add-on/DrawPoint.ts +++ b/src/Add-on/DrawPoint.ts @@ -10,14 +10,14 @@ export class CMD_DrawPoint implements Command { while (true) { - app.m_Database.hm.StartMark(); - let ptRes = await app.m_Editor.GetPoint({ Msg: "请输入或点取点的位置" }); + app.Database.hm.StartMark(); + let ptRes = await app.Editor.GetPoint({ Msg: "请输入或点取点的位置" }); if (ptRes.Status != PromptStatus.OK) break; else { let ptEnt = new Point(ptRes.Point); - app.m_Database.ModelSpace.Append(ptEnt); + app.Database.ModelSpace.Append(ptEnt); continue; } } diff --git a/src/Add-on/DrawPolyline.ts b/src/Add-on/DrawPolyline.ts index e26ce15e6..4a342bbff 100644 --- a/src/Add-on/DrawPolyline.ts +++ b/src/Add-on/DrawPolyline.ts @@ -21,8 +21,8 @@ export class DrawPolyline this.model = PolylineModel.Line; let pl = new Polyline(); - pl.ApplyMatrix(app.m_Editor.UCSMatrix); - app.m_Database.ModelSpace.Append(pl); + pl.ApplyMatrix(app.Editor.UCSMatrix); + app.Database.ModelSpace.Append(pl); let plJig = JigUtils.Draw(pl); @@ -50,7 +50,7 @@ export class DrawPolyline } plJig.AddVertexAt(plJig.NumberOfVertices, new Vector2()); - let p = await app.m_Editor.GetPoint(ops); + let p = await app.Editor.GetPoint(ops); if (p.Status === PromptStatus.OK) { @@ -104,7 +104,7 @@ export class DrawPolyline JigUtils.End(); if (pl.NumberOfVertices < 2) { - app.m_Database.ModelSpace.Remove(pl); + app.Database.ModelSpace.Remove(pl); return true; } } @@ -133,7 +133,7 @@ export class DrawPolyline pl.SetBulgeAt(ptCout - 2, Math.tan(cirAng * 0.25)); } - app.m_Editor.UpdateScreen(); + app.Editor.UpdateScreen(); } RemoveLastVertex(pl: Polyline) diff --git a/src/Add-on/DrawRect.ts b/src/Add-on/DrawRect.ts index 666553d26..b635e8ead 100644 --- a/src/Add-on/DrawRect.ts +++ b/src/Add-on/DrawRect.ts @@ -7,15 +7,15 @@ export class DrawRect implements Command async exec() { - let rectRes = await app.m_Editor.GetRectPoint(); + let rectRes = await app.Editor.GetRectPoint(); if (rectRes.Status === PromptStatus.OK) { let rec = new Polyline(); rec.Create2Pt(rectRes.Point1UCS, rectRes.Point2UCS); - rec.ApplyMatrix(app.m_Editor.UCSMatrix); + rec.ApplyMatrix(app.Editor.UCSMatrix); - app.m_Database.ModelSpace.Append(rec); + app.Database.ModelSpace.Append(rec); } } } diff --git a/src/Add-on/DrawRegion.ts b/src/Add-on/DrawRegion.ts index 4f2e1a29c..0943b29ea 100644 --- a/src/Add-on/DrawRegion.ts +++ b/src/Add-on/DrawRegion.ts @@ -9,7 +9,7 @@ export class DrawRegion implements Command { async exec() { - let ssRes = await app.m_Editor.GetSelection({ UseSelect: true, Filter: { filterTypes: [Curve] } }); + let ssRes = await app.Editor.GetSelection({ UseSelect: true, Filter: { filterTypes: [Curve] } }); if (ssRes.Status !== PromptStatus.OK) return; @@ -23,9 +23,9 @@ export class DrawRegion implements Command if (cu.IsClose) { let reg = Region.CreateFromCurves([cu.Clone() as Curve]); - if(reg) + if (reg) { - app.m_Database.ModelSpace.Append(reg); + app.Database.ModelSpace.Append(reg); cu.Erase(); } } @@ -36,9 +36,9 @@ export class DrawRegion implements Command { let reg = new RegionParse(lines, 3); - for (let routes of reg.m_RegionsOutline) + for (let routes of reg.RegionsOutline) this.DrawRegion(routes); - for (let routes of reg.m_RegionsInternal) + for (let routes of reg.RegionsInternal) this.DrawRegion(routes); for (let cu of cus) @@ -47,11 +47,11 @@ export class DrawRegion implements Command cu.Erase(); } - for (let [, cus] of reg.m_ExpLineMap) + for (let [, cus] of reg.ExpLineMap) { for (let c of cus) if (!reg.GetCueveUsed(c)) - app.m_Database.ModelSpace.Append(c); + app.Database.ModelSpace.Append(c); } } } @@ -62,6 +62,6 @@ export class DrawRegion implements Command cus.push(r.curve); let reg = Region.CreateFromCurves(cus); if (reg) - app.m_Database.ModelSpace.Append(reg); + app.Database.ModelSpace.Append(reg); } } diff --git a/src/Add-on/DrawSky.ts b/src/Add-on/DrawSky.ts index af05ac365..e04c46443 100644 --- a/src/Add-on/DrawSky.ts +++ b/src/Add-on/DrawSky.ts @@ -9,7 +9,7 @@ export class DrawSky implements Command async exec() { let sky = new Sky(); - app.m_Viewer.Scene.add(sky); + app.Viewer.Scene.add(sky); sky.scale.setScalar(50); sky.rotateY(Math.PI); diff --git a/src/Add-on/DrawSphere.ts b/src/Add-on/DrawSphere.ts index 1e0c0828e..b1a722cd5 100644 --- a/src/Add-on/DrawSphere.ts +++ b/src/Add-on/DrawSphere.ts @@ -6,12 +6,12 @@ export class DrawSphere implements Command async exec() { let sphere = new Mesh(new SphereGeometry(1, 16, 16)); - let ptRes = app.m_Editor.GetPoint({ + let ptRes = app.Editor.GetPoint({ Callback: (pt) => { sphere.position.copy(pt); } }); - app.m_Viewer.Scene.add(sphere); + app.Viewer.Scene.add(sphere); } } diff --git a/src/Add-on/DrawSpline.ts b/src/Add-on/DrawSpline.ts index dfaf44ab0..f3edf3541 100644 --- a/src/Add-on/DrawSpline.ts +++ b/src/Add-on/DrawSpline.ts @@ -9,8 +9,8 @@ export class DrawSpline implements Command { async exec() { - app.m_Editor.Prompt("请输入一个点:"); - let ptRes = await app.m_Editor.GetPoint({ Msg: "请输入第一个点:" }); + app.Editor.Prompt("请输入一个点:"); + let ptRes = await app.Editor.GetPoint({ Msg: "请输入第一个点:" }); if (ptRes.Status != PromptStatus.OK) return; let ptLast = ptRes.Point; @@ -25,10 +25,10 @@ export class DrawSpline implements Command pts.push(ptLast); if (pts.length === 2) { - app.m_Database.ModelSpace.Append(spline); + app.Database.ModelSpace.Append(spline); } - app.m_Editor.Prompt("请输入点2:"); - ptRes = await app.m_Editor.GetPoint({ + app.Editor.Prompt("请输入点2:"); + ptRes = await app.Editor.GetPoint({ Msg: "请输入点2:", BasePoint: ptLast, AllowDrawRubberBand: true, diff --git a/src/Add-on/DrawTestReg.ts b/src/Add-on/DrawTestReg.ts index 17342d9ee..aeec617f3 100644 --- a/src/Add-on/DrawTestReg.ts +++ b/src/Add-on/DrawTestReg.ts @@ -167,17 +167,17 @@ export class DrawRegTest implements Command for (let e of culist) { - app.m_Database.ModelSpace.Append(e); + app.Database.ModelSpace.Append(e); } let alg = new RegionParse(culist); - for (let r of alg.m_RegionsOutline) + for (let r of alg.RegionsOutline) { createReg(r); } - for (let r of alg.m_RegionsInternal) + for (let r of alg.RegionsInternal) { createReg(r); } @@ -208,5 +208,5 @@ function createReg(r: Set) let cus: Curve[] = []; r.forEach(route => cus.push(route.curve.Clone() as Curve)); let re = Region.CreateFromCurves(cus) - app.m_Database.ModelSpace.Append(re); + app.Database.ModelSpace.Append(re); } diff --git a/src/Add-on/DrawText.ts b/src/Add-on/DrawText.ts index 7b9d9229d..1f59cd388 100644 --- a/src/Add-on/DrawText.ts +++ b/src/Add-on/DrawText.ts @@ -9,11 +9,11 @@ export class DrawText implements Command { async exec() { - let ptRes = await app.m_Editor.GetPoint({ Msg: "指定文字的起点" }); + let ptRes = await app.Editor.GetPoint({ Msg: "指定文字的起点" }); if (ptRes.Status === PromptStatus.Cancel) return; let startPoint = ptRes.Point; - let hRes = await app.m_Editor.GetDistance({ + let hRes = await app.Editor.GetDistance({ Msg: "指定高度", BasePoint: startPoint, Default: 30 @@ -24,7 +24,7 @@ export class DrawText implements Command if (equaln(height, 0) || !height) return; - hRes = await app.m_Editor.GetAngle({ + hRes = await app.Editor.GetAngle({ Msg: "指定文字旋转角度", BasePoint: startPoint, Default: 0 diff --git a/src/Add-on/DrawTopline.ts b/src/Add-on/DrawTopline.ts index 82304a5ce..95949f29d 100644 --- a/src/Add-on/DrawTopline.ts +++ b/src/Add-on/DrawTopline.ts @@ -13,7 +13,7 @@ import { Line } from "../DatabaseServices/Entity/Line"; /**构建顶线 */ export async function buildTopline(outline: Polyline) { - let brsRes = await app.m_Editor.GetSelection({ + let brsRes = await app.Editor.GetSelection({ Msg: "选择柜体或者曲线", Filter: { filterTypes: [Board, Arc, Line, Polyline] } }); @@ -52,7 +52,7 @@ async function handleBoard(outline: Polyline, brs: Board[]) JigUtils.Draw(cu); updateBrsVisible(false); - let cuRes = await app.m_Editor.GetSelection({ + let cuRes = await app.Editor.GetSelection({ Msg: "选择没有靠墙的边", Filter: { filterTypes: [Curve] } }) @@ -77,6 +77,6 @@ function draw(outline: Polyline, cus: Curve[]) path.Join(c); let sweepSolid = new SweepSolid(outline, path); - app.m_Database.ModelSpace.Append(sweepSolid); + app.Database.ModelSpace.Append(sweepSolid); } } diff --git a/src/Add-on/DrawWineRack/ConfigureWineRack.ts b/src/Add-on/DrawWineRack/ConfigureWineRack.ts index e3eb01c6c..7f4c87ec6 100644 --- a/src/Add-on/DrawWineRack/ConfigureWineRack.ts +++ b/src/Add-on/DrawWineRack/ConfigureWineRack.ts @@ -9,6 +9,6 @@ export class ConfigureWineRack implements Command async exec() { let store = WineRackStore.GetInstance() as WineRackStore; - app.m_Editor.m_ModalManage.RenderModal(WineRackModal, ModalPosition.Center, { store }); + app.Editor.ModalManage.RenderModal(WineRackModal, ModalPosition.Center, { store }); } } diff --git a/src/Add-on/DrawWineRack/DrawBlisWineRackTool.ts b/src/Add-on/DrawWineRack/DrawBlisWineRackTool.ts index aa6b28f8a..10cd0446e 100644 --- a/src/Add-on/DrawWineRack/DrawBlisWineRackTool.ts +++ b/src/Add-on/DrawWineRack/DrawBlisWineRackTool.ts @@ -642,7 +642,7 @@ export class DrawBlisWineRackTool extends DrawWineRackTool br.ApplyMatrix(MoveMatrix(new Vector3(this.space.Size.x - actualWidth))); } br.ApplyMatrix(this.space.m_SpaceOCS); - app.m_Database.ModelSpace.Append(br); + app.Database.ModelSpace.Append(br); } } } diff --git a/src/Add-on/DrawWineRack/DrawUprightWineRackTool.ts b/src/Add-on/DrawWineRack/DrawUprightWineRackTool.ts index 1117371d1..d6fcad21e 100644 --- a/src/Add-on/DrawWineRack/DrawUprightWineRackTool.ts +++ b/src/Add-on/DrawWineRack/DrawUprightWineRackTool.ts @@ -99,7 +99,7 @@ export class DrawUprightWineRackTool extends DrawWineRackTool let br = verBr.Clone(); br.Name = "右板" + i; br.ApplyMatrix(MoveMatrix(min.clone().add(new Vector3(config.gripWidth * i + (i - 1) * brThick)))).ApplyMatrix(space.m_SpaceOCS); - app.m_Database.ModelSpace.Append(br); + app.Database.ModelSpace.Append(br); } @@ -112,7 +112,7 @@ export class DrawUprightWineRackTool extends DrawWineRackTool br.ApplyMatrix(MoveMatrix( min.clone().add(new Vector3(spaceWidth, 0, gripHeight * i + (i - 1) * brThick)))) .ApplyMatrix(space.m_SpaceOCS); - app.m_Database.ModelSpace.Append(br); + app.Database.ModelSpace.Append(br); } } ParseBrTooth(br: Board, gripHeight?: number) diff --git a/src/Add-on/DrawWineRack/DrawWinRackTool.ts b/src/Add-on/DrawWineRack/DrawWinRackTool.ts index 735666641..1eb7cbae2 100644 --- a/src/Add-on/DrawWineRack/DrawWinRackTool.ts +++ b/src/Add-on/DrawWineRack/DrawWinRackTool.ts @@ -135,7 +135,7 @@ export class DrawWineRackTool extends Singleton br.BoardProcessOption.bigHoleDir = FaceDirection.Back; br.Position = position; br.ApplyMatrix(this.space.m_SpaceOCS); - app.m_Database.ModelSpace.Append(br); + app.Database.ModelSpace.Append(br); } if (config.isDrawVer && (config.arrayType === EWRackArrayType.Fixed || config.fullType === EFullType.ByHeight)) { @@ -157,7 +157,7 @@ export class DrawWineRackTool extends Singleton this.GetBoardProcessOption(br); br.Position = position; br.ApplyMatrix(this.space.m_SpaceOCS); - app.m_Database.ModelSpace.Append(br); + app.Database.ModelSpace.Append(br); } } } diff --git a/src/Add-on/DrawZeroCircle.ts b/src/Add-on/DrawZeroCircle.ts index 93d13102f..9d47ec039 100644 --- a/src/Add-on/DrawZeroCircle.ts +++ b/src/Add-on/DrawZeroCircle.ts @@ -10,16 +10,16 @@ export class DrawCircle0 implements Command async exec() { let cir = new Circle(new THREE.Vector3(0, 0, 0), 10); - app.m_Database.ModelSpace.Append(cir); + app.Database.ModelSpace.Append(cir); let p = new THREE.Vector3(0, 0, 0); - app.m_Viewer.WorldToScreen(p); + app.Viewer.WorldToScreen(p); - app.m_Viewer.ScreenToWorld(p); + app.Viewer.ScreenToWorld(p); let line = new Line(new THREE.Vector3(0, 0, 0), new THREE.Vector3(100, 0, 0)); - app.m_Database.ModelSpace.Append(line); + app.Database.ModelSpace.Append(line); } } diff --git a/src/Add-on/Entsel.ts b/src/Add-on/Entsel.ts index 17a95bd1e..757ffd004 100644 --- a/src/Add-on/Entsel.ts +++ b/src/Add-on/Entsel.ts @@ -13,13 +13,13 @@ export class Entsel implements Command async exec() { let dyn = new PromptBlock(DynamicInputManage.GetManage()); - let en = await app.m_Editor.GetEntity({ + let en = await app.Editor.GetEntity({ Callback: (res) => { if (res.Status == PromptStatus.OK) { dyn.Visible = true; - let vcs = app.m_Editor.m_MouseCtrl.m_CurMousePointVCS.clone(); + let vcs = app.Editor.MouseCtrl.m_CurMousePointVCS.clone(); vcs.add(new Vector3(0, -20, 0)); dyn.SetPostion(vcs); @@ -36,7 +36,7 @@ export class Entsel implements Command if (en.Status == PromptStatus.OK) { en.Entity.ColorIndex = 1; - app.m_Viewer.m_bNeedUpdate = true; + app.Viewer.UpdateRender(); } dyn.Destroy(); diff --git a/src/Add-on/Erase.ts b/src/Add-on/Erase.ts index 0af1dc683..06e858928 100644 --- a/src/Add-on/Erase.ts +++ b/src/Add-on/Erase.ts @@ -7,7 +7,7 @@ export class Command_Erase implements Command { async exec() { - let ssRes = await app.m_Editor.GetSelection({ UseSelect: true }); + let ssRes = await app.Editor.GetSelection({ UseSelect: true }); if (ssRes.Status != PromptStatus.OK) return; for (let obj of ssRes.SelectSet.SelectObjectList) diff --git a/src/Add-on/Esc.ts b/src/Add-on/Esc.ts index de19e9ee0..be7b2183f 100644 --- a/src/Add-on/Esc.ts +++ b/src/Add-on/Esc.ts @@ -5,6 +5,6 @@ export class Command_Esc implements Command { async exec() { - app.m_Editor.m_SelectCtrl.Cancel(); + app.Editor.SelectCtrl.Cancel(); } } diff --git a/src/Add-on/Explode.ts b/src/Add-on/Explode.ts index 55b575d42..d78baa7db 100644 --- a/src/Add-on/Explode.ts +++ b/src/Add-on/Explode.ts @@ -9,7 +9,7 @@ export class Command_Explode implements Command { async exec() { - let ssRes = await app.m_Editor.GetSelection({ UseSelect: true }); + let ssRes = await app.Editor.GetSelection({ UseSelect: true }); if (ssRes.Status != PromptStatus.OK) return; let ss = ssRes.SelectSet; @@ -18,7 +18,7 @@ export class Command_Explode implements Command { if (en instanceof Line || en instanceof Arc || en instanceof Circle) { - app.m_Editor.Prompt('无法分解'); + app.Editor.Prompt('无法分解'); continue; } let ens = en.Explode(); @@ -26,7 +26,7 @@ export class Command_Explode implements Command for (let e of ens) { - app.m_Database.ModelSpace.Append(e); + app.Database.ModelSpace.Append(e); } } } diff --git a/src/Add-on/ExplosionMap.ts b/src/Add-on/ExplosionMap.ts index 95c033efc..a6541faae 100644 --- a/src/Add-on/ExplosionMap.ts +++ b/src/Add-on/ExplosionMap.ts @@ -16,7 +16,7 @@ export class Command_ExplosionMap implements Command count = 0; async exec() { - let view = app.m_Viewer; + let view = app.Viewer; if (this.timer) { clearInterval(this.timer); @@ -31,7 +31,7 @@ export class Command_ExplosionMap implements Command view.UpdateRender(); } - let brs = await app.m_Editor.GetSelection({ + let brs = await app.Editor.GetSelection({ UseSelect: true, Msg: "请选择需要展示爆炸图的板件", Filter: { @@ -57,7 +57,7 @@ export class Command_ExplosionMap implements Command if (this.moveObjs.length === 0) { - app.m_Editor.Prompt("没有检测到板件，无法展示爆炸图"); + app.Editor.Prompt("没有检测到板件，无法展示爆炸图"); return; } diff --git a/src/Add-on/Extends.ts b/src/Add-on/Extends.ts index 7250ebb76..b1ceefa9e 100644 --- a/src/Add-on/Extends.ts +++ b/src/Add-on/Extends.ts @@ -27,7 +27,7 @@ export class Command_Extend implements Command { async exec() { - let exRefSsRes = await app.m_Editor.GetSelection({ + let exRefSsRes = await app.Editor.GetSelection({ Msg: "请选择对象<全部选择>:", AllowNone: true, UseSelect: true, @@ -37,14 +37,14 @@ export class Command_Extend implements Command let exRefCus = exRefSsRes.SelectSet.SelectEntityList as Curve[]; if (exRefCus.length === 0) - exRefCus = (app.m_Database.ModelSpace.Entitys as Curve[]) + exRefCus = (app.Database.ModelSpace.Entitys as Curve[]) .filter(en => en instanceof Curve && !en.IsErase); while (true) { - app.m_Database.hm.StartMark(); + app.Database.hm.StartMark(); //选择延伸的对象. - let exSs = await app.m_Editor.GetSelection({ + let exSs = await app.Editor.GetSelection({ Msg: "请选择延伸对象:", Once: true, AllowNone: true, @@ -67,7 +67,7 @@ export class Command_Extend implements Command { JigUtils.End(); this.Extend(entss.SelectSet, exRefCus, true); - app.m_Editor.UpdateScreen(); + app.Editor.UpdateScreen(); } Extend(selectSet: SelectSet, exRefCus: Curve[], bDynmic: boolean = false) @@ -86,7 +86,7 @@ export class Command_Extend implements Command { selectCenterPt = set.m_PickPointVcs.clone(); } - app.m_Viewer.ScreenToWorld(selectCenterPt); + app.Viewer.ScreenToWorld(selectCenterPt); for (let cu of set.SelectEntityList as Curve[]) { diff --git a/src/Add-on/Fillet.ts b/src/Add-on/Fillet.ts index b5d3c99d3..9d16b11f7 100644 --- a/src/Add-on/Fillet.ts +++ b/src/Add-on/Fillet.ts @@ -25,11 +25,11 @@ export class CommandFillet implements Command } async exec() { - this.m_FilletUtils.m_FilletRadius = this.m_FilletRadius; + this.m_FilletUtils.FilletRadius = this.m_FilletRadius; - let oldUcs = app.m_Editor.UCSMatrix; + let oldUcs = app.Editor.UCSMatrix; - app.m_Editor.Prompt(`倒角半径:${FixedNotZero(this.m_FilletRadius, 3)}`); + app.Editor.Prompt(`倒角半径:${FixedNotZero(this.m_FilletRadius, 3)}`); //拾取曲线 let enRes1 = await this.SelectCurve([ { msg: "放弃", key: "U" }, @@ -37,7 +37,7 @@ export class CommandFillet implements Command { msg: "半径", key: "R" }, { msg: "修剪", key: "T" }, { msg: "多个", key: "M" }]); - app.m_Editor.UCSMatrix = oldUcs; + app.Editor.UCSMatrix = oldUcs; if (!enRes1) return; enRes1.Entity.UpdateJigMaterial(); @@ -56,35 +56,35 @@ export class CommandFillet implements Command if (!res2.Entity) { lastCu = undefined; - app.m_Editor.UpdateScreen(); + app.Editor.UpdateScreen(); return; } - app.m_Editor.UCSMatrix = res2.Entity.OCS; + app.Editor.UCSMatrix = res2.Entity.OCS; res2.Entity.UpdateJigMaterial(); lastCu = res2.Entity as Curve; let fres = this.m_FilletUtils.Fillet(enRes1, res2); for (let v in fres) if (fres[v]) JigUtils.Draw(fres[v]) - app.m_Editor.UpdateScreen(); + app.Editor.UpdateScreen(); } let keydownUpdateRadius = (e: KeyboardEvent) => { if (enRes2 && e.code === KeyCode.ShiftLeft) { - if (app.m_Editor.m_KeyCtrl.KeyIsDown(KeyCode.ShiftLeft)) - this.m_FilletUtils.m_FilletRadius = 0; + if (app.Editor.KeyCtrl.KeyIsDown(KeyCode.ShiftLeft)) + this.m_FilletUtils.FilletRadius = 0; else - this.m_FilletUtils.m_FilletRadius = this.m_FilletRadius; + this.m_FilletUtils.FilletRadius = this.m_FilletRadius; jigCallBack(enRes2); } } - let rm1 = end(app.m_Editor.m_KeyCtrl, app.m_Editor.m_KeyCtrl.OnKeyDown, keydownUpdateRadius); - let rm2 = end(app.m_Editor.m_KeyCtrl, app.m_Editor.m_KeyCtrl.OnKeyUp, keydownUpdateRadius); + let rm1 = end(app.Editor.KeyCtrl, app.Editor.KeyCtrl.OnKeyDown, keydownUpdateRadius); + let rm2 = end(app.Editor.KeyCtrl, app.Editor.KeyCtrl.OnKeyUp, keydownUpdateRadius); while (true) { - enRes2 = await app.m_Editor.GetEntity({ + enRes2 = await app.Editor.GetEntity({ Msg: "选择第二个对象,或按住shift键选择对象以应用角点或输入半径:", Filter: { filterTypes: [Curve], @@ -108,7 +108,7 @@ export class CommandFillet implements Command else if (enRes2.Status !== PromptStatus.None) break; } - app.m_Editor.UCSMatrix = oldUcs; + app.Editor.UCSMatrix = oldUcs; rm1(); rm2(); @@ -135,24 +135,24 @@ export class CommandFillet implements Command enRes2.Entity.Erase(); if (res.arc) - app.m_Database.ModelSpace.Append(res.arc); + app.Database.ModelSpace.Append(res.arc); } } UpdateFilletRadius(newRadius: number) { if (newRadius < 0 || isNaN(newRadius)) - app.m_Editor.Prompt("半径不能为负!"); + app.Editor.Prompt("半径不能为负!"); this.m_FilletRadius = Math.abs(newRadius); window.localStorage.setItem(RADKEY, this.m_FilletRadius.toString()); - this.m_FilletUtils.m_FilletRadius = this.m_FilletRadius; + this.m_FilletUtils.FilletRadius = this.m_FilletRadius; } async FilletBoard(enRes: PromptEntityResult) { //------1.画辅助线 - let ptRes = await app.m_Editor.GetPoint({ + let ptRes = await app.Editor.GetPoint({ BasePoint: enRes.Point, AllowDrawRubberBand: true, AllowNone: true, @@ -169,14 +169,14 @@ export class CommandFillet implements Command br.ContourCurve = fres; } else - app.m_Editor.Prompt(fres); + app.Editor.Prompt(fres); } async SelectCurve(keyword: KeyWord[]): Promise { while (true) { - let enRes = await app.m_Editor.GetEntity({ + let enRes = await app.Editor.GetEntity({ Msg: `选择第一个对象:`, KeyWordList: keyword, Filter: { filterTypes: [Curve, Board] }, @@ -184,7 +184,7 @@ export class CommandFillet implements Command { //将用户坐标系转换到实体坐标系 if (res.Entity) - app.m_Editor.UCSMatrix = res.Entity.OCS; + app.Editor.UCSMatrix = res.Entity.OCS; }, }); switch (enRes.Status) @@ -204,7 +204,7 @@ export class CommandFillet implements Command case PromptStatus.Keyword: if (enRes.StringResult === "R") { - let ret = await app.m_Editor.GetDistance({ Msg: "指定圆角半径:", Default: this.m_FilletRadius }); + let ret = await app.Editor.GetDistance({ Msg: "指定圆角半径:", Default: this.m_FilletRadius }); if (ret.Status === PromptStatus.OK) this.UpdateFilletRadius(ret.Distance); else if (ret.Status === PromptStatus.Cancel) @@ -218,7 +218,7 @@ export class CommandFillet implements Command let enRes: PromptEntityResult; while (this.m_FilletRadius === 0) { - let ret = await app.m_Editor.GetDistance({ Msg: "当前半径为0，请指定圆角半径:", Default: this.m_FilletRadius }); + let ret = await app.Editor.GetDistance({ Msg: "当前半径为0，请指定圆角半径:", Default: this.m_FilletRadius }); if (ret.Status === PromptStatus.OK) this.UpdateFilletRadius(Math.abs(ret.Distance)); else if (ret.Status === PromptStatus.Cancel) @@ -226,7 +226,7 @@ export class CommandFillet implements Command } while (true) { - enRes = await app.m_Editor.GetEntity({ + enRes = await app.Editor.GetEntity({ Msg: "请选择二维多段线或输入半径:", Filter: { filterTypes: [Polyline] }, Callback: (e) => @@ -240,7 +240,7 @@ export class CommandFillet implements Command if (!e || !e.Entity) { - app.m_Editor.UpdateScreen(); + app.Editor.UpdateScreen(); lastPl = undefined; return; } @@ -252,7 +252,7 @@ export class CommandFillet implements Command lastPl = e.Entity as Polyline; lastPl.UpdateJigMaterial(); - app.m_Editor.UpdateScreen(); + app.Editor.UpdateScreen(); } }); diff --git a/src/Add-on/FilletUtils.ts b/src/Add-on/FilletUtils.ts index 8906fb40e..1c6cff49b 100644 --- a/src/Add-on/FilletUtils.ts +++ b/src/Add-on/FilletUtils.ts @@ -74,7 +74,7 @@ type CurveExtend = { Curve: Curve, ExtType: ExtendType }; export class FilletUtils { - m_FilletRadius: number; + FilletRadius: number; Fillet(enRes1: PromptEntityResult, enRes2: PromptEntityResult): FilletRes { CircleEnResToArc(enRes1); @@ -110,7 +110,7 @@ export class FilletUtils let splitedCu1 = this.SplitCurve(enRes1, iPt, interPts); let splitedCu2 = this.SplitCurve(enRes2, iPt, interPts); - let fRadius = this.m_FilletRadius; + let fRadius = this.FilletRadius; let res: FilletRes = { cu1: splitedCu1.Curve, cu2: splitedCu2.Curve, arc: undefined }; @@ -172,7 +172,7 @@ export class FilletUtils let v2 = arcP2.clone().sub(center).applyMatrix4(cu1RoOcsInv); //绘制圆弧 - let arc = new Arc(new Vector3(), this.m_FilletRadius, angle(v1), angle(v2), v1.cross(v2).z < 0); + let arc = new Arc(new Vector3(), this.FilletRadius, angle(v1), angle(v2), v1.cross(v2).z < 0); arc.ApplyMatrix(splitedCu1.Curve.OCS); arc.Center = center; res.arc = arc; @@ -552,8 +552,8 @@ export class FilletUtils let a1 = enRes1.Entity as Arc; let a2 = enRes2.Entity as Arc; - let arcO1 = a1.GetOffsetCurves(this.m_FilletRadius * (a1.IsClockWise ? -1 : 1))[0]; - let arcO2 = a2.GetOffsetCurves(this.m_FilletRadius * (a2.IsClockWise ? -1 : 1))[0]; + let arcO1 = a1.GetOffsetCurves(this.FilletRadius * (a1.IsClockWise ? -1 : 1))[0]; + let arcO2 = a2.GetOffsetCurves(this.FilletRadius * (a2.IsClockWise ? -1 : 1))[0]; // arcO1.ColorIndex = 6; // arcO2.ColorIndex = 6; @@ -578,7 +578,7 @@ export class FilletUtils let narcP1 = a1.GetClosestPointTo(narcCenter, true);//两圆弧和相切弧的交点 let narcP2 = a2.GetClosestPointTo(narcCenter, true); - let tempCircle = new Circle(narcCenter, this.m_FilletRadius); + let tempCircle = new Circle(narcCenter, this.FilletRadius); let closestPt = a1.GetClosestPointTo(a2.Center, true);//两曲线距离对方圆心最近的点 let narcMP = tempCircle.GetClosestPointTo(closestPt, false);//相切圆距离closestPt最近的点 @@ -631,8 +631,8 @@ export class FilletUtils let dir = GetPointAtCurveDir(line, arc.Center) ? 1 : -1; - let lineO = line.GetOffsetCurves(this.m_FilletRadius * dir)[0]; - let arcO = arc.GetOffsetCurves(this.m_FilletRadius * (arc.IsClockWise ? -1 : 1))[0];// tip：面积逆时针为正, 顺时针为负. + let lineO = line.GetOffsetCurves(this.FilletRadius * dir)[0]; + let arcO = arc.GetOffsetCurves(this.FilletRadius * (arc.IsClockWise ? -1 : 1))[0];// tip：面积逆时针为正, 顺时针为负. // lineO.ColorIndex = 6; // arcO.ColorIndex = 6; @@ -657,7 +657,7 @@ export class FilletUtils let arcP1 = line.GetClosestPointTo(arcCenter, true);//直线与相切圆的交点 let arcP2 = arc.GetClosestPointTo(arcCenter, true);//圆弧与相切圆的交点 - let tempCircle = new Circle(arcCenter, this.m_FilletRadius); + let tempCircle = new Circle(arcCenter, this.FilletRadius); let { closestPt, param } = line.GetClosestAtPoint(arc.Center, true); let arcMP = tempCircle.GetClosestPointTo(closestPt, false); diff --git a/src/Add-on/Gesture/Gesture_DrawLayerBoard.ts b/src/Add-on/Gesture/Gesture_DrawLayerBoard.ts index 4a2d8986f..cd7bd6328 100644 --- a/src/Add-on/Gesture/Gesture_DrawLayerBoard.ts +++ b/src/Add-on/Gesture/Gesture_DrawLayerBoard.ts @@ -17,12 +17,12 @@ export async function Gesture_DrawLayerBoard(dirs: GestureDir[], path: Vector2[] if (isLayer || isLb) { let vcs = AsVector3(path[0]); - let view = app.m_Viewer; + let view = app.Viewer; let ptSelect = new PointSelectBoards(vcs, view, view.Scene.children); if (ptSelect.SelectBoards.length === 0) { - app.m_Editor.Prompt("请选择有效的板件,或者周围没有效板件"); + app.Editor.Prompt("请选择有效的板件,或者周围没有效板件"); return; } @@ -51,8 +51,8 @@ export async function Gesture_DrawLayerBoard(dirs: GestureDir[], path: Vector2[] commandMachine.CommandStart("gs") - app.m_Database.ModelSpace.Append(br); - app.m_Editor.UpdateScreen(); + app.Database.ModelSpace.Append(br); + app.Editor.UpdateScreen(); commandMachine.CommandEnd(); return true; diff --git a/src/Add-on/HideSelected.ts b/src/Add-on/HideSelected.ts index d59293546..55a9b02c9 100644 --- a/src/Add-on/HideSelected.ts +++ b/src/Add-on/HideSelected.ts @@ -6,14 +6,14 @@ export class Command_HideSelected implements Command { async exec() { - let selects = app.m_Editor.m_SelectCtrl.SelectSet.SelectEntityList; + let selects = app.Editor.SelectCtrl.SelectSet.SelectEntityList; if (selects.length !== 0) for (let e of selects) e.Visible = false; else - app.m_Editor.Prompt("没有选中实体，隐藏失败！"); + app.Editor.Prompt("没有选中实体，隐藏失败！"); - app.m_Viewer.m_OutlinePass.selectedObjects.length = 0; + app.Viewer.OutlinePass.selectedObjects.length = 0; } } @@ -21,7 +21,7 @@ export class Command_ShowAll implements Command { async exec() { - app.m_Database.ModelSpace.Entitys.forEach(o => + app.Database.ModelSpace.Entitys.forEach(o => { o.Visible = true; }); @@ -32,9 +32,9 @@ export class Command_HideUnselected implements Command { async exec() { - let selects = app.m_Editor.m_SelectCtrl.SelectSet.SelectEntityList; + let selects = app.Editor.SelectCtrl.SelectSet.SelectEntityList; let count = 0; - app.m_Database.ModelSpace.Entitys.forEach(o => + app.Database.ModelSpace.Entitys.forEach(o => { if (!selects.includes(o) && !(o instanceof Light)) { @@ -43,6 +43,6 @@ export class Command_HideUnselected implements Command } }); if (count === 0) - app.m_Editor.Prompt("没有未选中的实体，隐藏失败！"); + app.Editor.Prompt("没有未选中的实体，隐藏失败！"); } } diff --git a/src/Add-on/Insert.ts b/src/Add-on/Insert.ts index 47176adee..cb576c5ea 100644 --- a/src/Add-on/Insert.ts +++ b/src/Add-on/Insert.ts @@ -25,9 +25,9 @@ export class Command_Insert implements Command finfo = f; } }; - app.m_Editor.m_ModalManage.RenderModal(InsertModal, ModalPosition.Center, props); + app.Editor.ModalManage.RenderModal(InsertModal, ModalPosition.Center, props); - let state = await app.m_Editor.m_ModalManage.Wait(); + let state = await app.Editor.ModalManage.Wait(); if (state.Status !== ModalState.Ok || !finfo) return; @@ -45,7 +45,7 @@ export class Command_Insert implements Command { let ensClone = db.ModelSpace.Entitys.map(e => JigUtils.Draw(e)); let ptLast = new Vector3(); - let ptRes = await app.m_Editor.GetPoint( + let ptRes = await app.Editor.GetPoint( { Msg: "请点击移动终点:", Callback: (p: Vector3) => @@ -58,7 +58,7 @@ export class Command_Insert implements Command if (ptRes.Status === PromptStatus.OK) { - let ens = app.m_Database.DeepCloneObjects(db.ModelSpace.Entitys, app.m_Database.ModelSpace) as Entity[]; + let ens = app.Database.DeepCloneObjects(db.ModelSpace.Entitys, app.Database.ModelSpace) as Entity[]; let moveM = MoveMatrix(ptRes.Point); ens.forEach(e => e.ApplyMatrix(moveM)); } diff --git a/src/Add-on/Join.ts b/src/Add-on/Join.ts index d315b3bcc..07909e456 100644 --- a/src/Add-on/Join.ts +++ b/src/Add-on/Join.ts @@ -18,7 +18,7 @@ export class Command_Join implements Command { async exec() { - let exSsRes = await app.m_Editor.GetSelection({ Msg: "请选择对象<全部选择>:", UseSelect: true, Filter: { filterTypes: [Curve, Board] } }); + let exSsRes = await app.Editor.GetSelection({ Msg: "请选择对象<全部选择>:", UseSelect: true, Filter: { filterTypes: [Curve, Board] } }); if (exSsRes.Status === PromptStatus.Cancel) return; @@ -84,7 +84,7 @@ export class Command_Join implements Command } if (pl.Id === undefined) - app.m_Database.ModelSpace.Append(pl); + app.Database.ModelSpace.Append(pl); } } @@ -138,7 +138,7 @@ export class Command_Join implements Command { if (isConverToCircle === undefined) { - let keyRes = await app.m_Editor.GetKeyWords({ + let keyRes = await app.Editor.GetKeyWords({ Msg: "合并的圆弧段组成了一个圆。要转换为圆吗？", KeyWordList: [ { msg: "是", key: "Y" }, @@ -152,7 +152,7 @@ export class Command_Join implements Command arc.Erase(); arc2.Erase(); let cir = new Circle(arc.Center, arc.Radius); - app.m_Database.ModelSpace.Append(cir); + app.Database.ModelSpace.Append(cir); } } else diff --git a/src/Add-on/LatticeDrawer/DrawLatticeDrawer.ts b/src/Add-on/LatticeDrawer/DrawLatticeDrawer.ts index 138f53b6f..adf859a8a 100644 --- a/src/Add-on/LatticeDrawer/DrawLatticeDrawer.ts +++ b/src/Add-on/LatticeDrawer/DrawLatticeDrawer.ts @@ -11,9 +11,9 @@ export class DrawLattice implements Command async exec() { const store = LatticeDrawerStore.GetInstance() as LatticeDrawerStore; - app.m_Editor.m_ModalManage.RenderModal(LatticeDrawer, ModalPosition.Center, { store }); + app.Editor.ModalManage.RenderModal(LatticeDrawer, ModalPosition.Center, { store }); - let res = await app.m_Editor.m_ModalManage.Wait(); + let res = await app.Editor.ModalManage.Wait(); if (res.Status === ModalState.Cancel) return; diff --git a/src/Add-on/LatticeDrawer/LatticeDrawerTool.ts b/src/Add-on/LatticeDrawer/LatticeDrawerTool.ts index 452f2718c..7c4c51b9c 100644 --- a/src/Add-on/LatticeDrawer/LatticeDrawerTool.ts +++ b/src/Add-on/LatticeDrawer/LatticeDrawerTool.ts @@ -70,7 +70,7 @@ export class DrawLatticeDrawerTool extends Singleton pos.add(new Vector3(gripWidth * i + (i - 1) * config.thickness)); br.Position = pos; br.ApplyMatrix(space.m_SpaceOCS); - app.m_Database.ModelSpace.Append(br); + app.Database.ModelSpace.Append(br); } let beBr = Board.CreateBoard(size.z, size.x, config.thickness, BoardType.Behind); @@ -86,7 +86,7 @@ export class DrawLatticeDrawerTool extends Singleton pos.add(new Vector3(0, (gripDepth + config.thickness) * i)); br.Position = pos; br.ApplyMatrix(space.m_SpaceOCS); - app.m_Database.ModelSpace.Append(br); + app.Database.ModelSpace.Append(br); } this.End(); diff --git a/src/Add-on/Length.ts b/src/Add-on/Length.ts index 80edb9d49..3618ebf65 100644 --- a/src/Add-on/Length.ts +++ b/src/Add-on/Length.ts @@ -10,12 +10,12 @@ export class Command_Length implements Command { while (true) { - let enRes = await app.m_Editor.GetEntity(); + let enRes = await app.Editor.GetEntity(); if (enRes.Status === PromptStatus.OK) { if (enRes.Entity instanceof Curve) { - app.m_Editor.Prompt(enRes.Entity.Length.toFixed(8)); + app.Editor.Prompt(enRes.Entity.Length.toFixed(8)); } } else diff --git a/src/Add-on/Lisp.ts b/src/Add-on/Lisp.ts index 47340a931..38e904e03 100644 --- a/src/Add-on/Lisp.ts +++ b/src/Add-on/Lisp.ts @@ -8,7 +8,7 @@ export class Command_Lisp { async exec() { - let ssRes = await app.m_Editor.GetEntity(); + let ssRes = await app.Editor.GetEntity(); if (ssRes.Status != PromptStatus.OK) return; let pl = ssRes.Entity as Polyline; diff --git a/src/Add-on/Mirror.ts b/src/Add-on/Mirror.ts index a07a05755..b85cc1338 100644 --- a/src/Add-on/Mirror.ts +++ b/src/Add-on/Mirror.ts @@ -18,14 +18,14 @@ export class MirrorCommand implements Command { async exec() { - let enRes = await app.m_Editor.GetSelection({ + let enRes = await app.Editor.GetSelection({ Msg: "选择对象", UseSelect: true }); if (enRes.Status === PromptStatus.Cancel) return; let ens = enRes.SelectSet.SelectEntityList; - let ptRes = await app.m_Editor.GetPoint({ + let ptRes = await app.Editor.GetPoint({ Msg: "选择镜像第一点" }); if (ptRes.Status === PromptStatus.Cancel) @@ -33,7 +33,7 @@ export class MirrorCommand implements Command let p1 = ptRes.Point; let cloneEns = ens.map(en => JigUtils.Draw(en)); - ptRes = await app.m_Editor.GetPoint({ + ptRes = await app.Editor.GetPoint({ Msg: "选择镜像第二点", BasePoint: p1, AllowDrawRubberBand: true, @@ -55,7 +55,7 @@ export class MirrorCommand implements Command if (ptRes.Status === PromptStatus.Cancel) return; - let kwRes = await app.m_Editor.GetKeyWords({ + let kwRes = await app.Editor.GetKeyWords({ Msg: "是否保留源对象", KeyWordList: [{ msg: "是", key: "Y" }, { msg: "否", key: "N" }] }); @@ -69,6 +69,6 @@ export class MirrorCommand implements Command } for (let e of cloneEns) - app.m_Database.ModelSpace.Append(e); + app.Database.ModelSpace.Append(e); } } diff --git a/src/Add-on/Move.ts b/src/Add-on/Move.ts index 99cf82a7f..09f6a0469 100644 --- a/src/Add-on/Move.ts +++ b/src/Add-on/Move.ts @@ -8,10 +8,10 @@ export class Command_Move implements Command { async exec() { - let ssRes = await app.m_Editor.GetSelection({ UseSelect: true }); + let ssRes = await app.Editor.GetSelection({ UseSelect: true }); if (ssRes.Status != PromptStatus.OK) return; - let ptRes = await app.m_Editor.GetPoint({ Msg: "请点击移动基点:" }); + let ptRes = await app.Editor.GetPoint({ Msg: "请点击移动基点:" }); if (ptRes.Status != PromptStatus.OK) return; @@ -22,7 +22,7 @@ export class Command_Move implements Command let ptBase = ptRes.Point; let ptLast = ptBase.clone(); let moveMatrix = new Matrix4(); - ptRes = await app.m_Editor.GetPoint( + ptRes = await app.Editor.GetPoint( { Msg: "请点击移动终点:", Callback: (p: THREE.Vector3) => diff --git a/src/Add-on/Offset.ts b/src/Add-on/Offset.ts index 344366826..725e54946 100644 --- a/src/Add-on/Offset.ts +++ b/src/Add-on/Offset.ts @@ -15,7 +15,7 @@ export class Command_Offset implements Command offsetDis: number = 1; async exec() { - let disRes = await app.m_Editor.GetDistance({ + let disRes = await app.Editor.GetDistance({ Msg: "指定偏移距离:", KeyWordList: [{ msg: "通过:", key: "T" }], Default: this.offsetDis @@ -29,15 +29,15 @@ export class Command_Offset implements Command else return; - let oldUCS = app.m_Editor.UCSMatrix; + let oldUCS = app.Editor.UCSMatrix; while (true) { - app.m_Database.hm.StartMark(); + app.Database.hm.StartMark(); - let enRes = await app.m_Editor.GetEntity({ Msg: "选择要偏移的对象:" }); + let enRes = await app.Editor.GetEntity({ Msg: "选择要偏移的对象:" }); if (enRes.Status === PromptStatus.OK) { - app.m_Editor.UCSMatrix = enRes.Entity.OCS; + app.Editor.UCSMatrix = enRes.Entity.OCS; } else if (enRes.Status === PromptStatus.None) continue; @@ -47,7 +47,7 @@ export class Command_Offset implements Command let cu = enRes.Entity as Curve; if (cu instanceof Curve) { - app.m_Viewer.m_OutlinePass.selectedObjects = [cu.DrawObject]; + app.Viewer.OutlinePass.selectedObjects = [cu.DrawObject]; let state: GetOffsetStatus; if (isDyn) state = await this.GetDynOffsetDist(cu); @@ -64,7 +64,7 @@ export class Command_Offset implements Command } } - app.m_Editor.UCSMatrix = oldUCS; + app.Editor.UCSMatrix = oldUCS; }//end exec //绘制偏移的对象 @@ -72,7 +72,7 @@ export class Command_Offset implements Command { cu.GetOffsetCurves(offsetDist).forEach(c => { - app.m_Database.ModelSpace.Append(c); + app.Database.ModelSpace.Append(c); }); } @@ -81,9 +81,9 @@ export class Command_Offset implements Command { let oldDir = 0; - let oldSnap = app.m_Editor.GetPointServices.snapServices.Disabled; - app.m_Editor.GetPointServices.snapServices.Disabled = true; - let ptRes = await app.m_Editor.GetPoint({ + let oldSnap = app.Editor.GetPointServices.snapServices.Disabled; + app.Editor.GetPointServices.snapServices.Disabled = true; + let ptRes = await app.Editor.GetPoint({ Msg: "指定要偏移的那一侧的点", Callback: (p: Vector3) => { @@ -97,7 +97,7 @@ export class Command_Offset implements Command } } }); - app.m_Editor.GetPointServices.snapServices.Disabled = oldSnap; + app.Editor.GetPointServices.snapServices.Disabled = oldSnap; let status = { Status: ptRes.Status, offsetDist: 0 }; if (ptRes.Status === PromptStatus.OK) { @@ -116,7 +116,7 @@ export class Command_Offset implements Command while (true) { let dir: number = 0; - let distRes = await app.m_Editor.GetDistance( + let distRes = await app.Editor.GetDistance( { Msg: "指定通过点或输入偏移距离:", KeyWordList: [{ key: "D", msg: isMulti ? "单个" : "多个" }], @@ -149,7 +149,7 @@ export class Command_Offset implements Command else if (distRes.StringResult === "D") { isMulti = !isMulti; - app.m_Editor.Prompt(`切换成功,当前<${isMulti ? "多个" : "单个"}>`); + app.Editor.Prompt(`切换成功,当前<${isMulti ? "多个" : "单个"}>`); } else return { Status: distRes.Status, offsetDist: distRes.Distance }; diff --git a/src/Add-on/OffsetX.ts b/src/Add-on/OffsetX.ts index 9677a6192..aadd6fcd7 100644 --- a/src/Add-on/OffsetX.ts +++ b/src/Add-on/OffsetX.ts @@ -10,7 +10,7 @@ export class OffsetX implements Command offsetDis: number = 1; async exec() { - let ssRes = await app.m_Editor.GetEntity(); + let ssRes = await app.Editor.GetEntity(); if (ssRes.Status != PromptStatus.OK) return; let pl = ssRes.Entity as Polyline; if (!pl) return; @@ -25,7 +25,7 @@ export class OffsetX implements Command } else { - let disRes = await app.m_Editor.GetDistance({ + let disRes = await app.Editor.GetDistance({ Msg: "指定偏移距离:", KeyWordList: [{ msg: "通过", key: "T" }], Default: this.offsetDis @@ -36,7 +36,7 @@ export class OffsetX implements Command dis = -this.offsetDis; if (pl.IsClockWise) dis = -dis; - let disRes1 = await app.m_Editor.GetDistance({ + let disRes1 = await app.Editor.GetDistance({ Msg: "步长:", KeyWordList: [{ msg: "通过", key: "T" }], Default: 1 @@ -61,7 +61,7 @@ export class OffsetX implements Command if (step === 0) { - app.m_Editor.Prompt("步长不能为0,已经帮你转换成" + dis / 10); + app.Editor.Prompt("步长不能为0,已经帮你转换成" + dis / 10); step = dis / 10; } let count = dis / step; @@ -77,6 +77,6 @@ export class OffsetX implements Command } } - offRes.forEach(c => app.m_Database.ModelSpace.Append(c)); + offRes.forEach(c => app.Database.ModelSpace.Append(c)); } } diff --git a/src/Add-on/Open.ts b/src/Add-on/Open.ts index 6009d9659..66d2a3a13 100644 --- a/src/Add-on/Open.ts +++ b/src/Add-on/Open.ts @@ -19,9 +19,9 @@ export class Open implements Command store.m_CurrentFileId = fid; let cadF = new CADFiler(); - cadF.database = app.m_Database; + cadF.database = app.Database; cadF.Data = file; - app.m_Database.FileRead(cadF); + app.Database.FileRead(cadF); RightPanelStore.GetInstance().lightStore.InitScene(); } } diff --git a/src/Add-on/PasteClip.ts b/src/Add-on/PasteClip.ts index 1cd7f14c8..67cf335d2 100644 --- a/src/Add-on/PasteClip.ts +++ b/src/Add-on/PasteClip.ts @@ -29,14 +29,14 @@ export class PasteClip } let oldBasePt = data.basePt || new Vector3(); - let oldPt = app.m_Editor.m_MouseCtrl.m_CurMousePointWCS; + let oldPt = app.Editor.MouseCtrl.m_CurMousePointWCS; for (let en of ens) { let vec = en.Position.sub(oldBasePt); en.Position = oldPt.clone().add(vec); } - let ptRes = await app.m_Editor.GetPoint({ + let ptRes = await app.Editor.GetPoint({ BasePoint: oldPt, Callback: p => { @@ -52,12 +52,12 @@ export class PasteClip if (ptRes.Status === PromptStatus.OK) for (let e of ens) - app.m_Database.ModelSpace.Append(e); + app.Database.ModelSpace.Append(e); } } catch (error) { - app.m_Editor.Prompt("黏贴遇到错误:" + error); + app.Editor.Prompt("黏贴遇到错误:" + error); } } } diff --git a/src/Add-on/Pedit.ts b/src/Add-on/Pedit.ts index 2b939b790..9d8660854 100644 --- a/src/Add-on/Pedit.ts +++ b/src/Add-on/Pedit.ts @@ -12,7 +12,7 @@ export class Pedit implements Command { async exec() { - let exSsRes = await app.m_Editor.GetSelection({ + let exSsRes = await app.Editor.GetSelection({ Msg: "请选择对象<全部选择>:", Filter: { filterTypes: [Curve] }, UseSelect: true @@ -33,7 +33,7 @@ export class Pedit implements Command if (cirs.length !== 0) { - let keyRes = await app.m_Editor.GetKeyWords({ + let keyRes = await app.Editor.GetKeyWords({ Msg: "检测到了圆，要转换为多段线吗？", KeyWordList: [ { msg: "是", key: "Y" }, @@ -46,7 +46,7 @@ export class Pedit implements Command { c.Erase(); let pl = ConverCircleToPolyline(c); - app.m_Database.ModelSpace.Append(pl); + app.Database.ModelSpace.Append(pl); } } } @@ -65,7 +65,7 @@ export class Pedit implements Command pl.Join(cu); cu.Erase(); } - app.m_Database.ModelSpace.Append(pl); + app.Database.ModelSpace.Append(pl); } } } diff --git a/src/Add-on/RevPl.ts b/src/Add-on/RevPl.ts index b9a613ea3..ff2e479d5 100644 --- a/src/Add-on/RevPl.ts +++ b/src/Add-on/RevPl.ts @@ -6,15 +6,15 @@ export class Command_RevPl implements Command { async exec() { - let ss = await app.m_Editor.GetSelection({ UseSelect: true, Filter: { filterTypes: [Curve] } }); + let ss = await app.Editor.GetSelection({ UseSelect: true, Filter: { filterTypes: [Curve] } }); for (let en of ss.SelectSet.SelectEntityList) { if (en instanceof Curve) { en.Reverse(); - app.m_Editor.Prompt("成功翻转曲线"); + app.Editor.Prompt("成功翻转曲线"); } } - app.m_Editor.UpdateScreen(); + app.Editor.UpdateScreen(); } } diff --git a/src/Add-on/Rotate.ts b/src/Add-on/Rotate.ts index 22b2857df..8312883b7 100644 --- a/src/Add-on/Rotate.ts +++ b/src/Add-on/Rotate.ts @@ -10,11 +10,11 @@ export class Command_Rotate implements Command { async exec() { - let ss = await app.m_Editor.GetSelection({ Msg: "请选择需要旋转的对象:", UseSelect: true }); + let ss = await app.Editor.GetSelection({ Msg: "请选择需要旋转的对象:", UseSelect: true }); if (ss.Status != PromptStatus.OK) return; - let ptRes = await app.m_Editor.GetPoint({ Msg: "请输入第一个点:" }); + let ptRes = await app.Editor.GetPoint({ Msg: "请输入第一个点:" }); if (ptRes.Status != PromptStatus.OK) return; @@ -32,7 +32,7 @@ export class Command_Rotate implements Command let basePt = pt1; while (true) { - let anRes = await app.m_Editor.GetAngle({ + let anRes = await app.Editor.GetAngle({ Msg: msg, KeyWordList: keyword, Callback: (newan: number) => @@ -48,7 +48,7 @@ export class Command_Rotate implements Command if (isCopy) { this.Update(pt1, anRes.Distance - refAng, cloneEns); - cloneEns.forEach(en => app.m_Database.ModelSpace.Append(en)); + cloneEns.forEach(en => app.Database.ModelSpace.Append(en)); } else this.Update(pt1, anRes.Distance - refAng, ens); @@ -62,7 +62,7 @@ export class Command_Rotate implements Command } else if (anRes.StringResult === "R") { - let newAnRes = await app.m_Editor.GetAngle({ Msg: "指定参照角" }); + let newAnRes = await app.Editor.GetAngle({ Msg: "指定参照角" }); if (newAnRes.Status === PromptStatus.Cancel) break; refAng = newAnRes.Distance; @@ -83,7 +83,7 @@ export class Command_Rotate implements Command let moveMat = new Matrix4().setPosition(basePt); let moveMatInv = new Matrix4().getInverse(moveMat); let roMat = new Matrix4() - .makeRotationAxis(ZAxis.clone().applyMatrix4(app.m_Editor.UCSMatrix), Math.degToRad(an)); + .makeRotationAxis(ZAxis.clone().applyMatrix4(app.Editor.UCSMatrix), Math.degToRad(an)); let mat = moveMat.multiply(roMat).multiply(moveMatInv); ens.forEach(en => en.ApplyMatrix(mat)); } diff --git a/src/Add-on/RotateLayerBoard.ts b/src/Add-on/RotateLayerBoard.ts index 3f0456031..6bead0e04 100644 --- a/src/Add-on/RotateLayerBoard.ts +++ b/src/Add-on/RotateLayerBoard.ts @@ -34,13 +34,13 @@ export class RotateLayerBoard implements Command async exec() { let store = RotateLayerBoardStore.GetInstance() as RotateLayerBoardStore; - app.m_Editor.m_ModalManage.RenderModal(RotateLayerBoardModal, ModalPosition.Center, { store }); + app.Editor.ModalManage.RenderModal(RotateLayerBoardModal, ModalPosition.Center, { store }); - let res = await app.m_Editor.m_ModalManage.Wait(); + let res = await app.Editor.ModalManage.Wait(); if (res.Status === ModalState.Ok) { - let enRes = await app.m_Editor.GetSelection({ + let enRes = await app.Editor.GetSelection({ Msg: "选择修改的层板", Filter: { filterTypes: [Board], diff --git a/src/Add-on/Save.ts b/src/Add-on/Save.ts index 04032104a..a166e4e0c 100644 --- a/src/Add-on/Save.ts +++ b/src/Add-on/Save.ts @@ -35,11 +35,11 @@ export class Save implements Command getBlob() { //生成预览图 - app.m_Viewer.OnSize(100, 100); - app.m_Viewer.Render(); - let url = app.m_Viewer.m_Render.domElement.toDataURL("image/jpeg"); - app.m_Viewer.OnSize(); - app.m_Viewer.Render(); + app.Viewer.OnSize(100, 100); + app.Viewer.Render(); + let url = app.Viewer.Renderer.domElement.toDataURL("image/jpeg"); + app.Viewer.OnSize(); + app.Viewer.Render(); return dataURItoBlob(url); } diff --git a/src/Add-on/Scale.ts b/src/Add-on/Scale.ts index f38ed6e83..b1fa15419 100644 --- a/src/Add-on/Scale.ts +++ b/src/Add-on/Scale.ts @@ -11,12 +11,12 @@ export class Command_Scale implements Command { async exec() { - let ssRes = await app.m_Editor.GetSelection({ UseSelect: true }); + let ssRes = await app.Editor.GetSelection({ UseSelect: true }); if (ssRes.Status != PromptStatus.OK) return; - let ptRes = await app.m_Editor.GetPoint({ Msg: "请点击拉伸基点:" }); + let ptRes = await app.Editor.GetPoint({ Msg: "请点击拉伸基点:" }); if (ptRes.Status != PromptStatus.OK) return; @@ -44,7 +44,7 @@ export class Command_Scale implements Command while (true) { - let scaleRes = await app.m_Editor.GetDistance({ + let scaleRes = await app.Editor.GetDistance({ BasePoint: ptRes.Point, Msg: "请输入缩放比例或:", KeyWordList: [{ key: "C", msg: "复制" }, { key: "R", msg: "参照" }], @@ -62,7 +62,7 @@ export class Command_Scale implements Command { JigUtils.Restore(); - let disRes = await app.m_Editor.GetDistance({ + let disRes = await app.Editor.GetDistance({ Msg: "点取或输入参照长度", }); if (disRes.Status === PromptStatus.Cancel) @@ -71,7 +71,7 @@ export class Command_Scale implements Command //参照缩放长度 let referLen = disRes.Distance; - let scaleRes = await app.m_Editor.GetDistance({ + let scaleRes = await app.Editor.GetDistance({ Msg: "指定新的长度或", BasePoint: ptRes.Point, KeyWordList: [{ key: "P", msg: "点" }], @@ -91,7 +91,7 @@ export class Command_Scale implements Command { JigUtils.End(); - let disRes = await app.m_Editor.GetDistance({ + let disRes = await app.Editor.GetDistance({ Msg: "点取或输入参照长度", }); if (disRes.Status === PromptStatus.Cancel) @@ -124,7 +124,7 @@ export class Command_Scale implements Command if (isCopy) { let br = en.Clone().ApplyMatrix(scMat); - app.m_Database.ModelSpace.Append(br); + app.Database.ModelSpace.Append(br); } else en.ApplyMatrix(scMat); diff --git a/src/Add-on/Stretch.ts b/src/Add-on/Stretch.ts index 03a82419e..51afa0eca 100644 --- a/src/Add-on/Stretch.ts +++ b/src/Add-on/Stretch.ts @@ -10,10 +10,10 @@ export class Stretch implements Command { async exec() { - let ssRes = await app.m_Editor.GetSelection({ UseSelect: true, Msg: "请选择拉伸对象:" }); + let ssRes = await app.Editor.GetSelection({ UseSelect: true, Msg: "请选择拉伸对象:" }); if (ssRes.Status !== PromptStatus.OK) return; - let p1 = await app.m_Editor.GetPoint({ Msg: "指定基点:" });//, KeyWordList: [{ msg: "位移", key: "D" }] + let p1 = await app.Editor.GetPoint({ Msg: "指定基点:" });//, KeyWordList: [{ msg: "位移", key: "D" }] if (p1.Status !== PromptStatus.OK) return; let ss = ssRes.SelectSet; @@ -39,7 +39,7 @@ export class Stretch implements Command let lastStretchPoint = p1.Point; let lastMovePoint = lastStretchPoint; let moveMatrix = new Matrix4(); - let p2 = await app.m_Editor.GetPoint( + let p2 = await app.Editor.GetPoint( { BasePoint: p1.Point, AllowDrawRubberBand: true, diff --git a/src/Add-on/Sweep.ts b/src/Add-on/Sweep.ts index 304298d38..b9c1eb038 100644 --- a/src/Add-on/Sweep.ts +++ b/src/Add-on/Sweep.ts @@ -9,7 +9,7 @@ export class Sweep implements Command { async exec() { - let enRes = await app.m_Editor.GetEntity({ Msg: "请选择扫描轮廓(封闭多段线):" }); + let enRes = await app.Editor.GetEntity({ Msg: "请选择扫描轮廓(封闭多段线):" }); if (enRes.Status !== PromptStatus.OK) return; else @@ -18,25 +18,25 @@ export class Sweep implements Command return; if (!enRes.Entity.IsClose) { - app.m_Editor.Prompt("您选择的多段线没有闭合!"); + app.Editor.Prompt("您选择的多段线没有闭合!"); return; } } let originContour = enRes.Entity; let contour = originContour.Clone(); - enRes = await app.m_Editor.GetEntity({ Msg: "请选择路径:" }); + enRes = await app.Editor.GetEntity({ Msg: "请选择路径:" }); if (enRes.Status === PromptStatus.OK) { if (!(enRes.Entity instanceof Curve)) { - app.m_Editor.Prompt("您选择的路径不是曲线!"); + app.Editor.Prompt("您选择的路径不是曲线!"); return; } let sweepSolid = new SweepSolid(contour, enRes.Entity.Clone()); - app.m_Database.ModelSpace.Append(sweepSolid); + app.Database.ModelSpace.Append(sweepSolid); originContour.Erase(); enRes.Entity.Erase(); diff --git a/src/Add-on/SwitchCamera.ts b/src/Add-on/SwitchCamera.ts index 1f255f3fc..edf5a9b47 100644 --- a/src/Add-on/SwitchCamera.ts +++ b/src/Add-on/SwitchCamera.ts @@ -5,6 +5,6 @@ export class Command_SwitchCamera implements Command { async exec() { - app.m_Viewer.m_CameraCtrl.SwitchCamera(); + app.Viewer.CameraCtrl.SwitchCamera(); } } diff --git a/src/Add-on/Tangent.ts b/src/Add-on/Tangent.ts index 4f929abe1..519f8190d 100644 --- a/src/Add-on/Tangent.ts +++ b/src/Add-on/Tangent.ts @@ -8,7 +8,7 @@ export class DrawTangentLine implements Command { async exec() { - let ss = await app.m_Editor.GetSelection({ + let ss = await app.Editor.GetSelection({ Msg: "请选择圆或者圆弧:", Filter: { filterTypes: [Circle, Arc] @@ -28,7 +28,7 @@ export class DrawTangentLine implements Command let ls = CircleInternalTangentLines(c1, c2).concat(CircleOuterTangentLines(c1, c2)); for (let l of ls) - app.m_Database.ModelSpace.Append(l); + app.Database.ModelSpace.Append(l); } } } diff --git a/src/Add-on/Template/ShowTopline.ts b/src/Add-on/Template/ShowTopline.ts index 0e4acd2a4..b89a805ae 100644 --- a/src/Add-on/Template/ShowTopline.ts +++ b/src/Add-on/Template/ShowTopline.ts @@ -7,6 +7,6 @@ export class ShowTopLine implements Command { async exec() { - app.m_Editor.m_ModalManage.RenderModal(TopllineManage, ModalPosition.Center, {}); + app.Editor.ModalManage.RenderModal(TopllineManage, ModalPosition.Center, {}); } } diff --git a/src/Add-on/TestFb.ts b/src/Add-on/TestFb.ts index 0f7088554..a19cdc6e8 100644 --- a/src/Add-on/TestFb.ts +++ b/src/Add-on/TestFb.ts @@ -10,7 +10,7 @@ export class TestFb implements Command { async exec() { - let brRes = await app.m_Editor.GetSelection({ + let brRes = await app.Editor.GetSelection({ Msg: "选择板件", UseSelect: true, Filter: { filterTypes: [Board] } @@ -32,14 +32,14 @@ export class TestFb implements Command } else { - app.m_Editor.Prompt("警告:该板件无法得到模拟封边结果!"); + app.Editor.Prompt("警告:该板件无法得到模拟封边结果!"); } } if (showCus.length === 0) return; - let ptRes = await app.m_Editor.GetPoint({ + let ptRes = await app.Editor.GetPoint({ Msg: "选择放置位置" }) @@ -61,7 +61,7 @@ export class TestFb implements Command { c.Position = c.Position.add(vec); } - app.m_Database.ModelSpace.Append(c); + app.Database.ModelSpace.Append(c); } } } diff --git a/src/Add-on/TestPointPickParse.ts b/src/Add-on/TestPointPickParse.ts index 9fafd246a..63b7b11f5 100644 --- a/src/Add-on/TestPointPickParse.ts +++ b/src/Add-on/TestPointPickParse.ts @@ -10,10 +10,10 @@ export class Command_TestPointPickParse implements Command { while (true) { - let ptRes = await app.m_Editor.GetPoint(); + let ptRes = await app.Editor.GetPoint(); if (ptRes.Status === PromptStatus.OK) { - let parse = new PointSelectBoards(app.m_Editor.m_MouseCtrl.m_CurMousePointVCS, app.m_Viewer, app.m_Viewer.Scene.children); + let parse = new PointSelectBoards(app.Editor.MouseCtrl.m_CurMousePointVCS, app.Viewer, app.Viewer.Scene.children); for (let br of parse.SelectBoards) br.ColorIndex = color % 7 + 1; color++; diff --git a/src/Add-on/Trim.ts b/src/Add-on/Trim.ts index 1d713ed01..939442526 100644 --- a/src/Add-on/Trim.ts +++ b/src/Add-on/Trim.ts @@ -16,7 +16,7 @@ export class Command_Trim implements Command { async exec() { - let knifeSsRes = await app.m_Editor.GetSelection({ + let knifeSsRes = await app.Editor.GetSelection({ Msg: "请选择切割对象<全部选择>:", UseSelect: true, AllowNone: true, @@ -34,7 +34,7 @@ export class Command_Trim implements Command let lastCurves: Curve[] = []; //选择裁剪的对象. - let trSsRes = await app.m_Editor.GetSelection({ + let trSsRes = await app.Editor.GetSelection({ Msg: "请选择被切割对象:", Once: true, AllowNone: true, @@ -57,7 +57,7 @@ export class Command_Trim implements Command for (let c of cus) JigUtils.Draw(c); } - app.m_Editor.UpdateScreen(); + app.Editor.UpdateScreen(); } }); @@ -71,7 +71,7 @@ export class Command_Trim implements Command if (!trSsRes.SelectSet) continue; - app.m_Database.hm.StartMark(); + app.Database.hm.StartMark(); let newCus = this.JigTrim(trSsRes, kniefCus, false); for (let [c, cus] of newCus) @@ -82,10 +82,10 @@ export class Command_Trim implements Command if (kniefCus.length !== len) kniefCus.push(...cus); for (let c of cus) - app.m_Database.ModelSpace.Append(c); + app.Database.ModelSpace.Append(c); } - app.m_Editor.UpdateScreen(); + app.Editor.UpdateScreen(); } // kniefCus.forEach(c => c.RestoreJigMaterial()); @@ -125,7 +125,7 @@ export class Command_Trim implements Command { let inPts: Vector3[] = []; if (kniefCus.length === 0) - kniefCus = app.m_Database.ModelSpace.Entitys.filter(cu => cu instanceof Curve && !cu.IsErase) as Curve[]; + kniefCus = app.Database.ModelSpace.Entitys.filter(cu => cu instanceof Curve && !cu.IsErase) as Curve[]; for (let icu of kniefCus) if (icu != thisCurve) diff --git a/src/Add-on/Undo.ts b/src/Add-on/Undo.ts index 342e6bdca..81bef2972 100644 --- a/src/Add-on/Undo.ts +++ b/src/Add-on/Undo.ts @@ -5,7 +5,7 @@ export class Undo implements Command { async exec() { - app.m_Database.hm.Undo(); + app.Database.hm.Undo(); } } @@ -14,6 +14,6 @@ export class Redo implements Command { async exec() { - app.m_Database.hm.Redo(); + app.Database.hm.Redo(); } } diff --git a/src/Add-on/ViewChange.ts b/src/Add-on/ViewChange.ts index 92e97c7f7..ccfe6589a 100644 --- a/src/Add-on/ViewChange.ts +++ b/src/Add-on/ViewChange.ts @@ -11,17 +11,17 @@ export class ViewChange implements Command } async exec() { - app.m_Viewer.m_CameraCtrl.LookAt(this.viewDir); + app.Viewer.CameraCtrl.LookAt(this.viewDir); this.UcsLookAt(this.viewDir); - app.m_Viewer.ZoomAll(); - app.m_Editor.UpdateScreen(); + app.Viewer.ZoomAll(); + app.Editor.UpdateScreen(); } UcsLookAt(viewDir: Vector3) { if (this.useWCS) { - app.m_Editor.UCSMatrix = new Matrix4(); + app.Editor.UCSMatrix = new Matrix4(); } else { @@ -31,7 +31,7 @@ export class ViewChange implements Command Orbit.ComputUpDirection(z, y, x); - app.m_Editor.UCSMatrix = new Matrix4().makeBasis(x, y, z); + app.Editor.UCSMatrix = new Matrix4().makeBasis(x, y, z); } } } diff --git a/src/Add-on/Wblock.ts b/src/Add-on/Wblock.ts index 26b73bc8f..f94d6b162 100644 --- a/src/Add-on/Wblock.ts +++ b/src/Add-on/Wblock.ts @@ -12,11 +12,11 @@ export class Command_Wblock implements Command { async exec() { - let ssRes = await app.m_Editor.GetSelection({ Msg: "请选择需要拷贝的实体:", UseSelect: true }); + let ssRes = await app.Editor.GetSelection({ Msg: "请选择需要拷贝的实体:", UseSelect: true }); if (ssRes.Status !== PromptStatus.OK) return; - let ptRes = await app.m_Editor.GetPoint({ Msg: "请选择复制基点:" }); + let ptRes = await app.Editor.GetPoint({ Msg: "请选择复制基点:" }); if (ptRes.Status !== PromptStatus.OK) return; diff --git a/src/Add-on/ZoomE.ts b/src/Add-on/ZoomE.ts index 3045bc854..744610deb 100644 --- a/src/Add-on/ZoomE.ts +++ b/src/Add-on/ZoomE.ts @@ -4,7 +4,7 @@ export class ZoomE implements Command { async exec() { - app.m_Viewer.ZoomAll(); - app.m_Editor.UpdateScreen(); + app.Viewer.ZoomAll(); + app.Editor.UpdateScreen(); } } diff --git a/src/Add-on/closetest.ts b/src/Add-on/closetest.ts index ec62bc366..82c12a800 100644 --- a/src/Add-on/closetest.ts +++ b/src/Add-on/closetest.ts @@ -20,7 +20,7 @@ export class Command_ClosePt implements Command { let dyn = new PromptBlock(DynamicInputManage.GetManage()); - let cuRes = await app.m_Editor.GetEntity(); + let cuRes = await app.Editor.GetEntity(); if (cuRes.Entity instanceof Curve) @@ -37,7 +37,7 @@ export class Command_ClosePt implements Command let extend = false; while (true) { - let p = await app.m_Editor.GetPoint({ + let p = await app.Editor.GetPoint({ KeyWordList: [{ key: "C", msg: (extend ? "不" : "") + "延伸" }], Callback: p => { @@ -56,7 +56,7 @@ export class Command_ClosePt implements Command if (cu instanceof Polyline) { dyn.Visible = true; - let vcs = app.m_Editor.m_MouseCtrl.m_CurMousePointVCS.clone(); + let vcs = app.Editor.MouseCtrl.m_CurMousePointVCS.clone(); vcs.add(new Vector3(0, -20, 0)); dyn.SetPostion(vcs); diff --git a/src/Add-on/instest.ts b/src/Add-on/instest.ts index a28c7d765..36a9d59c2 100644 --- a/src/Add-on/instest.ts +++ b/src/Add-on/instest.ts @@ -11,7 +11,7 @@ export class Command_INsTest implements Command async exec() { - let ss = await app.m_Editor.GetSelection(); + let ss = await app.Editor.GetSelection(); if (ss.Status != PromptStatus.OK) return; @@ -29,12 +29,12 @@ export class Command_INsTest implements Command for (let p of ins) { let c = new Circle(p, 0.1); - app.m_Database.ModelSpace.Append(c); + app.Database.ModelSpace.Append(c); } } } - app.m_Editor.UpdateScreen(); + app.Editor.UpdateScreen(); } } diff --git a/src/Add-on/loadfbx.ts b/src/Add-on/loadfbx.ts index cdee596f1..3c89e2ca3 100644 --- a/src/Add-on/loadfbx.ts +++ b/src/Add-on/loadfbx.ts @@ -25,7 +25,7 @@ export class Fbx implements Command obj.scale.set(0.01, 0.01, 0.01); obj.matrixWorldNeedsUpdate = true; - app.m_Viewer.Scene.add(obj); + app.Viewer.Scene.add(obj); } // Read in the image file as a data URL. reader.readAsArrayBuffer(f); diff --git a/src/Add-on/polytest.ts b/src/Add-on/polytest.ts index e5a753c1a..5bda4d256 100644 --- a/src/Add-on/polytest.ts +++ b/src/Add-on/polytest.ts @@ -58,11 +58,11 @@ export class Command_PLTest implements Command // pl.CloseMark = true; - app.m_Database.ModelSpace.Append(pl); + app.Database.ModelSpace.Append(pl); // app.m_Database.ModelSpace.Append(new Point(pl.StartPoint)); pl.ResetStartPoint(5); - app.m_Database.ModelSpace.Append(new Point(pl.StartPoint)); + app.Database.ModelSpace.Append(new Point(pl.StartPoint)); } createPolyline() { @@ -101,7 +101,7 @@ export class Command_PLTest implements Command // pl.CloseMark = true; - app.m_Database.ModelSpace.Append(pl); + app.Database.ModelSpace.Append(pl); let lines: Line[] = []; @@ -115,12 +115,12 @@ export class Command_PLTest implements Command let line = new Line(p, pc); - app.m_Database.ModelSpace.Append(line); + app.Database.ModelSpace.Append(line); lines.push(line); } - app.m_Editor.GetPoint({ + app.Editor.GetPoint({ Callback: center => { for (let i = 0; i < 1; i++) @@ -184,10 +184,10 @@ export class Command_PLTest implements Command for (let cu of pl.GetOffsetCurves(p)) { - app.m_Database.ModelSpace.Append(cu); + app.Database.ModelSpace.Append(cu); } } - app.m_Database.ModelSpace.Append(pl); + app.Database.ModelSpace.Append(pl); } splitRec() @@ -204,9 +204,9 @@ export class Command_PLTest implements Command let pls = pl.GetSplitCurves(0.5); for (let pl of pls) - app.m_Database.ModelSpace.Append(pl); + app.Database.ModelSpace.Append(pl); - app.m_Database.ModelSpace.Append(pl); + app.Database.ModelSpace.Append(pl); } testGetPointAtParam() @@ -248,7 +248,7 @@ export class Command_PLTest implements Command console.log(v); - let pt = app.m_Editor.GetPoint({ + let pt = app.Editor.GetPoint({ Callback: (pt) => { @@ -264,7 +264,7 @@ export class Command_PLTest implements Command let cir = new Circle(pt, 0.1); c++; cir.ColorIndex = c % 7 + 1; - app.m_Database.ModelSpace.Append(cir); + app.Database.ModelSpace.Append(cir); let d = pl.GetFistDeriv(p); let line = new Line(pt, pt.clone().add(d)); @@ -275,9 +275,9 @@ export class Command_PLTest implements Command } line.ColorIndex = c % 7 + 1; - app.m_Database.ModelSpace.Append(line); + app.Database.ModelSpace.Append(line); } - app.m_Database.ModelSpace.Append(pl); + app.Database.ModelSpace.Append(pl); } intersect() @@ -322,8 +322,8 @@ export class Command_PLTest implements Command bul: 0 }, ]) - app.m_Database.ModelSpace.Append(pl); - app.m_Database.ModelSpace.Append(p4); + app.Database.ModelSpace.Append(pl); + app.Database.ModelSpace.Append(p4); console.log(pl.IntersectWith(p4, IntersectOption.ExtendArg)); } } diff --git a/src/Add-on/ssget.ts b/src/Add-on/ssget.ts index 0cc35e578..3b21d6b01 100644 --- a/src/Add-on/ssget.ts +++ b/src/Add-on/ssget.ts @@ -10,7 +10,7 @@ export class Command_Ssget implements Command } async exec() { - let ss = await app.m_Editor.GetSelection(); + let ss = await app.Editor.GetSelection(); if (ss.Status === PromptStatus.OK) { for (let en of ss.SelectSet.SelectEntityList) diff --git a/src/Add-on/test/testIntersect.ts b/src/Add-on/test/testIntersect.ts index 033062615..e0a1a6287 100644 --- a/src/Add-on/test/testIntersect.ts +++ b/src/Add-on/test/testIntersect.ts @@ -17,13 +17,13 @@ export class TestIntersect implements Command // this.testLineAndCirOrArc(); // this.testCirAndCir() // this.testInter(); - app.m_Editor.UpdateScreen(); + app.Editor.UpdateScreen(); } //通用求交测试 async CommonIntersect() { - let exRefSsRes = await app.m_Editor.GetSelection({ Msg: "请选择对象<全部选择>:", UseSelect: true }); + let exRefSsRes = await app.Editor.GetSelection({ Msg: "请选择对象<全部选择>:", UseSelect: true }); if (exRefSsRes.Status !== PromptStatus.OK) return; let cus = exRefSsRes.SelectSet.SelectEntityList as Curve[]; @@ -39,14 +39,14 @@ export class TestIntersect implements Command for (let p of ipts) { let cir = new Point(p); - app.m_Database.ModelSpace.Append(cir); + app.Database.ModelSpace.Append(cir); } } } } async testLineAndCirOrArc() { - let exRefSsRes = await app.m_Editor.GetSelection({ Msg: "请选择对象<全部选择>:", UseSelect: true }); + let exRefSsRes = await app.Editor.GetSelection({ Msg: "请选择对象<全部选择>:", UseSelect: true }); if (exRefSsRes.Status !== PromptStatus.OK) return; let cus = exRefSsRes.SelectSet.SelectEntityList as Curve[]; if (cus.length > 1) @@ -59,7 +59,7 @@ export class TestIntersect implements Command { let cir = new Circle(p, 0.2); cir.ColorIndex = 2; - app.m_Database.ModelSpace.Append(cir); + app.Database.ModelSpace.Append(cir); }) } else { @@ -70,7 +70,7 @@ export class TestIntersect implements Command } async testCirAndCir() { - let exRefSsRes = await app.m_Editor.GetSelection({ Msg: "请选择对象<全部选择>:", UseSelect: true }); + let exRefSsRes = await app.Editor.GetSelection({ Msg: "请选择对象<全部选择>:", UseSelect: true }); if (exRefSsRes.Status !== PromptStatus.OK) return; let cus = exRefSsRes.SelectSet.SelectEntityList as Array; if (cus.length > 1) @@ -85,7 +85,7 @@ export class TestIntersect implements Command { let cir = new Circle(p, 0.1); cir.ColorIndex = 2; - app.m_Database.ModelSpace.Append(cir); + app.Database.ModelSpace.Append(cir); }) } else { @@ -96,7 +96,7 @@ export class TestIntersect implements Command } async testInter() { - let exRefSsRes = await app.m_Editor.GetSelection({ Msg: "请选择对象<全部选择>:", UseSelect: true }); + let exRefSsRes = await app.Editor.GetSelection({ Msg: "请选择对象<全部选择>:", UseSelect: true }); if (exRefSsRes.Status !== PromptStatus.OK) return; let cus = exRefSsRes.SelectSet.SelectEntityList as Curve[]; if (cus.length === 2) @@ -109,7 +109,7 @@ export class TestIntersect implements Command { let cir = new Circle(p, 10); cir.ColorIndex = 2; - app.m_Database.ModelSpace.Append(cir); + app.Database.ModelSpace.Append(cir); }) } } diff --git a/src/Add-on/testEntity/TestBox.ts b/src/Add-on/testEntity/TestBox.ts index b2e4d3697..43cf25e44 100644 --- a/src/Add-on/testEntity/TestBox.ts +++ b/src/Add-on/testEntity/TestBox.ts @@ -22,13 +22,13 @@ export class Command_TestBox implements Command // app.m_Database.ModelSpace.Append(line); // } - let ptRes = await app.m_Editor.GetPoint({ Msg: "选择点" }) + let ptRes = await app.Editor.GetPoint({ Msg: "选择点" }) if (ptRes.Status !== PromptStatus.OK) return; let pt1 = ptRes.Point.clone(); - app.m_Viewer.WorldToScreen(pt1); + app.Viewer.WorldToScreen(pt1); - ptRes = await app.m_Editor.GetPoint({ + ptRes = await app.Editor.GetPoint({ Msg: "选择其他点", BasePoint: ptRes.Point, AllowDrawRubberBand: true, @@ -36,8 +36,8 @@ export class Command_TestBox implements Command { let sss = new SelectSet(); let pt = v.clone(); - app.m_Viewer.WorldToScreen(pt); - let sl = new SelectLine(app.m_Viewer, AsVector2(pt1), AsVector2(pt.clone())) + app.Viewer.WorldToScreen(pt); + let sl = new SelectLine(app.Viewer, AsVector2(pt1), AsVector2(pt.clone())) sl.Select(); sss.AddSelect(sl); console.log(sss.SelectEntityList); diff --git a/src/Add-on/testEntity/TestCurve.ts b/src/Add-on/testEntity/TestCurve.ts index 71c9b804e..d5b8f75ac 100644 --- a/src/Add-on/testEntity/TestCurve.ts +++ b/src/Add-on/testEntity/TestCurve.ts @@ -19,13 +19,13 @@ export class TestTargeOnCurve implements Command { try { - let ssRes = await app.m_Editor.GetSelection( + let ssRes = await app.Editor.GetSelection( { Msg: "选择曲线" }, ); let source = ssRes.SelectSet.SelectEntityList[0] as Polyline | Circle; - ssRes = await app.m_Editor.GetSelection( + ssRes = await app.Editor.GetSelection( { Msg: "选择目标曲线" }, @@ -44,7 +44,7 @@ export class TestTargeOnCurve implements Command this.testClip(source as Polyline, target).forEach((c, i) => { c.ColorIndex = i + 1; - app.m_Database.ModelSpace.Append(c); + app.Database.ModelSpace.Append(c); }) // this.testPtIn(source as Polyline, target); target.Erase(); @@ -110,7 +110,7 @@ export function testPts(pts: Vector3[], color = 2) pts.forEach(p => { let point = new Point(p) - app.m_Database.ModelSpace.Append(point); + app.Database.ModelSpace.Append(point); }); } export function testContours(cons: Contour[], color = 2) @@ -118,7 +118,7 @@ export function testContours(cons: Contour[], color = 2) cons.forEach(c => { c.Curve.ColorIndex = color; - app.m_Database.ModelSpace.Append(c.Curve); + app.Database.ModelSpace.Append(c.Curve); }); } export function testCurve(cons: Curve[], color: number = 2) @@ -126,7 +126,7 @@ export function testCurve(cons: Curve[], color: number = 2) cons.forEach(c => { c.ColorIndex = color; - app.m_Database.ModelSpace.Append(c); + app.Database.ModelSpace.Append(c); }); } @@ -136,7 +136,7 @@ export function testBox(box3: Array, color: number = 2) { let l = new Line(b.min, b.max); l.ColorIndex = color; - app.m_Database.ModelSpace.Append(l); + app.Database.ModelSpace.Append(l); }) } //测试盒子 @@ -151,6 +151,6 @@ export function testtBox3(box3: Box3, colorIndex = 1) [l1, l2, l3, l4].forEach(l => { l.ColorIndex = colorIndex; - app.m_Database.ModelSpace.Append(l); + app.Database.ModelSpace.Append(l); }) } diff --git a/src/Add-on/testEntity/test.ts b/src/Add-on/testEntity/test.ts index 0a77b8416..6d266e701 100644 --- a/src/Add-on/testEntity/test.ts +++ b/src/Add-on/testEntity/test.ts @@ -10,7 +10,7 @@ export class Test implements Command { async exec() { - let enRes = await app.m_Editor.GetEntity(); + let enRes = await app.Editor.GetEntity(); if (enRes.Status === PromptStatus.OK) { diff --git a/src/Add-on/testEntity/testCollision.ts b/src/Add-on/testEntity/testCollision.ts index 5af394f1d..a5c4ac7fa 100644 --- a/src/Add-on/testEntity/testCollision.ts +++ b/src/Add-on/testEntity/testCollision.ts @@ -11,7 +11,7 @@ export class TestCollision implements Command { async exec() { - let exSsRes = await app.m_Editor.GetSelection({ Msg: "请选择对象<全部选择>:", UseSelect: true }); + let exSsRes = await app.Editor.GetSelection({ Msg: "请选择对象<全部选择>:", UseSelect: true }); if (exSsRes.Status === PromptStatus.Cancel) return; @@ -55,5 +55,5 @@ export function showFace(f) x1.ColorIndex = 1; y1.ColorIndex = 3; z1.ColorIndex = 4; - [x1, y1, z1].forEach(c => app.m_Database.ModelSpace.Append(c)); + [x1, y1, z1].forEach(c => app.Database.ModelSpace.Append(c)); } diff --git a/src/ApplicationServices/Application.ts b/src/ApplicationServices/Application.ts index a1b8fe1a2..3e5557d80 100644 --- a/src/ApplicationServices/Application.ts +++ b/src/ApplicationServices/Application.ts @@ -26,10 +26,10 @@ export let app: ApplicationService; */ export class ApplicationService { - m_Database: Database; - m_Viewer: Viewer; - m_Editor: Editor; - m_CommandReactor: CommandReactor; + Database: Database; + Viewer: Viewer; + Editor: Editor; + CommandReactor: CommandReactor; _drillingReactor: DrillingReactor; _autoCuttingReactor: AutoCuttingReactor; constructor() @@ -37,101 +37,101 @@ export class ApplicationService app = this; HostApplicationServices.Application = this; //数据 - this.m_Database = new Database(true, true); + this.Database = new Database(true, true); let container = document.getElementById("Webgl"); //渲染器 - this.m_Viewer = new Viewer(container); - this.m_Viewer.RenderDatabase(this.m_Database); + this.Viewer = new Viewer(container); + this.Viewer.RenderDatabase(this.Database); end((new Entity()).AsyncUpdated, () => { - this.m_Viewer.m_bNeedUpdate = true; + this.Viewer.UpdateRender(); }); //性能测试 // new RenderPerformanceStatus(this.m_Viewer); //相机控制 - new CameraControls(this.m_Viewer); + new CameraControls(this.Viewer); - this.m_Editor = new Editor(this); - let gt = new Gesture(this.m_Editor); + this.Editor = new Editor(this); + let gt = new Gesture(this.Editor); RegisterGesture(gt); let regGripEvent = () => { - let selectSet = this.m_Editor.m_SelectCtrl.SelectSet; + let selectSet = this.Editor.SelectCtrl.SelectSet; end(selectSet, selectSet.AddSelect, (ss: SelectSetBase) => { for (let obj of ss.m_SelectList) { - this.m_Viewer._GripScene.Append(obj); + this.Viewer.GripScene.Append(obj); } - this.m_Viewer.m_bNeedUpdate = true; + this.Viewer.UpdateRender(); }); end(selectSet, selectSet.RemoveSelect, (ss: SelectSetBase) => { for (let obj of ss.m_SelectList) { - this.m_Viewer._GripScene.Remove(obj); + this.Viewer.GripScene.Remove(obj); } - this.m_Viewer.m_bNeedUpdate = true; + this.Viewer.UpdateRender(); }); } - end(this.m_Editor.m_SelectCtrl, this.m_Editor.m_SelectCtrl.Cancel, () => + end(this.Editor.SelectCtrl, this.Editor.SelectCtrl.Cancel, () => { regGripEvent(); - this.m_Viewer._GripScene.Clear(); - this.m_Viewer.m_bNeedUpdate = true; + this.Viewer.GripScene.Clear(); + this.Viewer.UpdateRender(); }); regGripEvent(); begin(commandMachine, commandMachine.CommandStart, () => { - this.m_Viewer._GripScene.visible = false; - this.m_Editor.m_SnapDragServices.HideDrawLine(); + this.Viewer.GripScene.visible = false; + this.Editor.SnapDragServices.HideDrawLine(); }); begin(commandMachine, commandMachine.CommandEnd, () => { - this.m_Viewer._GripScene.visible = true; + this.Viewer.GripScene.visible = true; }); //显示撤销重做命令 - end(this.m_Database.hm, this.m_Database.hm.UndoEvent, (cmdName) => + end(this.Database.hm, this.Database.hm.UndoEvent, (cmdName) => { - this.m_Editor.Prompt("撤销:" + cmdName); + this.Editor.Prompt("撤销:" + cmdName); }); - end(this.m_Database.hm, this.m_Database.hm.RedoEvent, (cmdName) => + end(this.Database.hm, this.Database.hm.RedoEvent, (cmdName) => { - this.m_Editor.Prompt("重做:" + cmdName); + this.Editor.Prompt("重做:" + cmdName); }); - this.m_CommandReactor = new CommandReactor(this); + this.CommandReactor = new CommandReactor(this); this._autoCuttingReactor = new AutoCuttingReactor(); this._drillingReactor = new DrillingReactor(); window["app"] = this; //撤销 重做 - end(app.m_Editor.m_KeyCtrl, app.m_Editor.m_KeyCtrl.OnKeyDown, (e: KeyboardEvent) => + end(app.Editor.KeyCtrl, app.Editor.KeyCtrl.OnKeyDown, (e: KeyboardEvent) => { if (e.code === KeyCode.F1) { e.preventDefault(); commandMachine.ExecCommand("COMANP"); } - if (app.m_Editor.m_KeyCtrl.KeyIsDown(KeyCode.ControlLeft)) + if (app.Editor.KeyCtrl.KeyIsDown(KeyCode.ControlLeft)) { if (e.code === KeyCode.KeyZ) { - app.m_Database.hm.Undo(); - app.m_Viewer._GripScene.UpdateAll(); + app.Database.hm.Undo(); + app.Viewer.GripScene.UpdateAll(); } else if (e.code === KeyCode.KeyY) { - app.m_Database.hm.Redo(); - app.m_Viewer._GripScene.UpdateAll(); + app.Database.hm.Redo(); + app.Viewer.GripScene.UpdateAll(); } else if (e.code === KeyCode.KeyC) { @@ -145,7 +145,7 @@ export class ApplicationService { commandMachine.ExecCommand("SAVE"); } - app.m_Editor.UpdateScreen(); + app.Editor.UpdateScreen(); } else if (e.code === KeyCode.F8) { @@ -159,13 +159,13 @@ export class ApplicationService }); //呼出捕捉菜单 - end(app.m_Editor.m_MouseCtrl, app.m_Editor.m_MouseCtrl.onMouseDown, + end(app.Editor.MouseCtrl, app.Editor.MouseCtrl.onMouseDown, (e: MouseEvent) => { if (e.button === MouseKey.Right && - (app.m_Editor.m_KeyCtrl.KeyIsDown(KeyCode.ControlLeft) - || app.m_Editor.m_KeyCtrl.KeyIsDown(KeyCode.ShiftLeft)) + (app.Editor.KeyCtrl.KeyIsDown(KeyCode.ControlLeft) + || app.Editor.KeyCtrl.KeyIsDown(KeyCode.ShiftLeft)) ) { ShowSnapMenu(); @@ -181,21 +181,21 @@ export class ApplicationService //创建一张新图纸. CreateDocument(name: string = "新文件") { - this.m_Viewer.m_CameraCtrl.LookAt(new Vector3(1, 1, -1)); - this.m_Editor.UCSMatrix = new Matrix4(); - this.m_Viewer.m_CameraCtrl.ViewHeight = 1000; - this.m_Viewer.m_CameraCtrl.Update(); + this.Viewer.CameraCtrl.LookAt(new Vector3(1, 1, -1)); + this.Editor.UCSMatrix = new Matrix4(); + this.Viewer.CameraCtrl.ViewHeight = 1000; + this.Viewer.CameraCtrl.Update(); - this.m_Database.FileRead(new Database(true).FileWrite()); + this.Database.FileRead(new Database(true).FileWrite()); appUi.setDocumentName(name); } FileOut(): CADFiler { - let f = this.m_Database.FileWrite(); + let f = this.Database.FileWrite(); let vf = new CADFiler(); - this.m_Viewer.m_CameraCtrl.WriteFile(vf); + this.Viewer.CameraCtrl.WriteFile(vf); f.Write(vf.Data); return f; @@ -203,11 +203,11 @@ export class ApplicationService OpenFile(f: CADFiler) { f.Reset(); - this.m_Database.FileRead(f); + this.Database.FileRead(f); let viewData = f.Read(); if (viewData) - this.m_Viewer.m_CameraCtrl.ReadFile(new CADFiler(viewData)); + this.Viewer.CameraCtrl.ReadFile(new CADFiler(viewData)); else - this.m_Viewer.ZoomAll(); + this.Viewer.ZoomAll(); } } diff --git a/src/Common/SerializeMaterial.ts b/src/Common/SerializeMaterial.ts index 9d0c9debe..73beaac9b 100644 --- a/src/Common/SerializeMaterial.ts +++ b/src/Common/SerializeMaterial.ts @@ -30,9 +30,9 @@ export function MaterialIn(fileData: Object[]) export function MaterialInAndAppendAppData(fileData: Object[]) { let mtl = MaterialIn(fileData) as PhysicalMaterialRecord; - app.m_Database.WblockCloneObejcts( + app.Database.WblockCloneObejcts( [mtl], - app.m_Database.MaterialTable, + app.Database.MaterialTable, new Map(), DuplicateRecordCloning.Rename ); diff --git a/src/Common/Utils.ts b/src/Common/Utils.ts index b83fab7bd..8bf9994f2 100644 --- a/src/Common/Utils.ts +++ b/src/Common/Utils.ts @@ -13,19 +13,19 @@ export const FileFormatReg = /^\[(\d+,){5}[(true)|(false)].+\]$/; export async function log(msg: string) { let app = (await import("../ApplicationServices/Application")).app; - app.m_Editor.Prompt(msg); + app.Editor.Prompt(msg); } export async function draw(en: Entity | Entity[] | Object3D) { let app = (await import("../ApplicationServices/Application")).app; if (en instanceof Object3D) - app.m_Viewer.Scene.add(en); + app.Viewer.Scene.add(en); else if (en instanceof Entity) - app.m_Database.ModelSpace.Append(en); + app.Database.ModelSpace.Append(en); else for (let e of en) - app.m_Database.ModelSpace.Append(e); + app.Database.ModelSpace.Append(e); } export function IsNumber(keyCode: number) diff --git a/src/DatabaseServices/Contour.ts b/src/DatabaseServices/Contour.ts index c4a465e61..18c8d70b6 100644 --- a/src/DatabaseServices/Contour.ts +++ b/src/DatabaseServices/Contour.ts @@ -158,8 +158,8 @@ export class Contour contours.push(c); } } - parseRoute(regParse.m_RegionsOutline); - parseRoute(regParse.m_RegionsInternal); + parseRoute(regParse.RegionsOutline); + parseRoute(regParse.RegionsInternal); return contours; } diff --git a/src/DatabaseServices/Template/Action/TestTemplateAction.ts b/src/DatabaseServices/Template/Action/TestTemplateAction.ts index ba3b715e0..5af1cf48d 100644 --- a/src/DatabaseServices/Template/Action/TestTemplateAction.ts +++ b/src/DatabaseServices/Template/Action/TestTemplateAction.ts @@ -29,7 +29,7 @@ export class TestTemplateAction } let param = record.GetParam(params[paramIndex]); param.UpdateParam(Math.abs(count * 10 - 500)); - app.m_Editor.UpdateScreen(); + app.Editor.UpdateScreen(); }, 16); } } diff --git a/src/DatabaseServices/Template/TemplateTest.ts b/src/DatabaseServices/Template/TemplateTest.ts index ba394aba6..ac2433646 100644 --- a/src/DatabaseServices/Template/TemplateTest.ts +++ b/src/DatabaseServices/Template/TemplateTest.ts @@ -45,11 +45,11 @@ function ParameterBecomeFater(params: {}) export function GetDefaultTemplate() { - let templates = app.m_Database.TemplateTable.Objects; + let templates = app.Database.TemplateTable.Objects; if (templates.length === 0) { let template = new TemplateRecord().InitSizeParams(); - app.m_Database.TemplateTable.Append(template); + app.Database.TemplateTable.Append(template); return template; } else @@ -69,15 +69,15 @@ export class AddTemplateAction { //不能在透视相机下执行这个工作. - let ssRes = await app.m_Editor.GetSelection({ SelectType: SelectType.C }); + let ssRes = await app.Editor.GetSelection({ SelectType: SelectType.C }); if (ssRes.Status !== PromptStatus.OK) return; - let bpRes = await app.m_Editor.GetPoint({ Msg: "指定方向的基点:" }); + let bpRes = await app.Editor.GetPoint({ Msg: "指定方向的基点:" }); if (bpRes.Status !== PromptStatus.OK) return; - let toRes = await app.m_Editor.GetPoint({ Msg: "指定方向的终点:", BasePoint: bpRes.Point, AllowDrawRubberBand: true }); + let toRes = await app.Editor.GetPoint({ Msg: "指定方向的终点:", BasePoint: bpRes.Point, AllowDrawRubberBand: true }); if (toRes.Status !== PromptStatus.OK) return; @@ -163,7 +163,7 @@ export class AutoTempateSizeAction { async exec() { - let brsRes = await app.m_Editor.GetSelection({ Filter: { filterTypes: [Board] } }); + let brsRes = await app.Editor.GetSelection({ Filter: { filterTypes: [Board] } }); if (brsRes.Status !== PromptStatus.OK) return; @@ -179,7 +179,7 @@ export class AutoTempateSizeAction //归0? - let keyRes = await app.m_Editor.GetKeyWords({ + let keyRes = await app.Editor.GetKeyWords({ KeyWordList: [ { key: "Y", msg: "是" }, { key: "N", msg: "否" }, @@ -217,7 +217,7 @@ export class AutoTempateSizeAction let topBox = new Box3(box.min.clone().add(new Vector3(-1, -1, size.z / 2)), box.max.clone().add(v)); let template = new TemplateRecord().InitSizeParams(); - app.m_Database.TemplateTable.Append(template); + app.Database.TemplateTable.Append(template); template.GetParam("L").value = size.x; template.GetParam("W").value = size.y; template.GetParam("H").value = size.z; @@ -302,7 +302,7 @@ export class UpdateTemplate { async exec() { - let enRes = await app.m_Editor.GetSelection({ + let enRes = await app.Editor.GetSelection({ Msg: "选择要修改的模版:", Once: true, Filter: { @@ -320,7 +320,7 @@ export class UpdateTemplate while (true) { - let keyRes = await app.m_Editor.GetKeyWords({ + let keyRes = await app.Editor.GetKeyWords({ KeyWordList: template.Params.map(p => { return { @@ -335,7 +335,7 @@ export class UpdateTemplate let paramname = keyRes.StringResult; let param = template.GetParam(paramname); - let newV = await app.m_Editor.GetDistance({ Msg: "新值!", Default: param.value as number }); + let newV = await app.Editor.GetDistance({ Msg: "新值!", Default: param.value as number }); if (newV.Status === PromptStatus.OK) { @@ -356,7 +356,7 @@ export class UpdateParam2 { // if (this.timer) clearInterval(this.timer); - let enRes = await app.m_Editor.GetSelection({ + let enRes = await app.Editor.GetSelection({ Msg: "选择要修改的模版:", Once: true, Filter: { @@ -392,7 +392,7 @@ export class UpdateParam2 } template.UpdateTemplate(undefined, true); - app.m_Editor.UpdateScreen(); + app.Editor.UpdateScreen(); index++; }, 16) } @@ -412,7 +412,7 @@ export class TemplateAttach { async exec() { - let enRes = await app.m_Editor.GetEntity({ + let enRes = await app.Editor.GetEntity({ Msg: "选择附加的模版", NotNone: true, Filter: { @@ -433,7 +433,7 @@ export class TemplateAttach if (!selectSpace.ParseOK) { - app.m_Editor.Prompt("未能分析出有效空间!"); + app.Editor.Prompt("未能分析出有效空间!"); return; } @@ -448,7 +448,7 @@ export class TemplateAttach let tbrs = brs.filter(br => br.Template !== undefined); if (tbrs.length === 0) { - app.m_Editor.Prompt("选取的空间不存在模版!"); + app.Editor.Prompt("选取的空间不存在模版!"); } else { diff --git a/src/DatabaseServices/Text/TextArea.ts b/src/DatabaseServices/Text/TextArea.ts index e169bc8a6..649b6b505 100644 --- a/src/DatabaseServices/Text/TextArea.ts +++ b/src/DatabaseServices/Text/TextArea.ts @@ -52,7 +52,7 @@ export class TextArea extends Singleton (DownPanelStore.GetInstance() as DownPanelStore).fontName = text.m_FontName; document.getElementById('Webgl').parentNode.appendChild(this.m_AreaContiner); textObj.visible = false; - app.m_Editor.UpdateScreen(); + app.Editor.UpdateScreen(); this.m_EditoringObject = textObj; this.RegisterEvent(); @@ -65,9 +65,9 @@ export class TextArea extends Singleton } WorldToScreenHeight(h: number) { - let heightWCS = app.m_Viewer.m_CameraCtrl.ViewHeight; + let heightWCS = app.Viewer.CameraCtrl.ViewHeight; let radio = h / heightWCS; - return app.m_Viewer.Height * radio; + return app.Viewer.Height * radio; } CreateEditorArea() { @@ -97,7 +97,7 @@ export class TextArea extends Singleton } get ScreenPostion() { - return app.m_Viewer.WorldToScreen(this.m_TextPosition.clone()); + return app.Viewer.WorldToScreen(this.m_TextPosition.clone()); } RegisterEvent() { @@ -130,7 +130,7 @@ export class TextArea extends Singleton if (el.className !== "text-input") { this.m_TextPosition = new Vector3(e.offsetX, e.offsetY - 70, 0); - app.m_Viewer.ScreenToWorld(this.m_TextPosition); + app.Viewer.ScreenToWorld(this.m_TextPosition); this.CreateEditorArea(); } } @@ -175,8 +175,8 @@ export class TextArea extends Singleton await f.AwaitLoaded(); let text = new Text(new Vector3(), el.innerText, f.FontName, this.m_TextHeight, this.m_TextRotation); - text.ApplyMatrix(app.m_Editor.UCSMatrix.setPosition(pos)); - app.m_Database.ModelSpace.Append(text); + text.ApplyMatrix(app.Editor.UCSMatrix.setPosition(pos)); + app.Database.ModelSpace.Append(text); this.m_AreaContiner.removeChild(el); el = null; } @@ -190,7 +190,7 @@ export class TextArea extends Singleton this.m_EditoringObject = null; } - app.m_Editor.UpdateScreen(); + app.Editor.UpdateScreen(); this.waitPromis.forEach(f => f()); this.waitPromis.length = 0; diff --git a/src/Editor/CameraControls.ts b/src/Editor/CameraControls.ts index 64ef238b4..6e7f96264 100644 --- a/src/Editor/CameraControls.ts +++ b/src/Editor/CameraControls.ts @@ -37,7 +37,7 @@ export class CameraControls constructor(viewer: Viewer) { this.m_Viewer = viewer; - this.m_domElement = viewer.m_Render.domElement; + this.m_domElement = viewer.Renderer.domElement; this.RegisterEvent(); } @@ -50,7 +50,7 @@ export class CameraControls document.addEventListener("mousemove", e => { //@ts-ignore - if (document.pointerLockElement === this.m_Viewer.m_Render.domElement) + if (document.pointerLockElement === this.m_Viewer.Renderer.domElement) this.onMouseMove(e); }); this.m_domElement.addEventListener("mouseup", this.onMouseUp, false) @@ -138,7 +138,7 @@ export class CameraControls } } this.m_StartClickPoint.copy(this.m_EndClickPoint); - this.m_Viewer.m_bNeedUpdate = true; + this.m_Viewer.UpdateRender(); } beginPan() { @@ -155,15 +155,15 @@ export class CameraControls requestPointerLock() { //@ts-ignore - if (this.m_Viewer.m_Render.domElement.requestPointerLock + if (this.m_Viewer.Renderer.domElement.requestPointerLock && this.m_IsAltDown ) { //@ts-ignore - this.m_Viewer.m_Render.domElement.requestPointerLock(); + this.m_Viewer.Renderer.domElement.requestPointerLock(); - this.m_Viewer.m_PreViewer.Cursor.CursorObject.visible = false; - this.m_Viewer.m_PreViewer.UpdateScreen(); + this.m_Viewer.PreViewer.Cursor.CursorObject.visible = false; + this.m_Viewer.PreViewer.UpdateScreen(); } else if (this.m_domElement.setPointerCapture) this.m_domElement.setPointerCapture(1); @@ -176,8 +176,8 @@ export class CameraControls //@ts-ignore document.exitPointerLock(); - this.m_Viewer.m_PreViewer.Cursor.CursorObject.visible = true; - this.m_Viewer.m_PreViewer.UpdateScreen(); + this.m_Viewer.PreViewer.Cursor.CursorObject.visible = true; + this.m_Viewer.PreViewer.UpdateScreen(); } if (this.m_domElement.releasePointerCapture) this.m_domElement.releasePointerCapture(1); diff --git a/src/Editor/CommandMachine.ts b/src/Editor/CommandMachine.ts index 26344fabc..fd3dfd5d7 100644 --- a/src/Editor/CommandMachine.ts +++ b/src/Editor/CommandMachine.ts @@ -21,18 +21,18 @@ class CommandMachine if (CommandState.CommandIng) return; - arrayRemoveOnce(app.m_Editor.m_CommandStore.historyCmdList, cmdName) - app.m_Editor.m_CommandStore.historyCmdList.push(cmdName); + arrayRemoveOnce(app.Editor.CommandStore.historyCmdList, cmdName) + app.Editor.CommandStore.historyCmdList.push(cmdName); if (cmdName === "U" || cmdName === "REDO") { await this.CommandMap.get(cmdName).exec(); - app.m_Editor.UpdateScreen(); + app.Editor.UpdateScreen(); return; } this.CommandStart(cmdName); - app.m_Editor.m_SelectCtrl.RestState(); + app.Editor.SelectCtrl.RestState(); let abort: boolean = true; try { @@ -42,12 +42,12 @@ class CommandMachine { console.error(error.stack); ReportError(error.stack, `命令:${cmdName}`); - app.m_Editor.Prompt("抱歉,命令造成了错误,请联系开发人员."); + app.Editor.Prompt("抱歉,命令造成了错误,请联系开发人员."); } this.CommandEnd(abort); } else - app.m_Editor.Prompt('未知命令!'); + app.Editor.Prompt('未知命令!'); } isCommandExist(cmdName: string) @@ -78,12 +78,12 @@ class CommandMachine { if (CommandState.CommandIng) { - app.m_Editor.Prompt('系统正忙!'); + app.Editor.Prompt('系统正忙!'); return false; } - app.m_Editor.Prompt(cmdName); + app.Editor.Prompt(cmdName); CommandState.CommandIng = true; - app.m_Database.hm.StartCmd(cmdName); + app.Database.hm.StartCmd(cmdName); return true; } @@ -94,13 +94,13 @@ class CommandMachine CommandEnd(abort: boolean = false) { CommandState.CommandIng = false; - let hasRecord = app.m_Database.hm.EndCmd(); + let hasRecord = app.Database.hm.EndCmd(); if (abort && hasRecord) - app.m_Database.hm.Undo(); + app.Database.hm.Undo(); CommandState.CommandIng = false; - app.m_Viewer._GripScene.UpdateAll(); + app.Viewer.GripScene.UpdateAll(); JigUtils.End(); - app.m_Editor.UpdateScreen(); + app.Editor.UpdateScreen(); } get CommandNameList(): Set diff --git a/src/Editor/ContextMenu.ts b/src/Editor/ContextMenu.ts index f4c35b57a..b3531b532 100644 --- a/src/Editor/ContextMenu.ts +++ b/src/Editor/ContextMenu.ts @@ -56,8 +56,8 @@ export class ContextMenuServices implements EditorService { if (e.button === MouseKey.Right) { - if ((this.editor.m_KeyCtrl.KeyIsDown(KeyCode.ControlLeft) - || this.editor.m_KeyCtrl.KeyIsDown(KeyCode.ShiftLeft)) + if ((this.editor.KeyCtrl.KeyIsDown(KeyCode.ControlLeft) + || this.editor.KeyCtrl.KeyIsDown(KeyCode.ShiftLeft)) || CommandState.CommandIng ) return; @@ -91,9 +91,9 @@ export class ContextMenuServices implements EditorService GeneralKeywords() { - let selects = this.editor.m_SelectCtrl.SelectSet.SelectEntityList; + let selects = this.editor.SelectCtrl.SelectSet.SelectEntityList; - let historyCmdList = this.editor.m_CommandStore.historyCmdList.slice(-10); + let historyCmdList = this.editor.CommandStore.historyCmdList.slice(-10); let lastCmd = historyCmdList[0] || "HELP"; KeyWordCommandMap.set("R", lastCmd); diff --git a/src/Editor/DbClick/DBClickPolyline.ts b/src/Editor/DbClick/DBClickPolyline.ts index 2ee1e0b6b..99a136293 100644 --- a/src/Editor/DbClick/DBClickPolyline.ts +++ b/src/Editor/DbClick/DBClickPolyline.ts @@ -38,14 +38,14 @@ export class DBClickPolyline extends Singleton while (true) { - app.m_Database.hm.StartMark(); + app.Database.hm.StartMark(); let pl = this.entity as Polyline; defaultKW[0].key = pl.CloseMark ? "O" : "C"; defaultKW[0].msg = pl.CloseMark ? "打开" : "闭合"; - let res = await app.m_Editor.GetKeyWords({ + let res = await app.Editor.GetKeyWords({ Msg: "请输入选项", KeyWordList: defaultKW }) @@ -83,10 +83,10 @@ export class DBClickPolyline extends Singleton pl.Reverse(); break; case "U": //放弃 - app.m_Database.hm.Undo(); + app.Database.hm.Undo(); break; } - app.m_Editor.UpdateScreen(); + app.Editor.UpdateScreen(); if (execStatus === PromptStatus.Cancel) return; } @@ -116,11 +116,11 @@ export class DBClickPolyline extends Singleton while (true) { - app.m_Database.hm.StartMark(); + app.Database.hm.StartMark(); - app.m_Editor.UpdateScreen(); + app.Editor.UpdateScreen(); - let res = await app.m_Editor.GetKeyWords({ + let res = await app.Editor.GetKeyWords({ Msg: "输入顶点编辑选项", KeyWordList: editeVertexKW }) @@ -176,9 +176,9 @@ export class DBClickPolyline extends Singleton while (true) { - app.m_Database.hm.StartMark(); + app.Database.hm.StartMark(); - let res = await app.m_Editor.GetKeyWords({ + let res = await app.Editor.GetKeyWords({ Msg: "请输入选项", KeyWordList: execKW }) @@ -201,13 +201,13 @@ export class DBClickPolyline extends Singleton case "X": //退出 return PromptStatus.None; } - app.m_Editor.UpdateScreen(); + app.Editor.UpdateScreen(); } } private Join = async () => { let pl = this.entity as Polyline; - let exSsRes = await app.m_Editor.GetSelection({ + let exSsRes = await app.Editor.GetSelection({ Msg: "请选择对象<全部选择>:", Filter: { filterTypes: [Curve] } }); @@ -264,14 +264,14 @@ export class DBClickPolyline extends Singleton continue; } if (!this.entity) this.entity = cu; - app.m_Database.ModelSpace.Append(cu) + app.Database.ModelSpace.Append(cu) } } //改变顶点,移动或者插入 private ChangeVertex = async (vertex: IVertex, isMove: boolean) => { let pl = this.entity as Polyline; - let ptRes = await app.m_Editor.GetPoint({ + let ptRes = await app.Editor.GetPoint({ Msg: "为新顶点指定位置", BasePoint: vertex.point.Position, AllowDrawRubberBand: true @@ -347,7 +347,7 @@ export class DBClickPolyline extends Singleton } pl.Erase(); this.entity = new Polyline(data); - app.m_Database.ModelSpace.Append(this.entity); + app.Database.ModelSpace.Append(this.entity); } } private TransfromSpline() @@ -358,7 +358,7 @@ export class DBClickPolyline extends Singleton pl.Erase(); let pts = pl.GetStretchPoints(); let spl = new Spline(pts); - app.m_Database.ModelSpace.Append(spl); + app.Database.ModelSpace.Append(spl); spl.CloseMark = pl.CloseMark; this.entity = spl; } diff --git a/src/Editor/DbClick/DbClick.ts b/src/Editor/DbClick/DbClick.ts index c5307a310..c4153730c 100644 --- a/src/Editor/DbClick/DbClick.ts +++ b/src/Editor/DbClick/DbClick.ts @@ -23,7 +23,7 @@ export class DbClickManager extends Singleton { OnDbClick = async () => { - let pickObj = PointPick(app.m_Editor.m_MouseCtrl.m_CurMousePointVCS, app.m_Viewer, { filterErase: true })[0]; + let pickObj = PointPick(app.Editor.MouseCtrl.m_CurMousePointVCS, app.Viewer, { filterErase: true })[0]; let pickEnt = GetEntity(pickObj); if (!pickEnt) return; @@ -38,7 +38,7 @@ export class DbClickManager extends Singleton } //双击实体取消选中状态 - app.m_Editor.m_SelectCtrl.Cancel(); + app.Editor.SelectCtrl.Cancel(); if (pickEnt instanceof Light) { @@ -99,8 +99,8 @@ export class DbClickManager extends Singleton } else if (pickEnt instanceof Board) { - app.m_Editor.m_ModalManage.Clear(); - app.m_Editor.m_ModalManage.RenderModeless( + app.Editor.ModalManage.Clear(); + app.Editor.ModalManage.RenderModeless( BoardOptionModal, ModalPosition.Right, { board: pickEnt } @@ -116,7 +116,7 @@ export class DbClickManager extends Singleton { enStore.AddEnToMap(pickEnt); enStore.isWorking = true; - app.m_Editor.m_ModalManage.RenderModeless( + app.Editor.ModalManage.RenderModeless( EntityModal, ModalPosition.Mouse, { store: enStore } diff --git a/src/Editor/Editor.ts b/src/Editor/Editor.ts index b974f4550..33492f3f1 100644 --- a/src/Editor/Editor.ts +++ b/src/Editor/Editor.ts @@ -1,4 +1,3 @@ -import * as THREE from 'three'; import { Math, Matrix4, Vector3 } from 'three'; import * as xaop from 'xaop'; import { ApplicationService } from '../ApplicationServices/Application'; @@ -30,66 +29,66 @@ import { UCSServices } from './UCSServices'; //TODO: 增加鼠标状态. 鼠标位置. export class Editor { - m_MouseCtrl: MouseControls - m_KeyCtrl: KeyBoardControls - m_SelectCtrl: SelectControls - m_App: ApplicationService; - m_InputState: InputState = InputState.None; - m_CommandStore: CommandStore; + MouseCtrl: MouseControls + KeyCtrl: KeyBoardControls + SelectCtrl: SelectControls + App: ApplicationService; + InputState: InputState = InputState.None; + CommandStore: CommandStore; GetPointServices: GetPointServices; - m_GetDistanceServices: GetDistanceServices; - getRectPointServices: GetRectPointServices; - m_GetEntitytServices: GetEntityServices; - m_SnapDragServices: GripDragServices; + GetDistanceServices: GetDistanceServices; + GetRectPointServices: GetRectPointServices; + GetEntitytServices: GetEntityServices; + SnapDragServices: GripDragServices; transCtrl: TransformServicess; - ucsServices: UCSServices; - m_MaskManage: MaskManage; - m_ModalManage: ModalManage; - m_CommandInput: CommandInputManage; - m_SsgetServices: SsgetServiecs; + UcsServices: UCSServices; + MaskManage: MaskManage; + ModalManage: ModalManage; + CommandInput: CommandInputManage; + SsgetServices: SsgetServiecs; - m_KeywordsServices: GetKeyWordsServices; + KeywordsServices: GetKeyWordsServices; ContextMenuServices: ContextMenuServices; InteractiveServices: EditorService[] = []; //用户坐标系 constructor(app: ApplicationService) { - this.m_App = app; - this.m_MouseCtrl = new MouseControls(app.m_Viewer, this) - this.m_KeyCtrl = new KeyBoardControls(); - this.m_SelectCtrl = new SelectControls(app.m_Viewer, this) - this.m_CommandStore = new CommandStore(this); + this.App = app; + this.MouseCtrl = new MouseControls(app.Viewer, this) + this.KeyCtrl = new KeyBoardControls(); + this.SelectCtrl = new SelectControls(app.Viewer, this) + this.CommandStore = new CommandStore(this); this.GetPointServices = new GetPointServices(); - this.m_GetDistanceServices = new GetDistanceServices(); - this.getRectPointServices = new GetRectPointServices(); + this.GetDistanceServices = new GetDistanceServices(); + this.GetRectPointServices = new GetRectPointServices(); - this.m_SnapDragServices = new GripDragServices(this); + this.SnapDragServices = new GripDragServices(this); - this.m_GetEntitytServices = new GetEntityServices(this); - this.m_SsgetServices = new SsgetServiecs(this); + this.GetEntitytServices = new GetEntityServices(this); + this.SsgetServices = new SsgetServiecs(this); - this.m_KeywordsServices = new GetKeyWordsServices(this); + this.KeywordsServices = new GetKeyWordsServices(this); this.ContextMenuServices = new ContextMenuServices(this); - xaop.end(this.m_MouseCtrl, this.m_MouseCtrl.onMouseMove, () => + xaop.end(this.MouseCtrl, this.MouseCtrl.onMouseMove, () => { - app.m_Viewer.m_PreViewer.Cursor.Position - = app.m_Viewer.m_PreViewer.ScreenPointToViewerPoint(this.m_MouseCtrl.m_CurMousePointVCS.clone()); + app.Viewer.PreViewer.Cursor.Position + = app.Viewer.PreViewer.ScreenPointToViewerPoint(this.MouseCtrl.m_CurMousePointVCS.clone()); }) - this.ucsServices = new UCSServices(this); + this.UcsServices = new UCSServices(this); this.transCtrl = new TransformServicess(this); - this.m_MaskManage = new MaskManage(); - this.m_ModalManage = new ModalManage(this); - this.m_CommandInput = new CommandInputManage(); + this.MaskManage = new MaskManage(); + this.ModalManage = new ModalManage(this); + this.CommandInput = new CommandInputManage(); this.InteractiveServices = [ - this.m_SnapDragServices, - this.m_GetEntitytServices, + this.SnapDragServices, + this.GetEntitytServices, this.GetPointServices, this.transCtrl, - this.m_SelectCtrl, - this.m_KeywordsServices, + this.SelectCtrl, + this.KeywordsServices, this.ContextMenuServices ]; } @@ -99,11 +98,11 @@ export class Editor */ Prompt(msg: string) { - this.m_CommandStore.Prompt(msg); + this.CommandStore.Prompt(msg); } get UCSMatrix(): Matrix4 { - return this.ucsServices.UCSMatrix; + return this.UcsServices.UCSMatrix; } get UCSMatrixInv(): Matrix4 { @@ -111,7 +110,7 @@ export class Editor } set UCSMatrix(m: Matrix4) { - this.ucsServices.UCSMatrix = m; + this.UcsServices.UCSMatrix = m; } InputEvent(inputData: string) { } @@ -128,12 +127,12 @@ export class Editor } GetDistance(prompt?: GetDistendPrompt): Promise { - return this.m_GetDistanceServices.Start(prompt); + return this.GetDistanceServices.Start(prompt); } GetRectPoint(prompt?: PromptRectPointOptions): Promise { - return this.getRectPointServices.Start(prompt); + return this.GetRectPointServices.Start(prompt); } GetAngle(prompt?: GetDistendPrompt): Promise @@ -150,19 +149,19 @@ export class Editor return Math.radToDeg(angle(v)); } } - return this.m_GetDistanceServices.Start(prompt); + return this.GetDistanceServices.Start(prompt); } GetKeyWords(prompt: GetKeyWordPrommpt): Promise { - return this.m_KeywordsServices.Start(prompt); + return this.KeywordsServices.Start(prompt); } GetEntity(prompt?: GetEntityPrompt): Promise { - return this.m_GetEntitytServices.Start(prompt); + return this.GetEntitytServices.Start(prompt); } GetSelection(prompt?: GetSelectionPrompt): Promise { - return this.m_SsgetServices.Start(prompt); + return this.SsgetServices.Start(prompt); } PointToScreen(pt: THREE.Vector3): THREE.Vector2 { @@ -181,7 +180,7 @@ export class Editor } UpdateScreen() { - this.m_App.m_Viewer.m_bNeedUpdate = true; + this.App.Viewer.UpdateRender(); } } diff --git a/src/Editor/Gesture.ts b/src/Editor/Gesture.ts index 5bf532091..11f8af3f5 100644 --- a/src/Editor/Gesture.ts +++ b/src/Editor/Gesture.ts @@ -27,7 +27,7 @@ export class Gesture private RegisterEvent() { - let mouseCtrl = this.editor.m_MouseCtrl; + let mouseCtrl = this.editor.MouseCtrl; end(mouseCtrl, mouseCtrl.onMouseDown, this.onMouseDown); end(mouseCtrl, mouseCtrl.onMouseMove, this.onMouseMove); end(mouseCtrl, mouseCtrl.onMouseUp, this.onMouseUp); diff --git a/src/Editor/GetDistanceServices.ts b/src/Editor/GetDistanceServices.ts index 83618a544..bf49ab04f 100644 --- a/src/Editor/GetDistanceServices.ts +++ b/src/Editor/GetDistanceServices.ts @@ -18,7 +18,7 @@ export class GetDistanceServices prompt = prompt || {}; let dynInput = this.initDynInput(prompt); this.removeCalls.push(InitKeyWord(prompt)); - app.m_Editor.m_InputState |= InputState.GetDist; + app.Editor.InputState |= InputState.GetDist; this.initHandleInput(prompt); return new Promise(async (resolve, reject) => { @@ -28,7 +28,7 @@ export class GetDistanceServices //如果没有基点,则指定用户选择基点. if (!p1) { - let ptRes = await app.m_Editor.GetPoint( + let ptRes = await app.Editor.GetPoint( { Msg: prompt.Msg || "请输入距离或者点取距离:", KeyWordList: prompt.KeyWordList, @@ -36,7 +36,7 @@ export class GetDistanceServices NotShowDynPrompt: true, Callback: (p) => { - dynInput.SetPostion(app.m_Editor.m_MouseCtrl.m_CurMousePointVCS); + dynInput.SetPostion(app.Editor.MouseCtrl.m_CurMousePointVCS); } }); if (ptRes.Status == PromptStatus.OK) @@ -54,7 +54,7 @@ export class GetDistanceServices return; } } - let ptRes = await app.m_Editor.GetPoint({ + let ptRes = await app.Editor.GetPoint({ Msg: "请输入距离或者点取距离:", KeyWordList: prompt.KeyWordList, BasePoint: p1, @@ -63,9 +63,9 @@ export class GetDistanceServices Callback: (p) => { let midp = midPoint(p1, p); - app.m_Viewer.WorldToScreen(midp); + app.Viewer.WorldToScreen(midp); - dynInput.SetPostion(app.m_Editor.m_MouseCtrl.m_CurMousePointVCS); + dynInput.SetPostion(app.Editor.MouseCtrl.m_CurMousePointVCS); dynInput.ValuePostion = midp; if (prompt.CalcDistance) @@ -134,7 +134,7 @@ export class GetDistanceServices private initHandleInput(prompt: PromptOptions) { - this.removeCalls.push(xaop.begin(app.m_Editor, app.m_Editor.InputEvent, (inputData: string) => + this.removeCalls.push(xaop.begin(app.Editor, app.Editor.InputEvent, (inputData: string) => { inputData = inputData.toUpperCase(); if (IsKeyword(inputData, prompt)) @@ -153,7 +153,7 @@ export class GetDistanceServices //还原状态 private RestState() { - app.m_Editor.m_InputState &= ~InputState.GetDist; + app.Editor.InputState &= ~InputState.GetDist; this.removeCalls.forEach(f => f()); this.removeCalls.length = 0; } @@ -189,7 +189,7 @@ export class GetDistanceServices let promisResFunc = this.promisResolve; this.promisResolve = undefined; //先将回调函数设置为空,避免对GetPoint取消时重复触发本函数 - app.m_Editor.GetPointServices.Cancel();//取消掉点选服务. + app.Editor.GetPointServices.Cancel();//取消掉点选服务. promisResFunc(res); } } diff --git a/src/Editor/GetEntityServices.ts b/src/Editor/GetEntityServices.ts index 253cb1949..0ee3b5de9 100644 --- a/src/Editor/GetEntityServices.ts +++ b/src/Editor/GetEntityServices.ts @@ -27,7 +27,7 @@ export class GetEntityServices implements EditorService constructor(ed: Editor) { this._Editor = ed; - this.m_Viewer = ed.m_App.m_Viewer; + this.m_Viewer = ed.App.Viewer; } IsReady: boolean = false; @@ -41,15 +41,15 @@ export class GetEntityServices implements EditorService prompt = prompt || {}; this.prompt = prompt; - this._Editor.m_InputState |= InputState.Entsel; + this._Editor.InputState |= InputState.Entsel; if (!prompt.IsSelect) - this._Editor.m_SelectCtrl.Cancel(); + this._Editor.SelectCtrl.Cancel(); //光标变换 - this.m_Viewer.m_PreViewer.Cursor.Mode = CursorMode.GetEntity; + this.m_Viewer.PreViewer.Cursor.Mode = CursorMode.GetEntity; - let mouseCtrl = this._Editor.m_MouseCtrl; + let mouseCtrl = this._Editor.MouseCtrl; //鼠标移动 if (prompt.Callback) { @@ -86,7 +86,7 @@ export class GetEntityServices implements EditorService { key: "CANCEL", msg: `取消` }, ...kwList, ]; - let res = await app.m_Editor.GetKeyWords({ + let res = await app.Editor.GetKeyWords({ Msg: "", KeyWordList: ks, Modal: true, @@ -130,7 +130,7 @@ export class GetEntityServices implements EditorService initHandleKeyDown() { this.removeCalls.push( - end(this._Editor.m_KeyCtrl, this._Editor.m_KeyCtrl.OnKeyDown, (e: KeyboardEvent) => + end(this._Editor.KeyCtrl, this._Editor.KeyCtrl.OnKeyDown, (e: KeyboardEvent) => { switch (e.keyCode as KeyBoard) { @@ -186,12 +186,12 @@ export class GetEntityServices implements EditorService private PickEntity(): PromptEntityResult { - let pickObj = PointPick(this._Editor.m_MouseCtrl.m_CurMousePointVCS, this.m_Viewer, this.prompt.Filter)[0]; + let pickObj = PointPick(this._Editor.MouseCtrl.m_CurMousePointVCS, this.m_Viewer, this.prompt.Filter)[0]; let ret = new PromptEntityResult(); if (pickObj && IsEntity(pickObj)) ret.Entity = GetEntity(pickObj); ret.Object = pickObj; - ret.Point = this._Editor.m_MouseCtrl.m_CurMousePointWCS.clone(); + ret.Point = this._Editor.MouseCtrl.m_CurMousePointWCS.clone(); ret.Status = ret.Entity ? PromptStatus.OK : PromptStatus.None; return ret; } @@ -202,8 +202,8 @@ export class GetEntityServices implements EditorService this.IsReady = false; this.prompt = undefined; - this._Editor.m_InputState &= ~InputState.Entsel; - this.m_Viewer.m_PreViewer.Cursor.Mode = CursorMode.None; + this._Editor.InputState &= ~InputState.Entsel; + this.m_Viewer.PreViewer.Cursor.Mode = CursorMode.None; this.removeCalls.forEach(f => f()); this.removeCalls.length = 0; } diff --git a/src/Editor/GetKeyWordService.tsx b/src/Editor/GetKeyWordService.tsx index 9df0fb5a8..63ac89d83 100644 --- a/src/Editor/GetKeyWordService.tsx +++ b/src/Editor/GetKeyWordService.tsx @@ -72,11 +72,11 @@ export class GetKeyWordsServices implements EditorService { let menuHeight = this.keywordList.length * MENU_ITEM_HEIGHT + MENU_PADDING; - if (this.ed.m_MouseCtrl.m_CurMousePointClient.y > window.innerHeight - menuHeight) - this.mousePositionY = this.ed.m_MouseCtrl.m_CurMousePointClient.y - menuHeight; + if (this.ed.MouseCtrl.m_CurMousePointClient.y > window.innerHeight - menuHeight) + this.mousePositionY = this.ed.MouseCtrl.m_CurMousePointClient.y - menuHeight; else - this.mousePositionY = this.ed.m_MouseCtrl.m_CurMousePointClient.y; - this.mousePositionX = this.ed.m_MouseCtrl.m_CurMousePointClient.x; + this.mousePositionY = this.ed.MouseCtrl.m_CurMousePointClient.y; + this.mousePositionX = this.ed.MouseCtrl.m_CurMousePointClient.x; } Start(prompt: GetKeyWordPrommpt): Promise @@ -96,7 +96,7 @@ export class GetKeyWordsServices implements EditorService this.keywordList = prompt.KeyWordList; this.UpdateContextMenuPosition(); this.selectIndex = 0; - this.ed.m_InputState |= InputState.GetKeyWord; + this.ed.InputState |= InputState.GetKeyWord; this.IsReady = true; this.prompt = prompt.Msg; this.InitHandleInput(prompt); @@ -112,8 +112,8 @@ export class GetKeyWordsServices implements EditorService const cancel = () => this.Cancel(); this.container.addEventListener("blur", cancel); this.removeCalls.push(() => this.container.removeEventListener("blur", cancel)); - this.removeCalls.push(() => this.ed.m_MaskManage.Clear()); - this.ed.m_MaskManage.ShowMask(); + this.removeCalls.push(() => this.ed.MaskManage.Clear()); + this.ed.MaskManage.ShowMask(); } else this.removeCalls.push(InitKeyWord(prompt)); @@ -124,7 +124,7 @@ export class GetKeyWordsServices implements EditorService private InitHandleInput(prompt: GetKeyWordPrommpt) { this.removeCalls.push( - begin(app.m_Editor, app.m_Editor.InputEvent, + begin(app.Editor, app.Editor.InputEvent, (inputData: string) => { if (inputData === "") @@ -150,7 +150,7 @@ export class GetKeyWordsServices implements EditorService //处理用户敲键盘 InitHandleKeyDown() { - let keyCtrl = this.ed.m_KeyCtrl; + let keyCtrl = this.ed.KeyCtrl; this.removeCalls.push( end(keyCtrl, keyCtrl.OnKeyDown, (e: KeyboardEvent) => { @@ -235,7 +235,7 @@ export class GetKeyWordsServices implements EditorService if (!this.m_PromisResolve) return; this.IsReady = false; - this.ed.m_InputState &= ~InputState.GetKeyWord; + this.ed.InputState &= ~InputState.GetKeyWord; this.removeCalls.forEach(f => f()); this.removeCalls.length = 0; this.m_PromisResolve(result); diff --git a/src/Editor/GetPointServices.ts b/src/Editor/GetPointServices.ts index 4a2f099ad..cf2a59ffb 100644 --- a/src/Editor/GetPointServices.ts +++ b/src/Editor/GetPointServices.ts @@ -38,7 +38,7 @@ export class GetPointServices implements EditorService { if (this._prompt.KeyWordList === undefined) DynamicInputManage.GetManage().HandleInputEvent(""); - else if (!app.m_Editor.m_KeyCtrl.KeyIsDown(KeyCode.ControlLeft)) + else if (!app.Editor.KeyCtrl.KeyIsDown(KeyCode.ControlLeft)) this.handleRightClick(this._prompt.KeyWordList); return true; } @@ -61,7 +61,7 @@ export class GetPointServices implements EditorService //初始化捕捉状态 this.snapServices.Start(prompt); this.removeCalls.push( - end(app.m_Viewer.m_CameraCtrl, app.m_Viewer.m_CameraCtrl.Zoom, () => + end(app.Viewer.CameraCtrl, app.Viewer.CameraCtrl.Zoom, () => { this.snapServices.GetSnapPoint(); }) @@ -103,7 +103,7 @@ export class GetPointServices implements EditorService { key: "V", msg: `捕捉替代`, children: SnapMenuKW } ]; - let res = await app.m_Editor.GetKeyWords({ + let res = await app.Editor.GetKeyWords({ Msg: "", KeyWordList: ks, Modal: true, @@ -122,9 +122,9 @@ export class GetPointServices implements EditorService else { if (res.StringResult === "O") - app.m_Editor.m_ModalManage.RenderModal(SnapModal, ModalPosition.Center, {}); + app.Editor.ModalManage.RenderModal(SnapModal, ModalPosition.Center, {}); else - app.m_Editor.GetPointServices.snapServices.SnapModeEnable = SNAPMODE[res.StringResult]; + app.Editor.GetPointServices.snapServices.SnapModeEnable = SNAPMODE[res.StringResult]; } break; } @@ -143,7 +143,7 @@ export class GetPointServices implements EditorService //更新当前点事件,统一使用该方法注入其他服务的更新(aop在此方法中注入) UpdateCurPointEvent() { - let wcs = app.m_Editor.m_MouseCtrl.m_CurMousePointWCS; + let wcs = app.Editor.MouseCtrl.m_CurMousePointWCS; let snapP = this.snapServices.GetSnapPoint(); if (snapP) { @@ -161,8 +161,8 @@ export class GetPointServices implements EditorService private initUpdateCurPoint() { this.removeCalls.push( - xaop.end(app.m_Editor.m_MouseCtrl, - app.m_Editor.m_MouseCtrl.onMouseMove, + xaop.end(app.Editor.MouseCtrl, + app.Editor.MouseCtrl.onMouseMove, () => this.UpdateCurPointEvent() ) ) @@ -171,7 +171,7 @@ export class GetPointServices implements EditorService private initHandleKeyDown() { - this.removeCalls.push(xaop.end(app.m_Editor.m_KeyCtrl, app.m_Editor.m_KeyCtrl.OnKeyDown, (e: KeyboardEvent) => + this.removeCalls.push(xaop.end(app.Editor.KeyCtrl, app.Editor.KeyCtrl.OnKeyDown, (e: KeyboardEvent) => { if (e.keyCode == KeyBoard.Escape) @@ -196,11 +196,11 @@ export class GetPointServices implements EditorService try { prompt.Callback(this.curPoint); - app.m_Editor.UpdateScreen(); + app.Editor.UpdateScreen(); } catch (error) { - app.m_Editor.Prompt("动态拾取点回调错误!"); + app.Editor.Prompt("动态拾取点回调错误!"); console.log(error); } })); @@ -211,7 +211,7 @@ export class GetPointServices implements EditorService { if (prompt.BasePoint && prompt.AllowDrawRubberBand) { - let preView = app.m_Viewer.m_PreViewer; + let preView = app.Viewer.PreViewer; let line = new Line(BufferGeometryUtils.CreateFromPts([new Vector3(), new Vector3()]), ColorMaterial.RubberBandMaterial); let geo = line.geometry as BufferGeometry; preView.Scene.add(line); @@ -235,14 +235,14 @@ export class GetPointServices implements EditorService DisposeThreeObj(line); }, xaop.end(this, this.UpdateCurPointEvent, UpdatePreLine), - xaop.end(app.m_Viewer.m_CameraCtrl, app.m_Viewer.m_CameraCtrl.Zoom, UpdatePreLine) + xaop.end(app.Viewer.CameraCtrl, app.Viewer.CameraCtrl.Zoom, UpdatePreLine) ); } } private initHandleInput(prompt: GetPointPrompt) { - this.removeCalls.push(xaop.begin(app.m_Editor, app.m_Editor.InputEvent, (inputData: string) => + this.removeCalls.push(xaop.begin(app.Editor, app.Editor.InputEvent, (inputData: string) => { inputData = inputData.toUpperCase(); @@ -303,11 +303,11 @@ export class GetPointServices implements EditorService prompt.Msg = prompt.Msg || "请输入一个点:"; if (prompt.Msg) { - app.m_Editor.m_CommandStore.commandPrompt = prompt.Msg; + app.Editor.CommandStore.commandPrompt = prompt.Msg; // app.m_Editor.Prompt(prompt.Msg); this.removeCalls.push(() => { - app.m_Editor.m_CommandStore.commandPrompt = ""; + app.Editor.CommandStore.commandPrompt = ""; }); } } @@ -356,7 +356,7 @@ export class GetPointServices implements EditorService } } - dynPrompt.SetPostion(app.m_Editor.m_MouseCtrl.m_CurMousePointVCS); + dynPrompt.SetPostion(app.Editor.MouseCtrl.m_CurMousePointVCS); dynPrompt.Value = this.curPoint; })); //处理动态输入 @@ -368,7 +368,7 @@ export class GetPointServices implements EditorService if (prompt.AllowNone) this.ReturnNone(); else - app.m_Editor.Prompt("需要点击一个点或者输入一个点!"); + app.Editor.Prompt("需要点击一个点或者输入一个点!"); return; } if (typeof inputData === "string") @@ -419,12 +419,12 @@ export class GetPointServices implements EditorService let retValue = new PromptPointResult(); //如果UCS和视图平行,则不捕捉Z轴 - if (isParallelTo(app.m_Viewer.m_CameraCtrl.Direction, - new Vector3().setFromMatrixColumn(app.m_Editor.UCSMatrix, 2))) + if (isParallelTo(app.Viewer.CameraCtrl.Direction, + new Vector3().setFromMatrixColumn(app.Editor.UCSMatrix, 2))) { - p.applyMatrix4(app.m_Editor.UCSMatrixInv) + p.applyMatrix4(app.Editor.UCSMatrixInv) .setZ(0) - .applyMatrix4(app.m_Editor.UCSMatrix); + .applyMatrix4(app.Editor.UCSMatrix); } retValue.Status = PromptStatus.OK; @@ -456,8 +456,8 @@ export class GetPointServices implements EditorService //初始化设置 程序的状态 private initState() { - app.m_Editor.m_InputState |= InputState.GetPoint; - app.m_Viewer.m_PreViewer.Cursor.Mode = CursorMode.GetPoint; + app.Editor.InputState |= InputState.GetPoint; + app.Viewer.PreViewer.Cursor.Mode = CursorMode.GetPoint; } //还原状态 private RestState() @@ -466,13 +466,13 @@ export class GetPointServices implements EditorService this.IsReady = false; - app.m_Editor.m_InputState &= ~InputState.GetPoint; - app.m_Viewer.m_PreViewer.Cursor.Mode = CursorMode.None; + app.Editor.InputState &= ~InputState.GetPoint; + app.Viewer.PreViewer.Cursor.Mode = CursorMode.None; this.snapServices.SnapModeEnable = this.snapModeCurrent; this.removeCalls.forEach(f => f()); this.removeCalls.length = 0; - app.m_Editor.UpdateScreen(); + app.Editor.UpdateScreen(); } } diff --git a/src/Editor/GetRectServices.ts b/src/Editor/GetRectServices.ts index 71dca54ce..f941d116e 100644 --- a/src/Editor/GetRectServices.ts +++ b/src/Editor/GetRectServices.ts @@ -34,7 +34,7 @@ export class GetRectPointServices if (!basePoint) { - let ptRes = await app.m_Editor.GetPoint({ + let ptRes = await app.Editor.GetPoint({ Msg: prompt.Msg || "请输入或者点取第一个角点:", KeyWordList: prompt.KeyWordList }); @@ -56,7 +56,7 @@ export class GetRectPointServices this.dynPrompt = new GetRectPointPromptBlock(); - let ucsInv = app.m_Editor.UCSMatrixInv; + let ucsInv = app.Editor.UCSMatrixInv; let basePointUCS = basePoint.clone().applyMatrix4(ucsInv); basePointUCS.z = 0; @@ -65,7 +65,7 @@ export class GetRectPointServices let p2UCS: Vector3; this.destroyCalls.push( - end(app.m_Viewer.m_CameraCtrl, app.m_Viewer.m_CameraCtrl.Update, () => + end(app.Viewer.CameraCtrl, app.Viewer.CameraCtrl.Update, () => { if (p2UCS) this.UpdateDynPrompt(basePointUCS, p2UCS); @@ -78,7 +78,7 @@ export class GetRectPointServices { if (!this.dynPrompt.xDynIpt.Lock && !this.dynPrompt.yDynIpt.Lock) { - app.m_Editor.Prompt("需要点击一个点或者输入一个点!"); + app.Editor.Prompt("需要点击一个点或者输入一个点!"); return; } @@ -90,20 +90,20 @@ export class GetRectPointServices res.Point1UCS.y + signY * this.dynPrompt.Height ); res.Point1WCS = basePoint; - res.Point2WCS = res.Point2UCS.clone().applyMatrix4(app.m_Editor.UCSMatrix); + res.Point2WCS = res.Point2UCS.clone().applyMatrix4(app.Editor.UCSMatrix); this.ReturnResult(res); })); //#endregion - let ptRes = await app.m_Editor.GetPoint( + let ptRes = await app.Editor.GetPoint( { KeyWordList: prompt.KeyWordList, NotShowDynPrompt: true, Callback: (p2) => { //更新提示框位置 - let pScreen = app.m_Viewer.WorldToScreen(p2.clone()); + let pScreen = app.Viewer.WorldToScreen(p2.clone()); this.dynPrompt.SetPostion(pScreen); p2UCS = p2.clone().applyMatrix4(ucsInv); @@ -136,7 +136,7 @@ export class GetRectPointServices res.Point2UCS.z = 0; res.Point1WCS = basePoint; - res.Point2WCS = res.Point2UCS.clone().applyMatrix4(app.m_Editor.UCSMatrix); + res.Point2WCS = res.Point2UCS.clone().applyMatrix4(app.Editor.UCSMatrix); this.ReturnResult(res); } @@ -171,14 +171,14 @@ export class GetRectPointServices ]; for (let p of pts) { - p.applyMatrix4(app.m_Editor.UCSMatrix); - app.m_Viewer.m_PreViewer.WorldToViewPoint(p); + p.applyMatrix4(app.Editor.UCSMatrix); + app.Viewer.PreViewer.WorldToViewPoint(p); } BufferGeometryUtils.UpdatePts(this.rubberBandLine.geometry as BufferGeometry, pts); this.rubberBandLine.geometry.computeBoundingSphere(); this.dynPrompt.UpdatePosition( - app.m_Viewer.m_PreViewer.ViewerPointToScreenPoint(midPoint(pts[0], pts[1])), - app.m_Viewer.m_PreViewer.ViewerPointToScreenPoint(midPoint(pts[0], pts[3])) + app.Viewer.PreViewer.ViewerPointToScreenPoint(midPoint(pts[0], pts[1])), + app.Viewer.PreViewer.ViewerPointToScreenPoint(midPoint(pts[0], pts[3])) ); } @@ -190,7 +190,7 @@ export class GetRectPointServices BufferGeometryUtils.CreateFromPts(PointShapeUtils.SquarePts(0)), ColorMaterial.GetLineMaterial(7) ); - app.m_Viewer.m_PreViewer.Scene.add(this.rubberBandLine); + app.Viewer.PreViewer.Scene.add(this.rubberBandLine); } else { @@ -202,12 +202,12 @@ export class GetRectPointServices private InitState() { - app.m_Editor.m_InputState |= InputState.GetRect; + app.Editor.InputState |= InputState.GetRect; this.DrawRubberBand(); } private RestState() { - app.m_Editor.m_InputState &= ~InputState.GetRect; + app.Editor.InputState &= ~InputState.GetRect; this.rubberBandLine.visible = false; if (this.dynPrompt) @@ -231,7 +231,7 @@ export class GetRectPointServices let promisResFunc = this.promisResolve; this.promisResolve = undefined; //先将回调函数设置为空,避免对GetPoint取消时重复触发本函数 - app.m_Editor.GetPointServices.Cancel();//取消掉点选服务 + app.Editor.GetPointServices.Cancel();//取消掉点选服务 promisResFunc(result); } } diff --git a/src/Editor/GetSelectionServices.ts b/src/Editor/GetSelectionServices.ts index 35244f19e..4c4abd3fe 100644 --- a/src/Editor/GetSelectionServices.ts +++ b/src/Editor/GetSelectionServices.ts @@ -32,7 +32,7 @@ export class SsgetServiecs { this.promisResolve = res; - let selectCtrl = this.m_Editor.m_SelectCtrl; + let selectCtrl = this.m_Editor.SelectCtrl; let set = selectCtrl.SelectSet; if (prompt.Filter) { @@ -49,7 +49,7 @@ export class SsgetServiecs return; } - this.m_Editor.m_InputState &= InputState.Select; + this.m_Editor.InputState &= InputState.Select; while (true) { @@ -62,7 +62,7 @@ export class SsgetServiecs { if (prompt.Callback) { - let ssEnt = new SelectPick(this.m_Editor.m_App.m_Viewer, this.m_Editor.m_MouseCtrl.m_CurMousePointVCS); + let ssEnt = new SelectPick(this.m_Editor.App.Viewer, this.m_Editor.MouseCtrl.m_CurMousePointVCS); if (res.Entity) ssEnt.m_SelectList.push(res.Entity.DrawObject); let set = new SelectSet(); @@ -96,13 +96,13 @@ export class SsgetServiecs } case PromptStatus.OK: { - let ssEnt = new SelectPick(this.m_Editor.m_App.m_Viewer, this.m_Editor.m_MouseCtrl.m_CurMousePointVCS); + let ssEnt = new SelectPick(this.m_Editor.App.Viewer, this.m_Editor.MouseCtrl.m_CurMousePointVCS); ssEnt.m_SelectList.push(enRes.Object); - if (this.m_Editor.m_KeyCtrl.KeyIsDown(KeyCode.ShiftLeft)) - this.m_Editor.m_SelectCtrl.SelectSet.RemoveSelect(ssEnt); + if (this.m_Editor.KeyCtrl.KeyIsDown(KeyCode.ShiftLeft)) + this.m_Editor.SelectCtrl.SelectSet.RemoveSelect(ssEnt); else - this.m_Editor.m_SelectCtrl.SelectSet.AddSelect(ssEnt); + this.m_Editor.SelectCtrl.SelectSet.AddSelect(ssEnt); if (prompt.Once && (prompt.AllowNone || this.HasSelection(set))) { @@ -111,26 +111,26 @@ export class SsgetServiecs } else { - this.m_Editor.m_SelectCtrl.UpdateView(); + this.m_Editor.SelectCtrl.UpdateView(); break; } } case PromptStatus.None: { - this.m_Editor.m_SelectCtrl.m_Filter = prompt.Filter; - this.m_Editor.m_SelectCtrl.LeftClick(false); + this.m_Editor.SelectCtrl.m_Filter = prompt.Filter; + this.m_Editor.SelectCtrl.LeftClick(false); if (prompt.Callback) { this.m_AwaitRemoveCalls.push( - end(this.m_Editor.m_SelectCtrl, - this.m_Editor.m_SelectCtrl.onMouseMove, + end(this.m_Editor.SelectCtrl, + this.m_Editor.SelectCtrl.onMouseMove, () => { let set = new SelectSet(); - set.SelectSetList.push(...this.m_Editor.m_SelectCtrl.SelectSet.SelectSetList); + set.SelectSetList.push(...this.m_Editor.SelectCtrl.SelectSet.SelectSetList); - let select = this.m_Editor.m_SelectCtrl.SelectByCss(); + let select = this.m_Editor.SelectCtrl.SelectByCss(); set.AddSelect(select); prompt.Callback({ Status: PromptStatus.OK, SelectSet: set }); @@ -170,8 +170,8 @@ export class SsgetServiecs { let status = PromptStatus.OK; if (check) - status = this.m_Editor.m_SelectCtrl.SelectSet.SelectSetList.length !== 0 ? PromptStatus.OK : PromptStatus.None; - this.Return({ Status: status, SelectSet: this.m_Editor.m_SelectCtrl.SelectSet }); + status = this.m_Editor.SelectCtrl.SelectSet.SelectSetList.length !== 0 ? PromptStatus.OK : PromptStatus.None; + this.Return({ Status: status, SelectSet: this.m_Editor.SelectCtrl.SelectSet }); } //返回取消状态 @@ -184,10 +184,10 @@ export class SsgetServiecs { if (!this.promisResolve) return; this.promisResolve(res); - this.m_Editor.m_InputState &= ~InputState.Select; - this.m_Editor.m_SelectCtrl.Cancel(); - this.m_Editor.m_SelectCtrl.m_Filter = undefined; - this.m_Editor.m_SelectCtrl.SelectType = SelectType.None; + this.m_Editor.InputState &= ~InputState.Select; + this.m_Editor.SelectCtrl.Cancel(); + this.m_Editor.SelectCtrl.m_Filter = undefined; + this.m_Editor.SelectCtrl.SelectType = SelectType.None; } private m_AwaitRemoveCalls: Function[] = []; @@ -198,11 +198,11 @@ export class SsgetServiecs { this.m_AwaitRes = res; this.m_AwaitRemoveCalls.push( - end(this.m_Editor.m_SelectCtrl, this.m_Editor.m_SelectCtrl.EndSelectEvent, () => + end(this.m_Editor.SelectCtrl, this.m_Editor.SelectCtrl.EndSelectEvent, () => { this._AwaitSelctReturn(true); }), - end(this.m_Editor.m_SelectCtrl, this.m_Editor.m_SelectCtrl.CanenEvent, () => + end(this.m_Editor.SelectCtrl, this.m_Editor.SelectCtrl.CanenEvent, () => { this._AwaitSelctReturn(false); }), diff --git a/src/Editor/GripDragServices.ts b/src/Editor/GripDragServices.ts index e7f51bcaa..8aa4f3dc8 100644 --- a/src/Editor/GripDragServices.ts +++ b/src/Editor/GripDragServices.ts @@ -26,9 +26,9 @@ export class GripDragServices implements EditorService SnapSize = 15; constructor(private ed: Editor) { - this.mouseCtrl = ed.m_MouseCtrl; + this.mouseCtrl = ed.MouseCtrl; end(this.mouseCtrl, this.mouseCtrl.onMouseMove, () => this.GripSnap()); - end(ed.m_App.m_Viewer._GripScene, ed.m_App.m_Viewer._GripScene.Clear, () => + end(ed.App.Viewer.GripScene, ed.App.Viewer.GripScene.Clear, () => { this.lastSnapPoint = undefined; this.HideDrawLine(); @@ -37,32 +37,32 @@ export class GripDragServices implements EditorService get IsReady() { - return this.lastSnapPoint && this.ed.m_InputState === InputState.None; + return this.lastSnapPoint && this.ed.InputState === InputState.None; } async Doit(e: MouseEvent) { if (e.button !== MouseKey.Left) return; - if (app.m_Editor.m_InputState > InputState.None) + if (app.Editor.InputState > InputState.None) return; if (!this.lastSnapPoint) return; this.HideDrawLine(); - app.m_Editor.Prompt("拽拖开始:"); + app.Editor.Prompt("拽拖开始:"); commandMachine.CommandStart("drag"); - let oldEnable = app.m_Editor.transCtrl.Enable; - app.m_Editor.transCtrl.Enable = false; + let oldEnable = app.Editor.transCtrl.Enable; + app.Editor.transCtrl.Enable = false; - let oldSelect = app.m_Viewer.m_OutlinePass.selectedObjects; - app.m_Viewer.m_OutlinePass.selectedObjects = []; - app.m_Viewer.Render(); + let oldSelect = app.Viewer.OutlinePass.selectedObjects; + app.Viewer.OutlinePass.selectedObjects = []; + app.Viewer.Render(); let snapIndexMap: { ent: Entity, indexArr: number[] }[] = []; - for (let ptsObj of app.m_Viewer._GripScene.children) + for (let ptsObj of app.Viewer.GripScene.children) { if (ptsObj instanceof Points) { @@ -74,7 +74,7 @@ export class GripDragServices implements EditorService { let ptW = pts[i]; let ptV = ptW.clone(); - app.m_Viewer.WorldToScreen(ptV); + app.Viewer.WorldToScreen(ptV); if (SnapPoint(ptV, this.mouseCtrl.m_CurMousePointVCS, this.SnapSize)) arr.push(i); @@ -97,13 +97,13 @@ export class GripDragServices implements EditorService { let entDrawP = data.ent.GetGripPoints()[data.indexArr[0]]; - let viewDir = app.m_Viewer.m_CameraCtrl.Direction; + let viewDir = app.Viewer.CameraCtrl.Direction; let z = new Vector3(); - if (isParallelTo(viewDir, z.setFromMatrixColumn(app.m_Editor.UCSMatrix, 2))) + if (isParallelTo(viewDir, z.setFromMatrixColumn(app.Editor.UCSMatrix, 2))) { - entDrawP.applyMatrix4(app.m_Editor.UCSMatrixInv) + entDrawP.applyMatrix4(app.Editor.UCSMatrixInv) .setZ(0) - .applyMatrix4(app.m_Editor.UCSMatrix); + .applyMatrix4(app.Editor.UCSMatrix); } let vec = p.clone().sub(entDrawP); @@ -126,11 +126,11 @@ export class GripDragServices implements EditorService } //修改UCS - let oldUcs = app.m_Editor.UCSMatrix; + let oldUcs = app.Editor.UCSMatrix; if (snapIndexMap[0] && !(snapIndexMap[0].ent instanceof Line)) { let ocs = snapIndexMap[0].ent.OCS; - let viewDir = app.m_Viewer.m_CameraCtrl.Direction; + let viewDir = app.Viewer.CameraCtrl.Direction; let z = new Vector3(); //如果对象坐标系和视图坐标系垂直,则修正坐标系 if (isPerpendicularityTo(z.setFromMatrixColumn(ocs, 2), @@ -141,10 +141,10 @@ export class GripDragServices implements EditorService let p = new Vector3().setFromMatrixPosition(ocs); ocs.makeBasis(xv, yv, viewDir).setPosition(p); } - app.m_Editor.UCSMatrix = ocs; + app.Editor.UCSMatrix = ocs; } - let ptRes = await app.m_Editor.GetPoint({ + let ptRes = await app.Editor.GetPoint({ Msg: "指定下一个点:", BasePoint: baseP, AllowDrawRubberBand: true, @@ -153,9 +153,9 @@ export class GripDragServices implements EditorService if (ptRes.Status === PromptStatus.OK) DragTo(ptRes.Point, snapIndexMap); - app.m_Editor.UCSMatrix = oldUcs; - app.m_Viewer.m_OutlinePass.selectedObjects = oldSelect; - app.m_Editor.transCtrl.Enable = oldEnable; + app.Editor.UCSMatrix = oldUcs; + app.Viewer.OutlinePass.selectedObjects = oldSelect; + app.Editor.transCtrl.Enable = oldEnable; this.UpdateSnapPoint(); this.UpdateSnapDraw(); @@ -174,13 +174,13 @@ export class GripDragServices implements EditorService */ GripSnap() { - if (app.m_Editor.m_InputState !== InputState.None) + if (app.Editor.InputState !== InputState.None) return; //如果已经存在捕捉点,判断捕捉点是否就在附近 if (this.lastSnapPoint) { - let lastVcs = app.m_Viewer.WorldToScreen(this.lastSnapPoint.clone()); + let lastVcs = app.Viewer.WorldToScreen(this.lastSnapPoint.clone()); if (SnapPoint(this.mouseCtrl.m_CurMousePointVCS, lastVcs, this.SnapSize)) return; } @@ -195,7 +195,7 @@ export class GripDragServices implements EditorService private UpdateSnapPoint() { this.lastSnapPoint = undefined; - for (let ptsObj of app.m_Viewer._GripScene.children) + for (let ptsObj of app.Viewer.GripScene.children) { if (ptsObj instanceof Points) { @@ -204,7 +204,7 @@ export class GripDragServices implements EditorService for (let i = 0; i < pts.length; i++) { let ptW = pts[i]; - let ptV = app.m_Viewer.WorldToScreen(ptW.clone()); + let ptV = app.Viewer.WorldToScreen(ptW.clone()); if (SnapPoint(this.mouseCtrl.m_CurMousePointVCS, ptV, this.SnapSize)) { @@ -228,7 +228,7 @@ export class GripDragServices implements EditorService { if (this.lastSnapPoint) { - let preView = app.m_Viewer.m_PreViewer; + let preView = app.Viewer.PreViewer; if (!this.previewCrossLine) { this.previewCrossLine = preView.Draw( @@ -259,7 +259,7 @@ export class GripDragServices implements EditorService if (this.previewCrossLine && this.previewCrossLine.visible) { this.previewCrossLine.visible = false; - app.m_Viewer.m_PreViewer.UpdateScreen(); + app.Viewer.PreViewer.UpdateScreen(); } } } diff --git a/src/Editor/InitKeyword.ts b/src/Editor/InitKeyword.ts index 24b708f2d..d27c66ab7 100644 --- a/src/Editor/InitKeyword.ts +++ b/src/Editor/InitKeyword.ts @@ -3,20 +3,20 @@ import { PromptOptions } from "./PromptOptions"; function ClearKeyWord() { - app.m_Editor.m_CommandStore.keyWordList.length = 0; - app.m_Editor.m_CommandStore.commandPrompt = ""; + app.Editor.CommandStore.keyWordList.length = 0; + app.Editor.CommandStore.commandPrompt = ""; } export function InitKeyWord(prompt: PromptOptions) { if (prompt.Msg) { - app.m_Editor.m_CommandStore.commandPrompt = prompt.Msg; + app.Editor.CommandStore.commandPrompt = prompt.Msg; } if (prompt.KeyWordList) { - app.m_Editor.m_CommandStore.keyWordList.length = 0; - app.m_Editor.m_CommandStore.keyWordList.push(...prompt.KeyWordList); + app.Editor.CommandStore.keyWordList.length = 0; + app.Editor.CommandStore.keyWordList.push(...prompt.KeyWordList); } return ClearKeyWord; } diff --git a/src/Editor/Jig.ts b/src/Editor/Jig.ts index 52dc5d9d9..2893f9dd9 100644 --- a/src/Editor/Jig.ts +++ b/src/Editor/Jig.ts @@ -42,7 +42,7 @@ export class Jig enNew = enOrg; this.m_JigEnts.push(enNew); let obj = (fast && enNew.JigObject) || enNew.DrawObject; - app.m_Viewer.Scene.add(obj); + app.Viewer.Scene.add(obj); return enNew; } /** @@ -69,6 +69,6 @@ export class Jig ent.GoodBye(); } this.m_JigEnts.length = 0; - app.m_Editor.UpdateScreen(); + app.Editor.UpdateScreen(); } } diff --git a/src/Editor/MaterialEditor.ts b/src/Editor/MaterialEditor.ts index 45f7d99c7..086549ed7 100644 --- a/src/Editor/MaterialEditor.ts +++ b/src/Editor/MaterialEditor.ts @@ -46,15 +46,15 @@ export class MaterialEditor extends Singleton if (!this.Viewer) { this.Viewer = new Viewer(this.Canvas); - this.Viewer.m_PreViewer.Cursor.CursorObject.visible = false; - this.Viewer.m_CameraCtrl.CameraType = CameraType.PerspectiveCamera; - this.Viewer.m_bUsePass = false; + this.Viewer.PreViewer.Cursor.CursorObject.visible = false; + this.Viewer.CameraCtrl.CameraType = CameraType.PerspectiveCamera; + this.Viewer.UsePass = false; this.initScene(); new MaterialEditorCamerControl(this.Viewer); } else { - this.Canvas.appendChild(this.Viewer.m_Render.domElement); + this.Canvas.appendChild(this.Viewer.Renderer.domElement); } } @@ -80,7 +80,7 @@ export class MaterialEditor extends Singleton if (geo) { this.ShowMesh.geometry = geo; - this.Viewer.m_bNeedUpdate = true; + this.Viewer.UpdateRender(); } }); end(this, this.dispose, remove); @@ -127,6 +127,6 @@ export class MaterialEditor extends Singleton await texture.Update(); } mat.needsUpdate = true; - this.Viewer.m_bNeedUpdate = true; + this.Viewer.UpdateRender(); } } diff --git a/src/Editor/MaterialMouseControl.ts b/src/Editor/MaterialMouseControl.ts index e635c1ead..64e04b733 100644 --- a/src/Editor/MaterialMouseControl.ts +++ b/src/Editor/MaterialMouseControl.ts @@ -21,7 +21,7 @@ export class MaterialEditorCamerControl } initMouseControl() { - let el = this.m_Viewer.m_Render.domElement; + let el = this.m_Viewer.Renderer.domElement; el.addEventListener("mousedown", this.onMouseDown, false) el.addEventListener("mousemove", this.onMouseMove, false) el.addEventListener("mouseup", this.onMouseUp, false) diff --git a/src/Editor/MouseControls.ts b/src/Editor/MouseControls.ts index a37efb6a3..467c9a464 100644 --- a/src/Editor/MouseControls.ts +++ b/src/Editor/MouseControls.ts @@ -19,7 +19,7 @@ export class MouseControls } private RegisterEvent() { - let el = this.viewer.m_Render.domElement; + let el = this.viewer.Renderer.domElement; el.addEventListener("mousemove", (e) => { this.onMouseMove(e) }, false); el.addEventListener("mousedown", (e) => { this.onMouseDown(e) }, false); el.addEventListener("mouseup", (e) => this.onMouseUp(e), false); @@ -36,7 +36,7 @@ export class MouseControls //防止影响双击事件 if (e.detail > 1) return; - for (let s of app.m_Editor.InteractiveServices) + for (let s of app.Editor.InteractiveServices) { if (s.IsReady) { @@ -53,7 +53,7 @@ export class MouseControls } onDBClick(e: MouseEvent) { - if (app.m_Editor.m_InputState === InputState.None) + if (app.Editor.InputState === InputState.None) DbClickManager.GetInstance().OnDbClick() } updateWordPoint = (e: MouseEvent) => diff --git a/src/Editor/SelectControls.ts b/src/Editor/SelectControls.ts index 01e8dee88..7bb839d0d 100644 --- a/src/Editor/SelectControls.ts +++ b/src/Editor/SelectControls.ts @@ -21,7 +21,7 @@ export class SelectControls implements EditorService { get IsReady() { - return this.m_Editor.m_InputState <= InputState.Select; + return this.m_Editor.InputState <= InputState.Select; } async Doit(e: MouseEvent) { @@ -54,13 +54,13 @@ export class SelectControls implements EditorService RegisterEvent() { let ed = this.m_Editor; - end(ed.m_MouseCtrl, ed.m_MouseCtrl.updateWordPoint, () => { this.onMouseMove() }); - end(ed.m_KeyCtrl, ed.m_KeyCtrl.OnKeyDown, (e) => { this.onKeyDown(e) }); - end(app.m_Viewer.m_CameraCtrl, app.m_Viewer.m_CameraCtrl.Update, () => + end(ed.MouseCtrl, ed.MouseCtrl.updateWordPoint, () => { this.onMouseMove() }); + end(ed.KeyCtrl, ed.KeyCtrl.OnKeyDown, (e) => { this.onKeyDown(e) }); + end(app.Viewer.CameraCtrl, app.Viewer.CameraCtrl.Update, () => { if (this.m_FirstPickPoint) { - let vp = app.m_Viewer.WorldToScreen(this.m_FirstPickPoint.clone()); + let vp = app.Viewer.WorldToScreen(this.m_FirstPickPoint.clone()); this.m_SelectCss.SetStart(vp.x, vp.y); this.m_SelectCss.Update(); } @@ -68,12 +68,12 @@ export class SelectControls implements EditorService } UpdateView() { - this.m_Viewer.m_OutlinePass.selectedObjects = this.m_SelectSet.SelectObjectList; - this.m_Viewer.m_bNeedUpdate = true; + this.m_Viewer.OutlinePass.selectedObjects = this.m_SelectSet.SelectObjectList; + this.m_Viewer.UpdateRender(); - if (this.m_Viewer.m_OutlinePass.selectedObjects.length > 0) + if (this.m_Viewer.OutlinePass.selectedObjects.length > 0) { - let obj = this.m_Viewer.m_OutlinePass.selectedObjects[0]; + let obj = this.m_Viewer.OutlinePass.selectedObjects[0]; let ocs: Matrix4; let ent = GetEntity(obj); @@ -108,7 +108,7 @@ export class SelectControls implements EditorService } onMouseDown(e: MouseEvent) { - if ((this.m_Editor.m_InputState & InputState.SelectIng) && e.button === MouseKey.Right) + if ((this.m_Editor.InputState & InputState.SelectIng) && e.button === MouseKey.Right) { this.RestState(); return true; @@ -127,10 +127,10 @@ export class SelectControls implements EditorService */ LeftClick(checkPick = true) { - let pt = this.m_Editor.m_MouseCtrl.m_CurMousePointVCS; - let isRemove = app.m_Editor.m_KeyCtrl.KeyIsDown(KeyCode.ShiftLeft); + let pt = this.m_Editor.MouseCtrl.m_CurMousePointVCS; + let isRemove = app.Editor.KeyCtrl.KeyIsDown(KeyCode.ShiftLeft); //如果还没选择 那么 - if ((this.m_Editor.m_InputState & InputState.SelectIng) === InputState.None) + if ((this.m_Editor.InputState & InputState.SelectIng) === InputState.None) { if (checkPick) { @@ -148,10 +148,10 @@ export class SelectControls implements EditorService } } - this.m_FirstPickPoint = app.m_Editor.m_MouseCtrl.m_CurMousePointWCS.clone(); + this.m_FirstPickPoint = app.Editor.MouseCtrl.m_CurMousePointWCS.clone(); - this.m_Editor.m_InputState = InputState.SelectIng; - app.m_Viewer.m_PreViewer.Cursor.Mode = CursorMode.GetPoint; + this.m_Editor.InputState = InputState.SelectIng; + app.Viewer.PreViewer.Cursor.Mode = CursorMode.GetPoint; this.m_SelectCss.SetStart(pt.x, pt.y); this.m_SelectCss.SetEnd(pt.x, pt.y); this.m_SelectCss.Show(); @@ -186,9 +186,9 @@ export class SelectControls implements EditorService onMouseMove() { - if (this.m_Editor.m_InputState === InputState.SelectIng) + if (this.m_Editor.InputState === InputState.SelectIng) { - let pt = this.m_Editor.m_MouseCtrl.m_CurMousePointVCS; + let pt = this.m_Editor.MouseCtrl.m_CurMousePointVCS; this.m_SelectCss.SetEnd(pt.x, pt.y) } } @@ -204,8 +204,8 @@ export class SelectControls implements EditorService { this.m_FirstPickPoint = undefined; this.m_SelectCss.Hide(); - app.m_Viewer.m_PreViewer.Cursor.Mode = CursorMode.None; - this.m_Editor.m_InputState = InputState.None; + app.Viewer.PreViewer.Cursor.Mode = CursorMode.None; + this.m_Editor.InputState = InputState.None; } Cancel() { diff --git a/src/Editor/ShowSnapMenu.ts b/src/Editor/ShowSnapMenu.ts index 78ef036df..0453028c3 100644 --- a/src/Editor/ShowSnapMenu.ts +++ b/src/Editor/ShowSnapMenu.ts @@ -37,7 +37,7 @@ export const SnapMenuKW: KeyWord[] = [ export async function ShowSnapMenu() { - let res = await app.m_Editor.GetKeyWords({ + let res = await app.Editor.GetKeyWords({ Msg: "", KeyWordList: SnapMenuKW, Modal: true @@ -46,10 +46,10 @@ export async function ShowSnapMenu() if (res.Status === PromptStatus.Keyword) { if (res.StringResult === "O") - app.m_Editor.m_ModalManage.RenderModal(SnapModal, ModalPosition.Center, {}); + app.Editor.ModalManage.RenderModal(SnapModal, ModalPosition.Center, {}); else { - let snapService = app.m_Editor.GetPointServices.snapServices; + let snapService = app.Editor.GetPointServices.snapServices; snapService.SnapModeEnable = SNAPMODE[res.StringResult]; } } diff --git a/src/Editor/SnapMenuFixed.tsx b/src/Editor/SnapMenuFixed.tsx index c9958749d..86315c1ac 100644 --- a/src/Editor/SnapMenuFixed.tsx +++ b/src/Editor/SnapMenuFixed.tsx @@ -65,10 +65,10 @@ export class SnapMenuFixed extends React.Component<{}> icon={data.enable ? "tick" : "blank"} onClick={() => { - let snapServices = app.m_Editor.GetPointServices.snapServices; + let snapServices = app.Editor.GetPointServices.snapServices; data.enable = !data.enable; snapServices.SnapModeEnable ^= SNAPMODE[data.mode]; - app.m_Editor.GetPointServices.snapModeCurrent = snapServices.SnapModeEnable; + app.Editor.GetPointServices.snapModeCurrent = snapServices.SnapModeEnable; }} /> ) @@ -79,7 +79,7 @@ export class SnapMenuFixed extends React.Component<{}> onClick={() => { this.isModalShow = true; - app.m_Editor.m_ModalManage.RenderModal(SnapModal, ModalPosition.Center, {}); + app.Editor.ModalManage.RenderModal(SnapModal, ModalPosition.Center, {}); }} /> @@ -90,7 +90,7 @@ export class SnapMenuFixed extends React.Component<{}> { this.isMenuShow = true; this.isModalShow = false; - app.m_Editor.m_MaskManage.ShowMask(); + app.Editor.MaskManage.ShowMask(); e.preventDefault(); } @@ -98,6 +98,6 @@ export class SnapMenuFixed extends React.Component<{}> { this.isMenuShow = false; if (!this.isModalShow) - app.m_Editor.m_MaskManage.Clear(); + app.Editor.MaskManage.Clear(); } } diff --git a/src/Editor/SnapServices.ts b/src/Editor/SnapServices.ts index 50f7f8ba9..39d97c057 100644 --- a/src/Editor/SnapServices.ts +++ b/src/Editor/SnapServices.ts @@ -82,7 +82,7 @@ export class SnapServices //开始捕捉 Start(prompt: GetPointPrompt) { - this.m_UCS = app.m_Editor.UCSMatrix; + this.m_UCS = app.Editor.UCSMatrix; this.InitDynPrompt(); this.InitCrossCursor(); @@ -99,8 +99,8 @@ export class SnapServices }); //当基点在圆上或者圆弧上的时候,支持切线捕捉 - let sel = new SelectPick(app.m_Viewer, app.m_Viewer.WorldToScreen(prompt.BasePoint.clone())); - sel.Select(app.m_Viewer.VisibleObjects, { filterTypes: [Circle, Arc] }); + let sel = new SelectPick(app.Viewer, app.Viewer.WorldToScreen(prompt.BasePoint.clone())); + sel.Select(app.Viewer.VisibleObjects, { filterTypes: [Circle, Arc] }); let cirs = sel.SelectEntityList as (Circle | Arc)[]; let ents: SupportSnapEntity[] = []; @@ -167,7 +167,7 @@ export class SnapServices this.UpdateDynPrompt(); this.UpdateSupportExtLine(); - app.m_Viewer.m_PreViewer.UpdateScreen(); + app.Viewer.PreViewer.UpdateScreen(); } /** @@ -207,8 +207,8 @@ export class SnapServices if (this.SnapModeEnable & ObjectSnapMode.NotEntitySnap) return; - let vcsP = app.m_Editor.m_MouseCtrl.m_CurMousePointVCS; - let wcsP = app.m_Editor.m_MouseCtrl.m_CurMousePointWCS; + let vcsP = app.Editor.MouseCtrl.m_CurMousePointVCS; + let wcsP = app.Editor.MouseCtrl.m_CurMousePointWCS; let baseP = this.m_HasBasePoint ? this.m_SupportSnapPoints[0].Point : undefined; @@ -219,7 +219,7 @@ export class SnapServices this.m_DelaySupportSnapId = undefined; } - let selectEns = PointPick(vcsP, app.m_Viewer, { filterErase: true }, app.m_Viewer.VisibleObjects).map(GetEntity).filter(e => e !== undefined); + let selectEns = PointPick(vcsP, app.Viewer, { filterErase: true }, app.Viewer.VisibleObjects).map(GetEntity).filter(e => e !== undefined); //如果只有切线捕捉 if (this.SnapModeEnable === ObjectSnapMode.Tan && !this.m_HasBasePoint) @@ -231,7 +231,7 @@ export class SnapServices for (let p of sps) { - let pv = app.m_Viewer.WorldToScreen(p.clone()); + let pv = app.Viewer.WorldToScreen(p.clone()); if (SnapPoint(pv, vcsP, this.SnapSize)) { this.SnapMode = ObjectSnapMode.Tan; @@ -242,7 +242,7 @@ export class SnapServices } - let viewXform = new Matrix3().setFromMatrix4(app.m_Viewer.Camera.matrix); + let viewXform = new Matrix3().setFromMatrix4(app.Viewer.Camera.matrix); //#region 实体点捕捉(端点,中点,圆心,垂点,切点) for (let mode of [ @@ -290,8 +290,8 @@ export class SnapServices //#region 捕捉交点 if (this.SnapModeEnable & ObjectSnapMode.Int) { - let sel = new SelectPick(app.m_Viewer, vcsP); - sel.Select(app.m_Viewer.VisibleObjects, { filterTypes: [Curve], filterErase: true }); + let sel = new SelectPick(app.Viewer, vcsP); + sel.Select(app.Viewer.VisibleObjects, { filterTypes: [Curve], filterErase: true }); let cus = sel.SelectEntityList as Curve[]; @@ -302,7 +302,7 @@ export class SnapServices { for (let p of pts) { - let pv = app.m_Viewer.WorldToScreen(p.clone()); + let pv = app.Viewer.WorldToScreen(p.clone()); if (SnapPoint(vcsP, pv, this.SnapSize)) { this.SnapMode = ObjectSnapMode.Int; @@ -354,7 +354,7 @@ export class SnapServices continue; } - let pv = app.m_Viewer.WorldToScreen(p.clone()); + let pv = app.Viewer.WorldToScreen(p.clone()); let dist = vcsP.manhattanDistanceTo(pv); if (dist < this.SnapSize && dist < minDistance) @@ -404,7 +404,7 @@ export class SnapServices */ private AxisSnap(supportSnapPt: SupportSnapPoint, isFirst = false): SnapAxis { - if (equalv3(supportSnapPt.Point, app.m_Editor.m_MouseCtrl.m_CurMousePointWCS)) + if (equalv3(supportSnapPt.Point, app.Editor.MouseCtrl.m_CurMousePointWCS)) return; let allowMouseDistSq = 100;//允许鼠标距离Sq @@ -416,7 +416,7 @@ export class SnapServices allowMouseDistSq = Infinity; } - let nowVCS = app.m_Editor.m_MouseCtrl.m_CurMousePointVCS; + let nowVCS = app.Editor.MouseCtrl.m_CurMousePointVCS; let minP: Vector3; let minDist = Infinity; @@ -481,15 +481,15 @@ export class SnapServices } else if (es.Entity instanceof Arc) { - let p = app.m_Viewer.ScreenToWorld( + let p = app.Viewer.ScreenToWorld( nowVCS.clone(), new Vector3().setFromMatrixColumn(es.Entity.OCS, 2), es.Entity.Center ); let cp = es.Entity.GetClosestPointTo(p, true); - let pVcs = app.m_Viewer.WorldToScreen(p.clone()); - let cpVcs = app.m_Viewer.WorldToScreen(cp.clone()); + let pVcs = app.Viewer.WorldToScreen(p.clone()); + let cpVcs = app.Viewer.WorldToScreen(cp.clone()); let dist = pVcs.distanceToSquared(cpVcs); @@ -532,7 +532,7 @@ export class SnapServices if (snapAxisList.length === 0) return; - let nowVCS = app.m_Editor.m_MouseCtrl.m_CurMousePointVCS; + let nowVCS = app.Editor.MouseCtrl.m_CurMousePointVCS; //检测交点 let axisIntersectList: SnapIntersect[] = []; @@ -548,8 +548,8 @@ export class SnapServices insP.sort((p1, p2) => { - return app.m_Viewer.WorldToScreen(p1.clone()).distanceToSquared(nowVCS) - - app.m_Viewer.WorldToScreen(p2.clone()).distanceToSquared(nowVCS); + return app.Viewer.WorldToScreen(p1.clone()).distanceToSquared(nowVCS) + - app.Viewer.WorldToScreen(p2.clone()).distanceToSquared(nowVCS); }) axisIntersectList.push({ @@ -566,15 +566,15 @@ export class SnapServices { axisIntersectList.sort((d1, d2) => { - return app.m_Viewer.WorldToScreen(d1.IntersectPoint.clone()).distanceToSquared(nowVCS) - - app.m_Viewer.WorldToScreen(d2.IntersectPoint.clone()).distanceToSquared(nowVCS); + return app.Viewer.WorldToScreen(d1.IntersectPoint.clone()).distanceToSquared(nowVCS) + - app.Viewer.WorldToScreen(d2.IntersectPoint.clone()).distanceToSquared(nowVCS); }); let insData = axisIntersectList[0]; if ( this.AxisSnapMode === AxisSnapMode.Ortho || - SnapPoint(app.m_Viewer.WorldToScreen(insData.IntersectPoint.clone()), nowVCS, this.SnapSize)) + SnapPoint(app.Viewer.WorldToScreen(insData.IntersectPoint.clone()), nowVCS, this.SnapSize)) { insData.Axis1.SnapPoint = insData.IntersectPoint; insData.Axis2.SnapPoint = insData.IntersectPoint; @@ -594,8 +594,8 @@ export class SnapServices //捕捉轴线与实体的交点 if (this.SnapModeEnable & ObjectSnapMode.Int) { - let sel = new SelectPick(app.m_Viewer, nowVCS); - sel.Select(app.m_Viewer.VisibleObjects, { filterTypes: [Curve], filterErase: true }); + let sel = new SelectPick(app.Viewer, nowVCS); + sel.Select(app.Viewer.VisibleObjects, { filterTypes: [Curve], filterErase: true }); let cus = sel.SelectEntityList as Curve[]; //轴线与实体的交点 @@ -604,7 +604,7 @@ export class SnapServices let ipts = c.IntersectWith(snapAxisList[0].Curve, IntersectOption.ExtendBoth); for (let p of ipts) { - let pv = app.m_Viewer.WorldToScreen(p.clone()); + let pv = app.Viewer.WorldToScreen(p.clone()); if (SnapPoint(pv, nowVCS, this.SnapSize)) { this.SnapMode = ObjectSnapMode.Int; @@ -623,8 +623,8 @@ export class SnapServices snapAxisList.sort((d1, d2) => { - return app.m_Viewer.WorldToScreen(d1.SnapPoint.clone()).distanceToSquared(nowVCS) - - app.m_Viewer.WorldToScreen(d2.SnapPoint.clone()).distanceToSquared(nowVCS) + return app.Viewer.WorldToScreen(d1.SnapPoint.clone()).distanceToSquared(nowVCS) + - app.Viewer.WorldToScreen(d2.SnapPoint.clone()).distanceToSquared(nowVCS) }); let snapAxis = snapAxisList[0]; @@ -632,8 +632,8 @@ export class SnapServices //捕捉轴线与实体的交点 if (this.SnapModeEnable & ObjectSnapMode.Int) { - let sel = new SelectPick(app.m_Viewer, nowVCS); - sel.Select(app.m_Viewer.VisibleObjects, { filterTypes: [Curve], filterErase: true }); + let sel = new SelectPick(app.Viewer, nowVCS); + sel.Select(app.Viewer.VisibleObjects, { filterTypes: [Curve], filterErase: true }); let cus = sel.SelectEntityList as Curve[]; for (const c of cus) @@ -642,7 +642,7 @@ export class SnapServices if (ipts) for (let p of ipts) { - let pv = app.m_Viewer.WorldToScreen(p.clone()); + let pv = app.Viewer.WorldToScreen(p.clone()); if (SnapPoint(pv, nowVCS, this.SnapSize)) { this.SnapMode = ObjectSnapMode.Int; @@ -678,7 +678,7 @@ export class SnapServices { if (this.m_CrossCursor.length === 0) { - let preView = app.m_Viewer.m_PreViewer; + let preView = app.Viewer.PreViewer; for (let i = 0; i < 7; i++) { this.m_CrossCursor.push( @@ -697,7 +697,7 @@ export class SnapServices */ private UpdateCrossCursor() { - let preView = app.m_Viewer.m_PreViewer; + let preView = app.Viewer.PreViewer; for (let i = 0; i < 7; i++) { let l = this.m_CrossCursor[i]; @@ -720,7 +720,7 @@ export class SnapServices { if (!this.m_SquareCursor) this.m_SquareCursor = - app.m_Viewer.m_PreViewer.DrawLine( + app.Viewer.PreViewer.DrawLine( PointShapeUtils.TangentPts(this.SnapSize), ColorMaterial.GetLineMaterial(3), ); @@ -779,7 +779,7 @@ export class SnapServices { if (!this.m_BiasCrossCursor) { - this.m_BiasCrossCursor = app.m_Viewer.m_PreViewer.Draw( + this.m_BiasCrossCursor = app.Viewer.PreViewer.Draw( DrawMode.BaisCross, 8, new Vector3(), @@ -800,7 +800,7 @@ export class SnapServices private InitBiasOutline() { if (!this.m_BiasOutline) - this.m_BiasOutline = app.m_Viewer.m_PreViewer.Draw( + this.m_BiasOutline = app.Viewer.PreViewer.Draw( DrawMode.Square, this.SnapSize, new Vector3(), @@ -822,7 +822,7 @@ export class SnapServices if (visible && this.SnapPoint) { obj.position.copy(this.SnapPoint); - app.m_Viewer.m_PreViewer.WorldToViewPoint(obj.position); + app.Viewer.PreViewer.WorldToViewPoint(obj.position); obj.updateMatrix(); } } @@ -837,7 +837,7 @@ export class SnapServices let pts: Vector3[] = []; for (let i = 0; i < 34; i++) pts.push(new Vector3()); - this.m_SupportExtLine = app.m_Viewer.m_PreViewer.DrawLine( + this.m_SupportExtLine = app.Viewer.PreViewer.DrawLine( pts, ColorMaterial.SnapAxisMaterial, ); @@ -866,8 +866,8 @@ export class SnapServices if (axis.Curve instanceof DbLine) { pts.push( - app.m_Viewer.m_PreViewer.WorldToViewPoint(axis.BasePoint.clone()), - app.m_Viewer.m_PreViewer.WorldToViewPoint(axis.SnapPoint.clone()) + app.Viewer.PreViewer.WorldToViewPoint(axis.BasePoint.clone()), + app.Viewer.PreViewer.WorldToViewPoint(axis.SnapPoint.clone()) ); } else if (axis.Curve instanceof Arc) @@ -884,7 +884,7 @@ export class SnapServices for (let i = 0; i < 17; i++) { pts.push( - app.m_Viewer.m_PreViewer.WorldToViewPoint( + app.Viewer.PreViewer.WorldToViewPoint( arc.GetPointAtParam(paramStart + i * r) ) ); @@ -915,21 +915,21 @@ export class SnapServices else this.m_DynPrompt.UpdatePrompt("极轴"); - let vps = this.m_SupportExtLinePts.map(p => app.m_Viewer.m_PreViewer.ViewerPointToScreenPoint(p.clone())); + let vps = this.m_SupportExtLinePts.map(p => app.Viewer.PreViewer.ViewerPointToScreenPoint(p.clone())); this.m_DynPrompt.SetPostion(midPoint(vps[0], vps[1])); } else if (this.m_SupportExtLinePts.length === 4) { this.m_DynPrompt.Visible = true; - this.m_DynPrompt.SetPostion(app.m_Viewer.WorldToScreen(this.SnapPoint.clone()).add(new Vector3(0, 100))); + this.m_DynPrompt.SetPostion(app.Viewer.WorldToScreen(this.SnapPoint.clone()).add(new Vector3(0, 100))); this.m_DynPrompt.UpdatePrompt("轴线交点"); } else if (this.SnapMode !== ObjectSnapMode.Node && this.SnapPoint) { this.m_DynPrompt.Visible = true; this.m_DynPrompt.SetPostion( - app.m_Viewer.WorldToScreen(this.SnapPoint.clone()) + app.Viewer.WorldToScreen(this.SnapPoint.clone()) .add(new Vector3(0, 100)) ); switch (this.SnapMode) @@ -974,23 +974,23 @@ export class SnapServices //计算一个点距离某个轴线的距离(在屏幕中),并返回轴线上的点. function PtCPToAxis(axisSpWcs: Vector3, axisEpWcs: Vector3, ptVcs: Vector3) { - let axisSpVCS = app.m_Viewer.WorldToScreen(axisSpWcs.clone()); - let axisEpVCS = app.m_Viewer.WorldToScreen(axisEpWcs.clone()); + let axisSpVCS = app.Viewer.WorldToScreen(axisSpWcs.clone()); + let axisEpVCS = app.Viewer.WorldToScreen(axisEpWcs.clone()); let l = new DbLine(axisSpVCS, axisEpVCS); let cp = l.GetClosestPointTo(ptVcs, true); //eye - let dir = app.m_Viewer.m_CameraCtrl.Direction; - if (app.m_Viewer.Camera instanceof PerspectiveCamera) - dir = app.m_Viewer.Camera.position.clone().sub(axisSpWcs); + let dir = app.Viewer.CameraCtrl.Direction; + if (app.Viewer.Camera instanceof PerspectiveCamera) + dir = app.Viewer.Camera.position.clone().sub(axisSpWcs); let vec = axisEpWcs.clone().sub(axisSpWcs); //求直线相对于相机的平面 dir.cross(vec).cross(vec); - let cpWcs = app.m_Viewer.ScreenToWorld(cp.clone(), dir, axisSpWcs); + let cpWcs = app.Viewer.ScreenToWorld(cp.clone(), dir, axisSpWcs); //修正精度不正确的问题 l.StartPoint = axisSpWcs; diff --git a/src/Editor/TranstrolControl/TransformServices.ts b/src/Editor/TranstrolControl/TransformServices.ts index ab897e29d..7e6bcc6c7 100644 --- a/src/Editor/TranstrolControl/TransformServices.ts +++ b/src/Editor/TranstrolControl/TransformServices.ts @@ -39,11 +39,11 @@ export class TransformServicess implements EditorService { this.m_Editor = ed; - let app = ed.m_App; - let preView = app.m_Viewer.m_PreViewer; + let app = ed.App; + let preView = app.Viewer.PreViewer; this.InitAxes(preView); - end(ed.m_MouseCtrl, ed.m_MouseCtrl.onMouseMove, () => + end(ed.MouseCtrl, ed.MouseCtrl.onMouseMove, () => { if (!this.m_Enable) return; @@ -53,7 +53,7 @@ export class TransformServicess implements EditorService return; axes.Rest(); - let objs = PointPick(ed.m_MouseCtrl.m_CurMousePointVCS, preView, undefined, axes.children); + let objs = PointPick(ed.MouseCtrl.m_CurMousePointVCS, preView, undefined, axes.children); if (objs.length === 1) { let obj = objs[0]; @@ -64,7 +64,7 @@ export class TransformServicess implements EditorService } }); - end(app.m_Viewer.m_CameraCtrl, app.m_Viewer.m_CameraCtrl.Update, () => + end(app.Viewer.CameraCtrl, app.Viewer.CameraCtrl.Update, () => { this.UpdateAxesMatrix(); }) @@ -73,7 +73,7 @@ export class TransformServicess implements EditorService get IsReady() { - return this.m_Enable && this.CurAxes.AxtiveIndex > 0 && this.m_Editor.m_InputState === InputState.None; + return this.m_Enable && this.CurAxes.AxtiveIndex > 0 && this.m_Editor.InputState === InputState.None; } async Doit(e: MouseEvent) { @@ -86,7 +86,7 @@ export class TransformServicess implements EditorService if (!commandMachine.CommandStart("_move")) return; - app.m_Viewer._GripScene.visible = false; + app.Viewer.GripScene.visible = false; let jigEns = this.m_Ents.map(e => JigUtils.Draw(e)); let base = new THREE.Vector3().setFromMatrixColumn(this.m_Matrix, 3); @@ -100,7 +100,7 @@ export class TransformServicess implements EditorService let m = MoveMatrix(newP.clone().sub(base)); for (let e of jigEns) e.ApplyMatrix(m); - app.m_Editor.UpdateScreen(); + app.Editor.UpdateScreen(); } }); if (ptRes.Status === PromptStatus.OK) @@ -110,7 +110,7 @@ export class TransformServicess implements EditorService e.ApplyMatrix(m); } - app.m_Viewer._GripScene.visible = true; + app.Viewer.GripScene.visible = true; commandMachine.CommandEnd(); } return true; @@ -141,7 +141,7 @@ export class TransformServicess implements EditorService let newAxes = this.CurAxes; newAxes.visible = true; - this.m_Editor.m_App.m_Viewer.m_PreViewer.UpdateScreen(); + this.m_Editor.App.Viewer.PreViewer.UpdateScreen(); } set Matrix(mat: THREE.Matrix4) @@ -154,9 +154,9 @@ export class TransformServicess implements EditorService { for (let a of this.m_CtrlAxes) { - MatrixToPreViewMat(this.m_Matrix, this.m_Editor.m_App.m_Viewer, a, UCSPsotion.Origin); + MatrixToPreViewMat(this.m_Matrix, this.m_Editor.App.Viewer, a, UCSPsotion.Origin); } - this.m_Editor.m_App.m_Viewer.m_PreViewer.UpdateScreen(); + this.m_Editor.App.Viewer.PreViewer.UpdateScreen(); } set Enable(e: boolean) diff --git a/src/Editor/UCSServices.ts b/src/Editor/UCSServices.ts index 0aa094640..e4666a051 100644 --- a/src/Editor/UCSServices.ts +++ b/src/Editor/UCSServices.ts @@ -21,8 +21,8 @@ export class UCSServices { this.m_Ed = ed; - let view = ed.m_App.m_Viewer; - let preView = view.m_PreViewer; + let view = ed.App.Viewer; + let preView = view.PreViewer; //在前视图绘制ucs轴. this.m_UcsObj.scale.set(50, 50, 50); @@ -36,7 +36,7 @@ export class UCSServices } private Update() { - let view = this.m_Ed.m_App.m_Viewer; + let view = this.m_Ed.App.Viewer; MatrixToPreViewMat(this.m_Ed.UCSMatrix, view, this.m_UcsObj, this._DisplayPosition); } @@ -58,7 +58,7 @@ export function MatrixToPreViewMat(mat: Matrix4, view: Viewer, obj: Object3D, di { let p = new Vector3().setFromMatrixColumn(mat, 3); view.WorldToScreen(p); - view.m_PreViewer.ScreenPointToViewerPoint(p); + view.PreViewer.ScreenPointToViewerPoint(p); obj.position.copy(p); if (Math.abs(p.x) > view.Width / 2 || Math.abs(p.y) > view.Height / 2) @@ -70,6 +70,6 @@ export function MatrixToPreViewMat(mat: Matrix4, view: Viewer, obj: Object3D, di obj.updateMatrix(); let tempMat = mat.clone(); tempMat.multiplyMatrices(view.Camera.matrixWorldInverse, tempMat); - tempMat.multiplyMatrices(view.m_PreViewer.Camera.matrixWorld, tempMat); + tempMat.multiplyMatrices(view.PreViewer.Camera.matrixWorld, tempMat); obj.quaternion.setFromRotationMatrix(tempMat); } diff --git a/src/Geometry/RegionParse.ts b/src/Geometry/RegionParse.ts index 313b7d289..a94b02376 100644 --- a/src/Geometry/RegionParse.ts +++ b/src/Geometry/RegionParse.ts @@ -31,15 +31,15 @@ type RegionRouteS = Array>; export class RegionParse { //曲线使用计数器 - private m_CountCu = new Count(); + private _CountCu = new Count(); //区域列表 通常是外轮廓 - m_RegionsOutline: RegionRouteS = []; + RegionsOutline: RegionRouteS = []; //区域列表 通常是内轮廓 - m_RegionsInternal: RegionRouteS = []; + RegionsInternal: RegionRouteS = []; //碎线 曲线进入到这里会被炸开. - m_ExpLineMap: Map = new Map(); + ExpLineMap: Map = new Map(); /** * Creates an instance of RegionParse. @@ -65,10 +65,10 @@ export class RegionParse let isFind = this.FindRegion(minStand, minStand, undefined, wayS, routeS, 1); if (isFind) { - this.m_RegionsOutline.push(routeS); + this.RegionsOutline.push(routeS); //计数增加 for (let route of routeS) - this.m_CountCu.AddCount(route.curve, 1); + this._CountCu.AddCount(route.curve, 1); this.FindMinRegion(wayS); } } @@ -82,15 +82,15 @@ export class RegionParse */ GetCueveUsed(cu: Curve): boolean { - if (this.m_ExpLineMap.has(cu)) + if (this.ExpLineMap.has(cu)) { - let use = this.m_ExpLineMap.get(cu).some(c => this.m_CountCu.GetCount(c) > 0); + let use = this.ExpLineMap.get(cu).some(c => this._CountCu.GetCount(c) > 0); if (!use) - this.m_ExpLineMap.delete(cu); + this.ExpLineMap.delete(cu); return use; } else - return this.m_CountCu.GetCount(cu) > 0; + return this._CountCu.GetCount(cu) > 0; } /** @@ -145,13 +145,13 @@ export class RegionParse }); for (let route of routeS) - this.m_CountCu.AddCount(route.curve, 1); + this._CountCu.AddCount(route.curve, 1); } } } if (regs.length > 1) - this.m_RegionsInternal.push(...regs); + this.RegionsInternal.push(...regs); } /** @@ -222,7 +222,7 @@ export class RegionParse //加入到计算 cus.push(...arcs); - this.m_ExpLineMap.set(c, cus); + this.ExpLineMap.set(c, cus); plcus.push(...cus); return true; } @@ -239,7 +239,7 @@ export class RegionParse if (arcs.length > 1) { arcs.forEach(a => curveMap.addCurveToMap(a)); - this.m_ExpLineMap.set(cu, arcs); + this.ExpLineMap.set(cu, arcs); continue; } } @@ -317,7 +317,7 @@ export class RegionParse //下一站 let route = nowStand.routes[index]; - let usedCount = this.m_CountCu.GetCount(route.curve); + let usedCount = this._CountCu.GetCount(route.curve); if (usedCount >= cuMaximumCount) continue; diff --git a/src/Geometry/SpaceParse/ClampSpaceParseDist.ts b/src/Geometry/SpaceParse/ClampSpaceParseDist.ts index 745ebafbf..0f7e505da 100644 --- a/src/Geometry/SpaceParse/ClampSpaceParseDist.ts +++ b/src/Geometry/SpaceParse/ClampSpaceParseDist.ts @@ -7,6 +7,6 @@ export class ClampSpaceParseDist extends ClampSpaceParse //virtual (请重载) 指定用户选择单块板的延伸空间 async GetSignalDist(): Promise { - return app.m_Editor.GetDistance({}); + return app.Editor.GetDistance({}); } } diff --git a/src/Geometry/SpaceParse/ClampSpaceParseKey.ts b/src/Geometry/SpaceParse/ClampSpaceParseKey.ts index 595022da7..4f61e60e1 100644 --- a/src/Geometry/SpaceParse/ClampSpaceParseKey.ts +++ b/src/Geometry/SpaceParse/ClampSpaceParseKey.ts @@ -24,7 +24,7 @@ export class ClampSpaceParseKey extends ClampSpaceParseDist let keyword = keywords[splitType]; - let keyRes = await app.m_Editor.GetKeyWords({ KeyWordList: keyword }); + let keyRes = await app.Editor.GetKeyWords({ KeyWordList: keyword }); if (keyRes.Status === PromptStatus.Keyword) { if (keyRes.StringResult === "1") diff --git a/src/Geometry/SpaceParse/Point2SpaceParse.ts b/src/Geometry/SpaceParse/Point2SpaceParse.ts index 55e4aef41..b98a83d25 100644 --- a/src/Geometry/SpaceParse/Point2SpaceParse.ts +++ b/src/Geometry/SpaceParse/Point2SpaceParse.ts @@ -9,19 +9,19 @@ export class Point2SpaceParse extends ISpaceParse { async Parse() { - let res = await app.m_Editor.GetRectPoint(); + let res = await app.Editor.GetRectPoint(); if (res.Status !== PromptStatus.OK) return; - let distRes = await app.m_Editor.GetDistance({ + let distRes = await app.Editor.GetDistance({ Msg: "输入深度" }); if (distRes.Status === PromptStatus.OK) { let depth = distRes.Distance; - let nor = ZAxis.clone().applyMatrix4(app.m_Editor.UCSMatrix); + let nor = ZAxis.clone().applyMatrix4(app.Editor.UCSMatrix); let p1 = res.Point1WCS; let p2 = res.Point2WCS; diff --git a/src/Geometry/SpaceParse/Point3SpaceParse,.ts b/src/Geometry/SpaceParse/Point3SpaceParse,.ts index 6e62b9ffc..52bc0fb29 100644 --- a/src/Geometry/SpaceParse/Point3SpaceParse,.ts +++ b/src/Geometry/SpaceParse/Point3SpaceParse,.ts @@ -11,7 +11,7 @@ export class Point3SpaceParse extends ISpaceParse { async Parse() { - let ptRes = await app.m_Editor.GetPoint({ + let ptRes = await app.Editor.GetPoint({ Msg: "选择基点" }); if (ptRes.Status !== PromptStatus.OK) @@ -19,7 +19,7 @@ export class Point3SpaceParse extends ISpaceParse let basePt = ptRes.Point; - ptRes = await app.m_Editor.GetPoint({ + ptRes = await app.Editor.GetPoint({ Msg: "选择x方向终点", BasePoint: basePt, AllowDrawRubberBand: true, @@ -29,7 +29,7 @@ export class Point3SpaceParse extends ISpaceParse return; let xVec = ptRes.Point.sub(basePt); - ptRes = await app.m_Editor.GetPoint({ + ptRes = await app.Editor.GetPoint({ Msg: "选择z方向终点", BasePoint: basePt, AllowDrawRubberBand: true, @@ -50,7 +50,7 @@ export class Point3SpaceParse extends ISpaceParse return; } - let distRes = await app.m_Editor.GetDistance({ + let distRes = await app.Editor.GetDistance({ Msg: "点选或者输入深度", }); if (distRes.Status !== PromptStatus.OK) @@ -75,7 +75,7 @@ export class Point3SpaceParse extends ISpaceParse this.m_SpaceBox = box; //或者盒子周围的板件 - let ptSelect = new PointSelectBoards(box.getCenter(new Vector3).applyMatrix4(spaceOcs), app.m_Viewer, app.m_Viewer.Scene.children); + let ptSelect = new PointSelectBoards(box.getCenter(new Vector3).applyMatrix4(spaceOcs), app.Viewer, app.Viewer.Scene.children); this.m_Boards = ptSelect.SelectBoards; this.m_ParseOK = true; } diff --git a/src/Geometry/SpaceParse/PointSelectSpace.ts b/src/Geometry/SpaceParse/PointSelectSpace.ts index 886338c4a..bcdeaa24c 100644 --- a/src/Geometry/SpaceParse/PointSelectSpace.ts +++ b/src/Geometry/SpaceParse/PointSelectSpace.ts @@ -43,7 +43,7 @@ export class PointSelectSpace KeyWordList.push({ msg: "放弃", key: "U" }); } - this.GetPointRes = await app.m_Editor.GetPoint({ + this.GetPointRes = await app.Editor.GetPoint({ Msg: "点选画板区域", AllowNone: true, KeyWordList @@ -52,12 +52,12 @@ export class PointSelectSpace //点选 if (this.GetPointRes.Status === PromptStatus.OK) { - let view = app.m_Viewer; - let vcs = app.m_Editor.m_MouseCtrl.m_CurMousePointVCS; + let view = app.Viewer; + let vcs = app.Editor.MouseCtrl.m_CurMousePointVCS; let ptSelect = new PointSelectBoards(vcs, view, view.VisibleObjects); if (ptSelect.SelectBoards.length === 0) - app.m_Editor.Prompt("请选择有效的板件,或者周围没有效板件"); + app.Editor.Prompt("请选择有效的板件,或者周围没有效板件"); else await this.ParseByPointSelect(ptSelect); } @@ -66,18 +66,18 @@ export class PointSelectSpace { if (this.GetPointRes.StringResult === "S") { - let ssRes = await app.m_Editor.GetSelection({ UseSelect: true, Filter: { filterTypes: [Board] } }); + let ssRes = await app.Editor.GetSelection({ UseSelect: true, Filter: { filterTypes: [Board] } }); if (ssRes.Status === PromptStatus.OK) await this.ParseBySelect(ssRes.SelectSet.SelectEntityList as Board[]); } else if (this.GetPointRes.StringResult === "2") { - app.m_Editor.GetPointServices.snapServices.Disabled = false; + app.Editor.GetPointServices.snapServices.Disabled = false; await this.ParseBy2Point(); } else if (this.GetPointRes.StringResult === "3") { - app.m_Editor.GetPointServices.snapServices.Disabled = false; + app.Editor.GetPointServices.snapServices.Disabled = false; await this.ParseBy3Point(); } } diff --git a/src/Geometry/SpaceParse/SurroundOutlineParse.ts b/src/Geometry/SpaceParse/SurroundOutlineParse.ts index fe8238e81..232afc9bf 100644 --- a/src/Geometry/SpaceParse/SurroundOutlineParse.ts +++ b/src/Geometry/SpaceParse/SurroundOutlineParse.ts @@ -16,8 +16,8 @@ export class SurroundOutlineParse extends ISpaceParse async Parse() { let pls: Polyline[] = []; - let ucsNormal = new Vector3().setFromMatrixColumn(app.m_Editor.UCSMatrix, 2); - let ucsInv = app.m_Editor.UCSMatrixInv; + let ucsNormal = new Vector3().setFromMatrixColumn(app.Editor.UCSMatrix, 2); + let ucsInv = app.Editor.UCSMatrixInv; let maxZ = -Infinity; for (let [, brs] of this.m_BoardMap) { @@ -52,7 +52,7 @@ export class SurroundOutlineParse extends ISpaceParse this.GetOutline(pls); //变换到最高点 - let ucs = app.m_Editor.UCSMatrix; + let ucs = app.Editor.UCSMatrix; let p = new Vector3().setFromMatrixPosition(ucs); p.add(ucsNormal.multiplyScalar(maxZ)); ucs.setPosition(p); diff --git a/src/Geometry/SpaceParse/SurroundSpaceParse.ts b/src/Geometry/SpaceParse/SurroundSpaceParse.ts index ce656334b..b8ef9d5a4 100644 --- a/src/Geometry/SpaceParse/SurroundSpaceParse.ts +++ b/src/Geometry/SpaceParse/SurroundSpaceParse.ts @@ -64,7 +64,7 @@ export class SurroundSpaceParse extends ISpaceParse if (!equaln(size.y, this.m_LeftBoard.Width) || !equaln(size.y, this.m_RightBoard.Width)) { - let enRes = await app.m_Editor.GetEntity({ + let enRes = await app.Editor.GetEntity({ Msg: "宽度不一致,请选择基准板:", Filter: { filterFunction: (o, br) => diff --git a/src/GraphicsSystem/PreViewer.ts b/src/GraphicsSystem/PreViewer.ts index 7d04a7def..2a55d6702 100644 --- a/src/GraphicsSystem/PreViewer.ts +++ b/src/GraphicsSystem/PreViewer.ts @@ -126,7 +126,7 @@ export class PreViewer //世界坐标系转视图坐标系 WorldToViewPoint(pWcs: Vector3) { - return this.ScreenPointToViewerPoint(app.m_Viewer.WorldToScreen(pWcs)); + return this.ScreenPointToViewerPoint(app.Viewer.WorldToScreen(pWcs)); } //屏幕坐标系赚视图坐标系 diff --git a/src/GraphicsSystem/Viewer.ts b/src/GraphicsSystem/Viewer.ts index e970b2157..96480a4b6 100644 --- a/src/GraphicsSystem/Viewer.ts +++ b/src/GraphicsSystem/Viewer.ts @@ -27,26 +27,26 @@ require("three-OutlinePass"); export class Viewer { - m_bNeedUpdate: boolean = true; + protected NeedUpdate: boolean = true; //相机类 - m_CameraCtrl: CameraUpdate = new CameraUpdate(); + CameraCtrl: CameraUpdate = new CameraUpdate(); //变换控制 - m_LookTarget: Vector3 = new Vector3(); + LookTarget: Vector3 = new Vector3(); //渲染器//暂时只用这个类型 - m_Render: WebGLRenderer; + Renderer: WebGLRenderer; //前置渲染 - m_PreViewer: PreViewer; + PreViewer: PreViewer; - m_bUsePass = false; - m_RenderPass: RenderPass; - m_OutlinePass: OutlinePass; - m_Composer: EffectComposer; + UsePass = false; + RenderPass: RenderPass; + OutlinePass: OutlinePass; + Composer: EffectComposer; - private m_Scene: Scene = new Scene; + private _Scene: Scene = new Scene; - _GripScene: GripScene; - m_DomEl: HTMLElement; + GripScene: GripScene; + DomEl: HTMLElement; private _Width: number; private _Height: number; @@ -55,16 +55,16 @@ export class Viewer //构造 constructor(canvasContainer: HTMLElement) { - this.m_Scene.autoUpdate = false; + this._Scene.autoUpdate = false; - this.m_DomEl = canvasContainer; - this.m_DomEl.oncontextmenu = () => false;//禁止用户选中画布. TODO: 加入右键工具栏. + this.DomEl = canvasContainer; + this.DomEl.oncontextmenu = () => false;//禁止用户选中画布. TODO: 加入右键工具栏. - this._GripScene = new GripScene(); - this.m_Scene.add(this._GripScene); + this.GripScene = new GripScene(); + this._Scene.add(this.GripScene); - this.m_PreViewer = new PreViewer(canvasContainer); - end(this.m_CameraCtrl, this.m_CameraCtrl.Update, () => { this.m_PreViewer.UpdateScreen() }); + this.PreViewer = new PreViewer(canvasContainer); + end(this.CameraCtrl, this.CameraCtrl.Update, () => { this.PreViewer.UpdateScreen() }); this.InitRender(canvasContainer); this.StartRender(); @@ -78,21 +78,21 @@ export class Viewer self.needUpdateEnts.add(this) }); - end(this.m_CameraCtrl, this.m_CameraCtrl.SwitchCamera, () => + end(this.CameraCtrl, this.CameraCtrl.SwitchCamera, () => { - this.m_RenderPass.camera = this.Camera; - this.m_OutlinePass.renderCamera = this.Camera; + this.RenderPass.camera = this.Camera; + this.OutlinePass.renderCamera = this.Camera; this.UpdateRender(); }); } get Scene() { - return this.m_Scene; + return this._Scene; } get Camera() { - return this.m_CameraCtrl.Camera; + return this.CameraCtrl.Camera; } get Width() { @@ -105,7 +105,7 @@ export class Viewer //初始化render InitRender(canvasContainer: HTMLElement) { - this.m_Render = new WebGLRenderer( + this.Renderer = new WebGLRenderer( { antialias: true,//antialias:true/false是否开启反锯齿 precision: "highp",//precision:highp/mediump/lowp着色精度选择 @@ -117,41 +117,41 @@ export class Viewer } ); //加到画布 - canvasContainer.appendChild(this.m_Render.domElement); + canvasContainer.appendChild(this.Renderer.domElement); - this.m_Render.autoClear = true; - this.m_Render.sortObjects = false; + this.Renderer.autoClear = true; + this.Renderer.sortObjects = false; //如果设置，那么它希望所有的纹理和颜色都是预乘的伽玛。默认值为false。 - this.m_Render.gammaInput = true; - this.m_Render.gammaOutput = true; - this.m_Render.shadowMap.enabled = true; - this.m_Render.setPixelRatio(window.devicePixelRatio); + this.Renderer.gammaInput = true; + this.Renderer.gammaOutput = true; + this.Renderer.shadowMap.enabled = true; + this.Renderer.setPixelRatio(window.devicePixelRatio); - this.m_Render.physicallyCorrectLights = true; + this.Renderer.physicallyCorrectLights = true; //设置它的背景色为黑色 - this.m_Render.setClearColor(0x000000, 1); + this.Renderer.setClearColor(0x000000, 1); - this.m_Composer = new EffectComposer(this.m_Render); + this.Composer = new EffectComposer(this.Renderer); - this.m_RenderPass = new RenderPass(this.m_Scene, this.m_CameraCtrl.Camera); - this.m_Composer.addPass(this.m_RenderPass); + this.RenderPass = new RenderPass(this._Scene, this.CameraCtrl.Camera); + this.Composer.addPass(this.RenderPass); - this.m_OutlinePass = new OutlinePass(new Vector2(100, 100), this.m_Scene, this.m_CameraCtrl.Camera); - this.m_OutlinePass.hiddenEdgeColor = this.m_OutlinePass.visibleEdgeColor; - this.m_OutlinePass.renderToScreen = true; + this.OutlinePass = new OutlinePass(new Vector2(100, 100), this._Scene, this.CameraCtrl.Camera); + this.OutlinePass.hiddenEdgeColor = this.OutlinePass.visibleEdgeColor; + this.OutlinePass.renderToScreen = true; - this.m_Composer.addPass(this.m_OutlinePass); + this.Composer.addPass(this.OutlinePass); let smaa = new SMAAPass(this.Width, this.Height); smaa.renderToScreen = true; - this.m_Composer.addPass(smaa); + this.Composer.addPass(smaa); this.OnSize(); } - OnSize = (width = this.m_DomEl.clientWidth, height = this.m_DomEl.clientHeight) => + OnSize = (width = this.DomEl.clientWidth, height = this.DomEl.clientHeight) => { this._Width = width; this._Height = height; @@ -162,28 +162,28 @@ export class Viewer if (this._Height % 2 == 1) this._Height -= 1; - this.m_PreViewer.UpdateSize(this._Width, this._Height); - this.m_Render.setSize(this._Width, this._Height); - this.m_Composer.setSize(this._Width, this._Height); - this.m_CameraCtrl.SetSize(this._Width, this._Height); + this.PreViewer.UpdateSize(this._Width, this._Height); + this.Renderer.setSize(this._Width, this._Height); + this.Composer.setSize(this._Width, this._Height); + this.CameraCtrl.SetSize(this._Width, this._Height); - this.m_CameraCtrl.Update(); - this.m_bNeedUpdate = true; + this.CameraCtrl.Update(); + this.UpdateRender(); } StartRender = () => { requestAnimationFrame(this.StartRender); - if (this.m_Scene != null && this.m_bNeedUpdate) + if (this._Scene != null && this.NeedUpdate) { this.Render(); - this.m_bNeedUpdate = false; + this.NeedUpdate = false; } } UpdateRender() { - this.m_bNeedUpdate = true; + this.NeedUpdate = true; } Render() @@ -193,21 +193,21 @@ export class Viewer this.needUpdateEnts.clear(); - if (this.m_bUsePass) - this.m_Composer.render(); + if (this.UsePass) + this.Composer.render(); else - this.m_Render.render(this.Scene, this.Camera); + this.Renderer.render(this.Scene, this.Camera); } ScreenToWorld(pt: Vector3, planNormal?: Vector3, constant?: Vector3) { if (!constant) - constant = new Vector3().setFromMatrixColumn(app.m_Editor.UCSMatrix, 3); + constant = new Vector3().setFromMatrixColumn(app.Editor.UCSMatrix, 3); if (!planNormal) - planNormal = new Vector3().setFromMatrixColumn(app.m_Editor.UCSMatrix, 2); + planNormal = new Vector3().setFromMatrixColumn(app.Editor.UCSMatrix, 2); - if (isPerpendicularityTo(this.m_CameraCtrl.Direction, planNormal)) - planNormal = this.m_CameraCtrl.Direction; + if (isPerpendicularityTo(this.CameraCtrl.Direction, planNormal)) + planNormal = this.CameraCtrl.Direction; //变换和求交点 let plan = new PlaneExt(planNormal, constant); @@ -239,7 +239,7 @@ export class Viewer let widthHalf = this.Width * 0.5; let heightHalf = this.Height * 0.5; - pt.project(this.m_CameraCtrl.Camera); + pt.project(this.CameraCtrl.Camera); pt.x = (pt.x * widthHalf) + widthHalf; pt.y = - (pt.y * heightHalf) + heightHalf; @@ -255,49 +255,49 @@ export class Viewer { let box = GetBoxArr(this.VisibleObjects); if (!box.isEmpty()) - this.m_LookTarget = box.getCenter(new Vector3()); + this.LookTarget = box.getCenter(new Vector3()); else - this.m_LookTarget = ZeroVec; + this.LookTarget = ZeroVec; } Rotate(mouseMove: Vector3) { - this.m_CameraCtrl.Rotate(mouseMove, this.m_LookTarget); - this.m_bNeedUpdate = true; + this.CameraCtrl.Rotate(mouseMove, this.LookTarget); + this.UpdateRender(); } Pan(mouseMove: Vector3) { - this.m_CameraCtrl.Pan(mouseMove); - this.m_bNeedUpdate = true; + this.CameraCtrl.Pan(mouseMove); + this.UpdateRender(); } Zoom(scale: number, center?: Vector3) { - this.m_CameraCtrl.Zoom(scale, center); - this.m_bNeedUpdate = true; + this.CameraCtrl.Zoom(scale, center); + this.UpdateRender(); } ZoomAll() { - let box = GetBox(this.m_Scene, true); + let box = GetBox(this._Scene, true); if (box.isEmpty()) box.set(new Vector3(), new Vector3(1000 * (this.Width / this.Height), 1000, 1000)); - this.m_CameraCtrl.ZoomExtensBox3(box); + this.CameraCtrl.ZoomExtensBox3(box); this.Zoom(1.2); - this.m_bNeedUpdate = true; + this.UpdateRender(); } ViewToTop() { - this.m_CameraCtrl.LookAt(new Vector3(0, 0, -1)); - this.m_bNeedUpdate = true; + this.CameraCtrl.LookAt(new Vector3(0, 0, -1)); + this.UpdateRender(); } ViewToFront() { - this.m_CameraCtrl.LookAt(new Vector3(0, 1, 0)); - this.m_bNeedUpdate = true; + this.CameraCtrl.LookAt(new Vector3(0, 1, 0)); + this.UpdateRender(); } ViewToSwiso() { - this.m_CameraCtrl.LookAt(new Vector3(1, 1, -1)); - this.m_bNeedUpdate = true; + this.CameraCtrl.LookAt(new Vector3(1, 1, -1)); + this.UpdateRender(); } /** @@ -306,11 +306,11 @@ export class Viewer get VisibleObjects(): Object3D[] { //@ts-ignore - let renderObjects: Object3D[] = this.m_OutlinePass.renderObjects; + let renderObjects: Object3D[] = this.OutlinePass.renderObjects; if (renderObjects.length > 0) return renderObjects; - let renderList = this.m_Render.renderLists.get(this.m_Scene, this.m_CameraCtrl.Camera); + let renderList = this.Renderer.renderLists.get(this._Scene, this.CameraCtrl.Camera); return [...renderList.transparent.map(o => o.object), ...renderList.opaque.map(o => o.object)]; } @@ -334,15 +334,15 @@ export class Viewer { for (let en of db.ModelSpace.Entitys) { - this.m_Scene.add(en.DrawObject); + this._Scene.add(en.DrawObject); en.UpdateVisible(); } - this.m_bNeedUpdate = true; + this.UpdateRender(); } renderEntitys(); begin(db.ModelSpace, db.ModelSpace.AppendEvent, (e: Entity) => { - this.m_Scene.add(e.DrawObject); + this._Scene.add(e.DrawObject); }); begin(db.ModelSpace, db.ModelSpace.Destroy, () => { diff --git a/src/Hot/HotCommand.ts b/src/Hot/HotCommand.ts index d8da1ed7f..a96796504 100644 --- a/src/Hot/HotCommand.ts +++ b/src/Hot/HotCommand.ts @@ -25,7 +25,7 @@ const makeHotExport = function (sourceModule): any if (cmd.constructor.name === m) { commandMachine.CommandMap.set(k, new modules[m]); - app.m_Editor.Prompt(`重新载入命令成功:${k}`); + app.Editor.Prompt(`重新载入命令成功:${k}`); break; } } diff --git a/src/Reactor/CommandReactor.ts b/src/Reactor/CommandReactor.ts index ce06203a6..4a00263bf 100644 --- a/src/Reactor/CommandReactor.ts +++ b/src/Reactor/CommandReactor.ts @@ -20,7 +20,7 @@ export class CommandReactor }); //由于创建实体的操作是修改模型空间,所以使用这个方法来得到命令创建了哪些实体 - begin(app.m_Database.ModelSpace, app.m_Database.ModelSpace.AppendEvent, (e: Entity) => + begin(app.Database.ModelSpace, app.Database.ModelSpace.AppendEvent, (e: Entity) => { if (CommandState.CommandIng && this._commandEndListeners.length > 0) this._createObejcts.push(e); @@ -39,7 +39,7 @@ export class CommandReactor for (let listener of this._commandEndListeners) { //反应器可能相互影响,所以不缓存这个 - let changeObjects = this.app.m_Database.hm.ChangeObjects; + let changeObjects = this.app.Database.hm.ChangeObjects; for (let obj of this._createObejcts) changeObjects.delete(obj); listener(this._cmdName, [...changeObjects], this._createObejcts); diff --git a/src/UI/Components/Asset.tsx b/src/UI/Components/Asset.tsx index c7755e73d..ddd3178b2 100644 --- a/src/UI/Components/Asset.tsx +++ b/src/UI/Components/Asset.tsx @@ -110,11 +110,11 @@ export class Asset extends React.Component<{ material: PhysicalMaterialRecord }, //得到选择的实体. let material = this.props.material as PhysicalMaterialRecord; - for (let en of app.m_Editor.m_SelectCtrl.SelectSet.SelectEntityList) + for (let en of app.Editor.SelectCtrl.SelectSet.SelectEntityList) { en.Material = material.Id; } - app.m_Viewer.m_bNeedUpdate = true; + app.Viewer.UpdateRender(); commandMachine.CommandEnd(); } @@ -154,7 +154,7 @@ export class Asset extends React.Component<{ material: PhysicalMaterialRecord }, } handleDelete = () => { - app.m_Database.MaterialTable.Remove(this.props.material as PhysicalMaterialRecord); + app.Database.MaterialTable.Remove(this.props.material as PhysicalMaterialRecord); } handleStart = (e: DragEvent) => { diff --git a/src/UI/Components/Board/BoardCommon.tsx b/src/UI/Components/Board/BoardCommon.tsx index 4a104b951..ab87381b8 100644 --- a/src/UI/Components/Board/BoardCommon.tsx +++ b/src/UI/Components/Board/BoardCommon.tsx @@ -26,7 +26,7 @@ export interface ISetItemOption inline?: boolean; className?: string; onBlur?(e?); - maxLength?:number; + maxLength?: number; } interface ISetBlockOption { @@ -453,7 +453,7 @@ export class DrillTypeSelectCom extends React.Component 0) { - for (const obj of app.m_Viewer.Scene.children) + for (const obj of app.Viewer.Scene.children) { if (obj.visible) { @@ -465,7 +465,7 @@ export class DrillTypeSelectCom extends React.Component{ } private ChangeModeling = async () => { - await app.m_Editor.m_ModalManage.EndExecingCmd(); + await app.Editor.ModalManage.EndExecingCmd(); if (!commandMachine.CommandStart("zx")) return; - app.m_Editor.m_ModalManage.ToggleShow(); + app.Editor.ModalManage.ToggleShow(); let exec = async () => { @@ -82,9 +82,9 @@ export class BoardConfigModal extends React.Component{ if (cuGourp) { let box = contour.BoundingBox; - app.m_Viewer.WorldToScreen(box.min); - app.m_Viewer.WorldToScreen(box.max); - let selectBox = new SelectBox(app.m_Viewer, AsVector2(box.min), AsVector2(box.max), SelectType.C); + app.Viewer.WorldToScreen(box.min); + app.Viewer.WorldToScreen(box.max); + let selectBox = new SelectBox(app.Viewer, AsVector2(box.min), AsVector2(box.max), SelectType.C); const rightStore = RightPanelStore.GetInstance() as RightPanelStore; @@ -103,7 +103,7 @@ export class BoardConfigModal extends React.Component{ let con = Contour.CreateContour(g, false); if (!con) { - app.m_Editor.Prompt("跳过自交轮廓!"); + app.Editor.Prompt("跳过自交轮廓!"); continue; }; @@ -158,7 +158,7 @@ export class BoardConfigModal extends React.Component{ let splits: Board[] = []; br.GrooveCheckAll(splits); for (let br of splits) - app.m_Database.ModelSpace.Append(br); + app.Database.ModelSpace.Append(br); br.Update(); } @@ -171,7 +171,7 @@ export class BoardConfigModal extends React.Component{ this.props.canDrawSpeical.set(this.props.br.IsSpecialShape); this.props.canModeling.set(this.props.br.BoardModeling.length > 0); - app.m_Editor.m_ModalManage.ToggleShow(); + app.Editor.ModalManage.ToggleShow(); commandMachine.CommandEnd(); return; } @@ -181,14 +181,14 @@ export class BoardConfigModal extends React.Component{ */ private PickUpModelingOutline = async () => { - await app.m_Editor.m_ModalManage.EndExecingCmd(); + await app.Editor.ModalManage.EndExecingCmd(); if (!commandMachine.CommandStart("_pick")) return; - app.m_Editor.m_ModalManage.ToggleShow(); + app.Editor.ModalManage.ToggleShow(); let br = this.props.br; - app.m_Viewer.m_CameraCtrl.LookAt(br.Normal.negate()); - app.m_Editor.UCSMatrix = new Matrix4().extractRotation(br.OCS); + app.Viewer.CameraCtrl.LookAt(br.Normal.negate()); + app.Editor.UCSMatrix = new Matrix4().extractRotation(br.OCS); let cu = JigUtils.Draw(br.ContourCurve.Clone().ApplyMatrix(br.OCS)); let moveCus = [cu]; @@ -232,7 +232,7 @@ export class BoardConfigModal extends React.Component{ //显示右侧状态栏 store.m_IsShow = true; store.m_TabId = RightTabId.Model; - app.m_Editor.m_ModalManage.ToggleShow(); + app.Editor.ModalManage.ToggleShow(); commandMachine.CommandEnd(); } render() diff --git a/src/UI/Components/Board/BoardFindModify.tsx b/src/UI/Components/Board/BoardFindModify.tsx index 8216a77fe..0c9e6d82f 100644 --- a/src/UI/Components/Board/BoardFindModify.tsx +++ b/src/UI/Components/Board/BoardFindModify.tsx @@ -78,9 +78,9 @@ export default class BoardFindModifyModal extends React.Component<{ store?: Boar } private async getBoardOption(key: string, content: string) { - app.m_Editor.m_MaskManage.Clear(); - app.m_Editor.m_ModalManage.ToggleShow(); - await app.m_Editor.m_ModalManage.ExecCmd({ type: EFindType.GetOption, key, content }); + app.Editor.MaskManage.Clear(); + app.Editor.ModalManage.ToggleShow(); + await app.Editor.ModalManage.ExecCmd({ type: EFindType.GetOption, key, content }); } private handleApplyBrName = () => { diff --git a/src/UI/Components/Board/BoardModal.tsx b/src/UI/Components/Board/BoardModal.tsx index 5bf81b0d0..7fd15893c 100644 --- a/src/UI/Components/Board/BoardModal.tsx +++ b/src/UI/Components/Board/BoardModal.tsx @@ -67,8 +67,8 @@ export class BoardModal extends React.Component registerEvent() { let store = this.props.store; - app.m_Editor.m_ModalManage.events.push( - xaop.begin(app.m_Editor.m_ModalManage, app.m_Editor.m_ModalManage.OnKeyDown, (e: KeyboardEvent) => + app.Editor.ModalManage.events.push( + xaop.begin(app.Editor.ModalManage, app.Editor.ModalManage.OnKeyDown, (e: KeyboardEvent) => { if (e.keyCode === KeyBoard.Enter || (e.keyCode === KeyBoard.Space && (e.target as HTMLElement).nodeName !== "INPUT")) diff --git a/src/UI/Components/Board/BoardOptionModal.tsx b/src/UI/Components/Board/BoardOptionModal.tsx index 9c8750d2e..c2d0cf86b 100644 --- a/src/UI/Components/Board/BoardOptionModal.tsx +++ b/src/UI/Components/Board/BoardOptionModal.tsx @@ -147,7 +147,7 @@ export class BoardOptionModal extends React.Component<{ board: Board }, {}> if (!this.canDrawSpecial.get() && board.IsSpecialShape) board.InitBoard(board.Height, board.Width, board.Thickness, board.BoardType); - app.m_Editor.m_ModalManage.Clear(); + app.Editor.ModalManage.Clear(); board.AutoUpdate = oldAutoUpdate; board.DeferUpdate(); @@ -156,7 +156,7 @@ export class BoardOptionModal extends React.Component<{ board: Board }, {}> } componentWillMount() { - for (let e of app.m_Database.ModelSpace.Entitys) + for (let e of app.Database.ModelSpace.Entitys) { if (!e.IsErase && e instanceof Board && e.BoardProcessOption.roomName === this.props.board.BoardProcessOption.roomName) @@ -185,7 +185,7 @@ export class BoardOptionModal extends React.Component<{ board: Board }, {}> minimal icon="cross" className={Classes.DIALOG_CLOSE_BUTTON} - onClick={() => app.m_Editor.m_ModalManage.Clear()} + onClick={() => app.Editor.ModalManage.Clear()} />
onClick={this.handleComfirmOption} />
diff --git a/src/UI/Components/Board/BoardProcessModal.tsx b/src/UI/Components/Board/BoardProcessModal.tsx index 45bb6a326..9eb402b63 100644 --- a/src/UI/Components/Board/BoardProcessModal.tsx +++ b/src/UI/Components/Board/BoardProcessModal.tsx @@ -30,7 +30,7 @@ export class BoardProcessModal extends React.Component{ @observable private drillConfigs: Map; private editorEdgeSealing(br: Board) { - app.m_Editor.m_ModalManage.Clear(); + app.Editor.ModalManage.Clear(); let store = RightPanelStore.GetInstance() as RightPanelStore; store.m_IsShow = true; store.m_TabId = RightTabId.Seal; @@ -76,8 +76,8 @@ export class BoardProcessModal extends React.Component{ } private getOption = async () => { - app.m_Editor.m_ModalManage.ToggleShow(); - let enRes = await app.m_Editor.GetEntity({ + app.Editor.ModalManage.ToggleShow(); + let enRes = await app.Editor.GetEntity({ Msg: "选择板件", Filter: { filterTypes: [Board] } }); @@ -88,7 +88,7 @@ export class BoardProcessModal extends React.Component{ this.props.opt[EBoardKeyList.RoomName] = data[EBoardKeyList.RoomName]; this.props.opt[EBoardKeyList.CabinetName] = data[EBoardKeyList.CabinetName]; } - app.m_Editor.m_ModalManage.ToggleShow(); + app.Editor.ModalManage.ToggleShow(); } async componentWillMount() { diff --git a/src/UI/Components/Board/GangDrillModal.tsx b/src/UI/Components/Board/GangDrillModal.tsx index 19b361b88..7f3ed258e 100644 --- a/src/UI/Components/Board/GangDrillModal.tsx +++ b/src/UI/Components/Board/GangDrillModal.tsx @@ -40,7 +40,7 @@ export class DrillModal extends React.Component<{ store?: DrillStore }, {}> { registerEvent() { let store = this.props.store; - app.m_Editor.m_ModalManage.events.push(xaop.begin(app.m_Editor.m_ModalManage, app.m_Editor.m_ModalManage.OnKeyDown, (e: KeyboardEvent) => + app.Editor.ModalManage.events.push(xaop.begin(app.Editor.ModalManage, app.Editor.ModalManage.OnKeyDown, (e: KeyboardEvent) => { if (e.keyCode === KeyBoard.Enter || e.keyCode === KeyBoard.Space) { @@ -51,7 +51,7 @@ export class DrillModal extends React.Component<{ store?: DrillStore }, {}> { private saveAndDrilling = () => { userConfigStore.SaveConfig(BoardModalType.Dr, this.props.store); - app.m_Editor.m_ModalManage.Clear(); + app.Editor.ModalManage.Clear(); commandMachine.ExecCommand('PZ'); } componentWillMount() @@ -77,7 +77,7 @@ export class DrillModal extends React.Component<{ store?: DrillStore }, {}> { minimal icon="cross" className={Classes.DIALOG_CLOSE_BUTTON} - onClick={() => app.m_Editor.m_ModalManage.Clear()} + onClick={() => app.Editor.ModalManage.Clear()} />
@@ -328,12 +328,12 @@ export class DrillModal extends React.Component<{ store?: DrillStore }, {}> {
diff --git a/src/UI/Components/Board/SpecialBoardModal.tsx b/src/UI/Components/Board/SpecialBoardModal.tsx index 15cd52ac7..89607d2c2 100644 --- a/src/UI/Components/Board/SpecialBoardModal.tsx +++ b/src/UI/Components/Board/SpecialBoardModal.tsx @@ -34,7 +34,7 @@ export class SpecialShapeBoardModal extends React.Component<{ store?: SpecialSha

板件属性

@@ -79,13 +79,13 @@ export class SpecialShapeBoardModal extends React.Component<{ store?: SpecialSha text="确定" onClick={async () => { - app.m_Editor.m_ModalManage.Clear() - await app.m_Editor.m_ModalManage.ExecCmd(); - app.m_Editor.m_ModalManage.EndCmd(); + app.Editor.ModalManage.Clear() + await app.Editor.ModalManage.ExecCmd(); + app.Editor.ModalManage.EndCmd(); }} />