更改:将鼠标中键的双击间隔改成250ms(于系统默认时间间隔类型)

src/Add-on/DrawExtrude.ts

@@ -68,7 +68,7 @@ export class DrawExtrude implements Command
         let radRes = await app.Editor.GetDistance({
             Msg: "请输入走刀半径",
             Default: 3,
-        })
+        });
 
         if (radRes.Status !== PromptStatus.OK) return;
         en.KnifeRadius = radRes.Distance;
@@ -86,7 +86,7 @@ export class DrawExtrude implements Command
         vZero = vZero.setY(app.Viewer.Height - vZero.y);
         vNor.sub(vZero);
 
-        let curPt = app.Editor.MouseCtrl.m_CurMousePointVCS.clone();
+        let curPt = app.Editor.MouseCtrl._CurMousePointVCS.clone();
         curPt = curPt.setY(app.Viewer.Height - curPt.y);
 
         let vBasePt = app.Viewer.WorldToScreen(basePt.clone()).setZ(0);

src/Add-on/Entsel.ts

@@ -21,7 +21,7 @@ export class Entsel implements Command
                 if (res.Status == PromptStatus.OK)
                 {
                     dyn.Visible = true;
-                    let vcs = app.Editor.MouseCtrl.m_CurMousePointVCS.clone();
+                    let vcs = app.Editor.MouseCtrl._CurMousePointVCS.clone();
                     vcs.add(new Vector3(0, -20, 0));
                     dyn.SetPostion(vcs);
 
@@ -71,7 +71,7 @@ export class Entsel implements Command
                         for (let p of pts)
                             p.applyMatrix4(cs).applyMatrix4(dcs);
 
-                        let vcs = app.Editor.MouseCtrl.m_CurMousePointVCS;
+                        let vcs = app.Editor.MouseCtrl._CurMousePointVCS;
 
                         let line = new Line();
                         let dists = lines.map((p1p2: number[]) =>

src/Add-on/TestPointPickParse.ts

@@ -13,7 +13,7 @@ export class Command_TestPointPickParse implements Command
             let ptRes = await app.Editor.GetPoint();
             if (ptRes.Status === PromptStatus.OK)
             {
-                let parse = new PointSelectBoards(app.Editor.MouseCtrl.m_CurMousePointVCS, app.Viewer, app.Viewer.Scene.children);
+                let parse = new PointSelectBoards(app.Editor.MouseCtrl._CurMousePointVCS, app.Viewer, app.Viewer.Scene.children);
                 for (let br of parse.SelectBoards)
                     br.ColorIndex = color % 7 + 1;
                 color++;

src/Add-on/ViewChange.ts

@@ -1,7 +1,6 @@
 import { Matrix4, Vector3 } from "three";
 import { app } from '../ApplicationServices/Application';
 import { Command } from "../Editor/CommandMachine";
-import { Orbit } from "../Geometry/Orbit";
 
 export class ViewChange implements Command
 {

src/Add-on/closetest.ts

@@ -56,7 +56,7 @@ export class Command_ClosePt implements Command
                         if (cu instanceof Polyline)
                         {
                             dyn.Visible = true;
-                            let vcs = app.Editor.MouseCtrl.m_CurMousePointVCS.clone();
+                            let vcs = app.Editor.MouseCtrl._CurMousePointVCS.clone();
                             vcs.add(new Vector3(0, -20, 0));
                             dyn.SetPostion(vcs);
 

src/Editor/CameraControls.ts

@@ -227,7 +227,7 @@ export class CameraControls
                     let curTime = Date.now();
                     let t = curTime - this.lastMiddleClickTime;
                     this.lastMiddleClickTime = curTime;
-                    if (t < 350)
+                    if (t < 250)
                     {
                         this.Viewer.ZoomAll();
                         return;

src/Editor/DbClick/DbClick.ts

@@ -33,7 +33,7 @@ export class DbClickManager extends Singleton
 {
     OnDbClick = async () =>
     {
-        let pickObj = PointPickOneObject(app.Editor.MouseCtrl.m_CurMousePointVCS, app.Viewer, { filterErase: true });
+        let pickObj = PointPickOneObject(app.Editor.MouseCtrl._CurMousePointVCS, app.Viewer, { filterErase: true });
         let pickEnt = GetEntity(pickObj);
         if (!pickEnt)
             return;
@@ -94,7 +94,7 @@ export class DbClickManager extends Singleton
                     let o = new Object3D();
                     let pickent = pickEnt as AlignedDimension;
                     o.userData.Entity = pickent.Text;
-                    textarea.StartEditorText(o, app.Editor.MouseCtrl.m_CurMousePointClient);
+                    textarea.StartEditorText(o, app.Editor.MouseCtrl._CurMousePointClient);
                     await textarea.Wait();
                     pickent.TextString = o.userData.Entity.TextString;
                     delete o.userData.Entity;
@@ -141,7 +141,7 @@ export class DbClickManager extends Singleton
             for (let p of pts)
                 p.applyMatrix4(cs).applyMatrix4(dcs);
 
-            let vcs = app.Editor.MouseCtrl.m_CurMousePointVCS;
+            let vcs = app.Editor.MouseCtrl._CurMousePointVCS;
 
             let line = new Line();
             let dists = lines.map((p1p2: number[]) =>

src/Editor/Editor.ts

@@ -77,7 +77,7 @@ export class Editor
         xaop.end(this.MouseCtrl, this.MouseCtrl.onMouseMove, () =>
         {
             app.Viewer.PreViewer.Cursor.Position
-                = app.Viewer.PreViewer.ScreenPointToViewerPoint(this.MouseCtrl.m_CurMousePointVCS.clone());
+                = app.Viewer.PreViewer.ScreenPointToViewerPoint(this.MouseCtrl._CurMousePointVCS.clone());
         });
         this.UcsServices = new UCSServices(this);
         this.transCtrl = new TransformServicess(this);
@@ -115,8 +115,8 @@ export class Editor
     set UCSMatrix(m: Matrix4)
     {
         this.UcsServices.UCSMatrix = m;
-        this.MouseCtrl.m_CurMousePointWCS.copy(this.MouseCtrl.m_CurMousePointVCS);
-        this.App.Viewer.ScreenToWorld(this.MouseCtrl.m_CurMousePointWCS);
+        this.MouseCtrl._CurMousePointWCS.copy(this.MouseCtrl._CurMousePointVCS);
+        this.App.Viewer.ScreenToWorld(this.MouseCtrl._CurMousePointWCS);
     }
     SetUCSLookAt(viewDir: Vector3)
     {

src/Editor/GetDistanceServices.ts

@@ -36,7 +36,7 @@ export class GetDistanceServices
                         NotShowDynPrompt: true,
                         Callback: (p) =>
                         {
-                            dynInput.SetPostion(app.Editor.MouseCtrl.m_CurMousePointVCS);
+                            dynInput.SetPostion(app.Editor.MouseCtrl._CurMousePointVCS);
                         }
                     });
                 if (ptRes.Status == PromptStatus.OK)
@@ -66,7 +66,7 @@ export class GetDistanceServices
                     let midp = midPoint(p1, p);
                     app.Viewer.WorldToScreen(midp);
 
-                    dynInput.SetPostion(app.Editor.MouseCtrl.m_CurMousePointVCS);
+                    dynInput.SetPostion(app.Editor.MouseCtrl._CurMousePointVCS);
                     dynInput.ValuePostion = midp;
 
                     if (prompt.CalcDistance)

src/Editor/GetEntityServices.ts

@@ -73,7 +73,7 @@ export class GetEntityServices implements EditorService
                     if (selectObj && IsEntity(selectObj))
                         ret.Entity = GetEntity(selectObj);
                     ret.Object = selectObj;
-                    ret.Point = this._Editor.MouseCtrl.m_CurMousePointWCS.clone();
+                    ret.Point = this._Editor.MouseCtrl._CurMousePointWCS.clone();
                     ret.Status = ret.Entity ? PromptStatus.OK : PromptStatus.None;
                     this.Retun(ret);
                     return;
@@ -217,19 +217,19 @@ export class GetEntityServices implements EditorService
         this.removeCalls.push(() => { dyn.Destroy(); });
         this.removeCalls.push(end(mouseCtrl, mouseCtrl.onMouseMove, () =>
         {
-            dyn.SetPostion(mouseCtrl.m_CurMousePointVCS);
+            dyn.SetPostion(mouseCtrl._CurMousePointVCS);
         }));
-        dyn.SetPostion(mouseCtrl.m_CurMousePointVCS);
+        dyn.SetPostion(mouseCtrl._CurMousePointVCS);
     }
 
     private PickEntity(): PromptEntityResult
     {
-        let pickObj = PointPickOneObject(this._Editor.MouseCtrl.m_CurMousePointVCS, this.m_Viewer, this.prompt.Filter);
+        let pickObj = PointPickOneObject(this._Editor.MouseCtrl._CurMousePointVCS, this.m_Viewer, this.prompt.Filter);
         let ret = new PromptEntityResult();
         if (pickObj && IsEntity(pickObj))
             ret.Entity = GetEntity(pickObj);
         ret.Object = pickObj;
-        ret.Point = this._Editor.MouseCtrl.m_CurMousePointWCS.clone();
+        ret.Point = this._Editor.MouseCtrl._CurMousePointWCS.clone();
         ret.Status = ret.Entity ? PromptStatus.OK : PromptStatus.None;
         return ret;
     }

src/Editor/GetKeyWordService.tsx

@@ -68,11 +68,11 @@ export class GetKeyWordsServices implements EditorService
     {
         let menuHeight = this.keywordList.length * MENU_ITEM_HEIGHT + MENU_PADDING;
 
-        if (this.ed.MouseCtrl.m_CurMousePointClient.y > window.innerHeight - menuHeight)
-            this.mousePositionY = this.ed.MouseCtrl.m_CurMousePointClient.y - menuHeight;
+        if (this.ed.MouseCtrl._CurMousePointClient.y > window.innerHeight - menuHeight)
+            this.mousePositionY = this.ed.MouseCtrl._CurMousePointClient.y - menuHeight;
         else
-            this.mousePositionY = this.ed.MouseCtrl.m_CurMousePointClient.y;
-        this.mousePositionX = this.ed.MouseCtrl.m_CurMousePointClient.x;
+            this.mousePositionY = this.ed.MouseCtrl._CurMousePointClient.y;
+        this.mousePositionX = this.ed.MouseCtrl._CurMousePointClient.x;
     }
 
     async Start(prompt: GetKeyWordPrommpt): Promise<PromptResult>

src/Editor/GetPointServices.ts

@@ -158,7 +158,7 @@ export class GetPointServices implements EditorService
     //更新当前点事件,统一使用该方法注入其他服务的更新(aop在此方法中注入)
     UpdateCurPointEvent()
     {
-        let wcs = app.Editor.MouseCtrl.m_CurMousePointWCS;
+        let wcs = app.Editor.MouseCtrl._CurMousePointWCS;
         let snapP = this.snapServices.GetSnapPoint();
         if (snapP)
         {
@@ -373,7 +373,7 @@ export class GetPointServices implements EditorService
                 }
             }
 
-            dynPrompt.SetPostion(app.Editor.MouseCtrl.m_CurMousePointVCS);
+            dynPrompt.SetPostion(app.Editor.MouseCtrl._CurMousePointVCS);
             dynPrompt.Value = this.curPoint;
 
             if (DynamicInputManage.GetManage().IsLockIng && dynPrompt?.Value?.toArray().every(e => !isNaN(e)))

src/Editor/GetSelectionServices.ts

@@ -57,7 +57,7 @@ export class SsgetServiecs
                         {
                             if (prompt.Callback)
                             {
-                                let ssEnt = new SelectPick(this._Editor.App.Viewer, this._Editor.MouseCtrl.m_CurMousePointVCS);
+                                let ssEnt = new SelectPick(this._Editor.App.Viewer, this._Editor.MouseCtrl._CurMousePointVCS);
                                 if (res.Entity)
                                     ssEnt._SelectList.add(res.Entity.DrawObject);
                                 let set = new SelectSet();
@@ -91,7 +91,7 @@ export class SsgetServiecs
                             }
                         case PromptStatus.OK:
                             {
-                                let select = new SelectPick(this._Editor.App.Viewer, this._Editor.MouseCtrl.m_CurMousePointVCS);
+                                let select = new SelectPick(this._Editor.App.Viewer, this._Editor.MouseCtrl._CurMousePointVCS);
                                 select._SelectList.add(enRes.Object);
                                 if (this._Editor.KeyCtrl.KeyIsDown(KeyCode.ShiftLeft))
                                     this._Editor.SelectCtrl.RemoveSelect(select);

src/Editor/GripDragServices.ts

@@ -93,7 +93,7 @@ export class GripDragServices implements EditorService
                         let ptV = ptW.clone();
                         app.Viewer.WorldToScreen(ptV);
 
-                        if (SnapPoint(ptV, this.mouseCtrl.m_CurMousePointVCS, this.SnapSize))
+                        if (SnapPoint(ptV, this.mouseCtrl._CurMousePointVCS, this.SnapSize))
                             arr.push(i);
                     }
                     if (arr.length > 0)
@@ -200,7 +200,7 @@ export class GripDragServices implements EditorService
         if (this.lastSnapPoint)
         {
             let lastVcs = app.Viewer.WorldToScreen(this.lastSnapPoint.clone());
-            if (SnapPoint(this.mouseCtrl.m_CurMousePointVCS, lastVcs, this.SnapSize))
+            if (SnapPoint(this.mouseCtrl._CurMousePointVCS, lastVcs, this.SnapSize))
                 return;
         }
 
@@ -225,7 +225,7 @@ export class GripDragServices implements EditorService
                     let ptW = pts[i];
                     let ptV = app.Viewer.WorldToScreen(ptW.clone());
 
-                    if (SnapPoint(this.mouseCtrl.m_CurMousePointVCS, ptV, this.SnapSize))
+                    if (SnapPoint(this.mouseCtrl._CurMousePointVCS, ptV, this.SnapSize))
                     {
                         this.lastSnapPoint = ptW;
                         return;

src/Editor/MouseControls.ts

@@ -8,18 +8,18 @@ import { Editor } from './Editor';
 
 export class MouseControls
 {
-    m_CurMousePointClient: Vector3 = new Vector3();
+    _CurMousePointClient: Vector3 = new Vector3();
     //当前鼠标的位置 屏幕
-    m_CurMousePointVCS: Vector3 = new Vector3();
+    _CurMousePointVCS: Vector3 = new Vector3();
     //世界坐标系
-    m_CurMousePointWCS: Vector3 = new Vector3();
-    constructor(public viewer: Viewer, public editor: Editor)
+    _CurMousePointWCS: Vector3 = new Vector3();
+    constructor(public _Viewer: Viewer, public _Editor: Editor)
     {
         this.RegisterEvent();
     }
     private RegisterEvent()
     {
-        let el = this.viewer.Renderer.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);
@@ -58,9 +58,9 @@ export class MouseControls
     }
     updateWordPoint = (e: MouseEvent) =>
     {
-        this.m_CurMousePointClient.set(e.clientX, e.clientY, 0);
-        this.m_CurMousePointVCS.set(e.offsetX, e.offsetY, 0);
-        this.m_CurMousePointWCS.copy(this.m_CurMousePointVCS);
-        this.viewer.ScreenToWorld(this.m_CurMousePointWCS);
+        this._CurMousePointClient.set(e.clientX, e.clientY, 0);
+        this._CurMousePointVCS.set(e.offsetX, e.offsetY, 0);
+        this._CurMousePointWCS.copy(this._CurMousePointVCS);
+        this._Viewer.ScreenToWorld(this._CurMousePointWCS);
     };
 }

src/Editor/SelectControls.ts

@@ -130,7 +130,7 @@ export class SelectControls implements EditorService
      */
     LeftClick(checkPick = true)
     {
-        let pt = this._Editor.MouseCtrl.m_CurMousePointVCS;
+        let pt = this._Editor.MouseCtrl._CurMousePointVCS;
         let isRemove = app.Editor.KeyCtrl.KeyIsDown(KeyCode.ShiftLeft);
         //如果还没选择 那么
         if ((this._Editor.InputState & InputState.SelectIng) === InputState.None)
@@ -151,7 +151,7 @@ export class SelectControls implements EditorService
                 }
             }
 
-            this._FirstPickPoint = app.Editor.MouseCtrl.m_CurMousePointWCS.clone();
+            this._FirstPickPoint = app.Editor.MouseCtrl._CurMousePointWCS.clone();
 
             this._Editor.InputState = InputState.SelectIng;
             app.Viewer.PreViewer.Cursor.Mode = CursorMode.GetPoint;
@@ -191,7 +191,7 @@ export class SelectControls implements EditorService
     {
         if (this._Editor.InputState === InputState.SelectIng)
         {
-            let pt = this._Editor.MouseCtrl.m_CurMousePointVCS;
+            let pt = this._Editor.MouseCtrl._CurMousePointVCS;
             this._SelectCss.SetEnd(pt.x, pt.y);
         }
     }

src/Editor/SnapServices.ts

@@ -212,8 +212,8 @@ export class SnapServices
         if (this.SnapModeEnable & ObjectSnapMode.NotEntitySnap)
             return;
 
-        let vcsP = app.Editor.MouseCtrl.m_CurMousePointVCS.setZ(0);
-        let wcsP = app.Editor.MouseCtrl.m_CurMousePointWCS;
+        let vcsP = app.Editor.MouseCtrl._CurMousePointVCS.setZ(0);
+        let wcsP = app.Editor.MouseCtrl._CurMousePointWCS;
 
         let baseP = this.m_HasBasePoint ? this.m_SupportSnapPoints[0].Point : undefined;
 
@@ -441,7 +441,7 @@ export class SnapServices
      */
     private AxisSnap(supportSnapPt: SupportSnapPoint, isFirst = false): SnapAxis
     {
-        if (equalv3(supportSnapPt.Point, app.Editor.MouseCtrl.m_CurMousePointWCS))
+        if (equalv3(supportSnapPt.Point, app.Editor.MouseCtrl._CurMousePointWCS))
             return;
 
         let allowMouseDistSq = 100;//允许鼠标距离Sq
@@ -453,7 +453,7 @@ export class SnapServices
                 allowMouseDistSq = Infinity;
         }
 
-        let nowVCS = app.Editor.MouseCtrl.m_CurMousePointVCS;
+        let nowVCS = app.Editor.MouseCtrl._CurMousePointVCS;
 
         let minP: Vector3;
         let minDist = Infinity;
@@ -569,7 +569,7 @@ export class SnapServices
         if (snapAxisList.length === 0)
             return;
 
-        let nowVCS = app.Editor.MouseCtrl.m_CurMousePointVCS;
+        let nowVCS = app.Editor.MouseCtrl._CurMousePointVCS;
 
         //检测交点
         let axisIntersectList: SnapIntersect[] = [];

src/Editor/TranstrolControl/TransformServices.ts

@@ -53,7 +53,7 @@ export class TransformServicess implements EditorService
                 return;
             axes.Rest();
 
-            let obj = PointPickOneObject(ed.MouseCtrl.m_CurMousePointVCS, preView, undefined, axes.children);
+            let obj = PointPickOneObject(ed.MouseCtrl._CurMousePointVCS, preView, undefined, axes.children);
             if (obj)
             {
                 let type = obj.userData.Axis as AxisType;

src/Geometry/SpaceParse/PointSelectSpace.ts

@@ -174,7 +174,7 @@ export class PointSelectSpace
     private async PointParseSpace(isDynamic = false)
     {
         let view = app.Viewer;
-        let vcs = app.Editor.MouseCtrl.m_CurMousePointVCS;
+        let vcs = app.Editor.MouseCtrl._CurMousePointVCS;
 
         let visualBoxPick = PointPickOneObject(vcs, view, { filterFunction: (o, e) => FilterVisualSpaceBox(e) });
         if (visualBoxPick)

src/UI/Components/Modal/CadModal.tsx

@@ -258,7 +258,7 @@ export class CADModal
         }
         else if (pos === ModalPosition.Mouse)
         {
-            let mousePos = app.Editor.MouseCtrl.m_CurMousePointVCS;
+            let mousePos = app.Editor.MouseCtrl._CurMousePointVCS;
             container.style.left = mousePos.x + 50 + "px";
             container.style.top = mousePos.y - container.clientHeight + "px";
         }

src/UI/Store/DownPanelStore.ts

@@ -42,7 +42,7 @@ export class DownPanelStore extends Singleton
 
         xaop.begin(app.Editor.MouseCtrl, app.Editor.MouseCtrl.updateWordPoint, () =>
         {
-            this.posEl.innerText = PointToString(app.Editor.MouseCtrl.m_CurMousePointWCS);
+            this.posEl.innerText = PointToString(app.Editor.MouseCtrl._CurMousePointWCS);
         });
         autorun(() =>
         {