diff --git a/src/Add-on/Offset.ts b/src/Add-on/Offset.ts index 2d62f30d5..7a820d85d 100644 --- a/src/Add-on/Offset.ts +++ b/src/Add-on/Offset.ts @@ -75,6 +75,9 @@ export class Command_Offset implements Command async GetOffsetDir(cu: Curve): Promise { let oldDir = 0; + + let oldSnap = app.m_Editor.m_GetpointServices.snapServices.m_Disabled; + app.m_Editor.m_GetpointServices.snapServices.m_Disabled = true; let ptRes = await app.m_Editor.GetPoint({ Msg: "指定要偏移的那一侧的点", Callback: (p: Vector3) => @@ -89,6 +92,7 @@ export class Command_Offset implements Command } } }); + app.m_Editor.m_GetpointServices.snapServices.m_Disabled = oldSnap; let status = { Status: ptRes.Status, offsetDist: 0 }; if (ptRes.Status === PromptStatus.OK) { diff --git a/src/Add-on/SwitchPass.ts b/src/Add-on/SwitchPass.ts deleted file mode 100644 index 45167fcf8..000000000 --- a/src/Add-on/SwitchPass.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { app } from '../ApplicationServices/Application'; -import { Command } from '../Editor/CommandMachine'; - - - -export class Command_SwitchPass implements Command -{ - async exec() - { - app.m_Viewer.m_bUsePass = !app.m_Viewer.m_bUsePass; - } -} diff --git a/src/Editor/CommandRegister.ts b/src/Editor/CommandRegister.ts index 77b1993a3..da3c3a674 100644 --- a/src/Editor/CommandRegister.ts +++ b/src/Editor/CommandRegister.ts @@ -62,7 +62,6 @@ import { Command_Ssget } from '../Add-on/ssget'; import { Stretch } from '../Add-on/Stretch'; import { Sweep } from '../Add-on/Sweep'; import { Command_SwitchCamera } from '../Add-on/SwitchCamera'; -import { Command_SwitchPass } from '../Add-on/SwitchPass'; // import { DrawFloor } from '../Add-on/DrawFloor'; // import { RevTarget, SaveTarget } from '../Add-on/RenderTarget'; import { TestIntersect } from '../Add-on/test/testIntersect'; @@ -99,7 +98,6 @@ export function registerCommand() commandMachine.RegisterCommand("fl", new DrawFloor()) commandMachine.RegisterCommand("cc", new Command_SwitchCamera()) - commandMachine.RegisterCommand("p", new Command_SwitchPass()) commandMachine.RegisterCommand("e", new Command_Erase()) diff --git a/src/Editor/GetPointServices.ts b/src/Editor/GetPointServices.ts index 6dfbd46fd..1f477973f 100644 --- a/src/Editor/GetPointServices.ts +++ b/src/Editor/GetPointServices.ts @@ -128,13 +128,13 @@ export class GetPointServices implements EditorService try { prompt.Callback(this.curPoint); + app.m_Editor.UpdateScreen(); } catch (error) { app.m_Editor.Prompt("动态拾取点回调错误!"); console.log(error); } - app.m_Editor.UpdateScreen(); })); } } diff --git a/src/Editor/TranstrolControl/TransformServices.ts b/src/Editor/TranstrolControl/TransformServices.ts index 3ff0462e7..294d2adc4 100644 --- a/src/Editor/TranstrolControl/TransformServices.ts +++ b/src/Editor/TranstrolControl/TransformServices.ts @@ -81,7 +81,6 @@ export class TransformServicess implements EditorService { app.m_Database.hm.StartCmd("_move"); - app.m_Viewer.m_bUsePass = false; app.m_Viewer.m_GripScene.visible = false; let newEns: { old: Entity, new: Entity }[] = this.m_Ents.map(e => { @@ -123,7 +122,6 @@ export class TransformServicess implements EditorService } app.m_Viewer.m_GripScene.visible = true; - app.m_Viewer.m_bUsePass = true; commandMachine.CommandEnd("_move"); } return true; diff --git a/src/GraphicsSystem/Viewer.ts b/src/GraphicsSystem/Viewer.ts index c43609101..3c11fc0a2 100644 --- a/src/GraphicsSystem/Viewer.ts +++ b/src/GraphicsSystem/Viewer.ts @@ -158,7 +158,10 @@ export class Viewer } Render() { - this.m_Composer.render(); + if (this.m_bUsePass) + this.m_Composer.render(); + else + this.m_Render.render(this.Scene, this.Camera); } ScreenToWorld(pt: THREE.Vector3, planVec?: THREE.Vector3) diff --git a/src/UI/Components/Panel.tsx b/src/UI/Components/Panel.tsx index 245251b96..f45cffd1c 100644 --- a/src/UI/Components/Panel.tsx +++ b/src/UI/Components/Panel.tsx @@ -153,6 +153,14 @@ export class DownPanel extends React.Component<{ store?: DownPanelStore }, {}> }} style={{ float: "right", marginRight: "10px" }} className="bp3-align-right" /> + + { + this.props.store.usePass = e.currentTarget.checked; + }} + style={{ float: "right", marginRight: "10px" }} + className="bp3-align-right" /> ) } } diff --git a/src/UI/Store/DownPanelStore.ts b/src/UI/Store/DownPanelStore.ts index 0a779d4bc..100264054 100644 --- a/src/UI/Store/DownPanelStore.ts +++ b/src/UI/Store/DownPanelStore.ts @@ -21,6 +21,7 @@ export class DownPanelStore @observable useDynInput: boolean = true; @observable showToolBar: boolean = true; @observable useDynSnap: boolean = true; + @observable usePass: boolean = true; private constructor() { xaop.begin(app.m_Editor.m_MouseCtrl, app.m_Editor.m_MouseCtrl.updateWordPoint, () => @@ -30,6 +31,7 @@ export class DownPanelStore autorun(() => { app.m_Editor.m_GetpointServices.snapServices.m_Disabled = !this.useDynSnap; + app.m_Viewer.m_bUsePass = this.usePass; }); }