!103 加入亮显开关

Merge pull request !103 from ChenX/getpoint_callback_op

src/Add-on/Offset.ts

@@ -75,6 +75,9 @@ export class Command_Offset implements Command
     async GetOffsetDir(cu: Curve): Promise<GetOffsetStatus>
     {
         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)
         {

src/Add-on/SwitchPass.ts

@@ -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;
-    }
-}

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())
 

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();
             }));
         }
     }

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;

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)

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" />
+                <Switch
+                    checked={this.props.store.usePass}
+                    label="亮显" onChange={e =>
+                    {
+                        this.props.store.usePass = e.currentTarget.checked;
+                    }}
+                    style={{ float: "right", marginRight: "10px" }}
+                    className="bp3-align-right" />
             </div>)
     }
 }

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;
         });
     }