清理无用的代码. 分离选择器控制组件

src/Common/KeyEnum.ts

@@ -0,0 +1,7 @@
+//鼠标类型
+export enum MouseKey
+{
+    Left = 0,
+    Middle = 1,
+    Right = 2,
+}

src/Editor/CameraControls.ts

@@ -4,6 +4,7 @@ import { Viewer } from '../GraphicsSystem/Viewer';
 import { ed, MouseMove } from '../ApplicationServices/Application';
 import { PlaneExt } from '../Geometry/Plane';
 import { Line3 } from 'three';
+import { MouseKey } from '../Common/KeyEnum';
 
 //控制类型
 enum CameraControlsEnabled
@@ -20,12 +21,6 @@ enum State
 }
 
 
-enum ButtonKey
-{
-    Left = 0,
-    Middle = 1,
-    Right = 2,
-}
 
 export class CameraControls
 {
@@ -71,11 +66,11 @@ export class CameraControls
     onMouseDown = (event: MouseEvent) =>
     {
         event.preventDefault();
-        let key: ButtonKey = event.button;
+        let key: MouseKey = event.button;
         this.m_StartChickPoint.set(event.offsetX, event.offsetY, 0);
         switch (key)
         {
-            case ButtonKey.Left:
+            case MouseKey.Left:
                 {
                     if (!this.m_SelectIng)
                     {
@@ -86,30 +81,11 @@ export class CameraControls
                     else
                     {
                         ed.m_SelectCss.Hide()
-
-                        // let subVec = new THREE.Vector3(event.clientX - event.offsetX, event.clientY - event.offsetY, 0)
-                        // let startPt = new THREE.Vector3(Math.min(ed.m_SelectCss.start.x, ed.m_SelectCss.end.x),
-                        //     Math.max(ed.m_SelectCss.start.y, ed.m_SelectCss.end.y),
-                        //     0
-                        // )
-                        // let endPt = new THREE.Vector3(Math.max(ed.m_SelectCss.start.x, ed.m_SelectCss.end.x),
-                        //     Math.min(ed.m_SelectCss.start.y, ed.m_SelectCss.end.y),
-                        //     0
-                        // )
-                        // startPt.sub(subVec)
-                        // endPt.sub(subVec)
-                        // this.m_Viewer.ScreenToWorld(startPt)
-                        // this.m_Viewer.ScreenToWorld(endPt)
-
-                        // ed.SelectWindow(startPt, endPt)
-
-                        // let line = new Line(startPt, endPt)
-                        // db.appendEntity(line)
                     }
                     this.m_SelectIng = !this.m_SelectIng;
                     break;
                 }
-            case ButtonKey.Middle:
+            case MouseKey.Middle:
                 {
                     if (this["Shift"])
                     {
@@ -121,7 +97,7 @@ export class CameraControls
                     }
                     break;
                 }
-            case ButtonKey.Right:
+            case MouseKey.Right:
                 {
                     break;
                 }

src/Editor/DebugDatUi.ts

@@ -40,15 +40,15 @@ export class DebugDatUi
         var func =
             (value: any) =>
             {
-                let ent: Entity = ApplicationService.Application.m_Database.m_EntityCollection[0];
-                if (ent instanceof Line)
-                {
-                    ent.setStartPoint(new THREE.Vector3(this.linex, this.liney, this.linez));
-                    ApplicationService.Application.m_Viewer.m_bIsChange = true;
-                }
-                let ent2: Entity = ApplicationService.Application.m_Database.m_EntityCollection[1];
-                ent2.m_ThreeObj.position.setX(value);
-                ent2.m_ThreeObj.position.set(this.linex, this.liney, this.linez);
+                // let ent: Entity = ApplicationService.Application.m_Database.m_EntityCollection[0];
+                // if (ent instanceof Line)
+                // {
+                //     ent.setStartPoint(new THREE.Vector3(this.linex, this.liney, this.linez));
+                //     ApplicationService.Application.m_Viewer.m_bIsChange = true;
+                // }
+                // let ent2: Entity = ApplicationService.Application.m_Database.m_EntityCollection[1];
+                // ent2.m_ThreeObj.position.setX(value);
+                // ent2.m_ThreeObj.position.set(this.linex, this.liney, this.linez);
             }
         var yCtrl = this.m_Ctrl_UI.add(this, "liney")
         var zCtrl = this.m_Ctrl_UI.add(this, "linez")

src/Editor/SelectControls.ts

@@ -0,0 +1,41 @@
+import { Viewer } from '../GraphicsSystem/Viewer';
+
+
+
+export class SelectControls
+{
+    m_Viewer: Viewer
+    m_SelectIng: boolean = false;
+    constructor(ed: Viewer)
+    {
+        this.m_Viewer = ed;
+    }
+    RegisterEvent()
+    {
+        if (this.m_Viewer)
+        {
+            let el = this.m_Viewer.m_HtmlElement;
+            el.addEventListener("click", this.onMouseClick, false)
+            el.addEventListener("mousemove", this.onMouseMove, false)
+        }
+    }
+    onMouseClick = () =>
+    {
+        this.m_SelectIng = !this.m_SelectIng;
+
+        if (!this.m_SelectIng)
+        {
+            // ed.m_SelectCss.SetStart(event.clientX, event.clientY)
+            // ed.m_SelectCss.SetEnd(event.clientX, event.clientY)
+            // ed.m_SelectCss.Show()
+        }
+        else
+        {
+            // ed.m_SelectCss.Hide()
+        }
+    }
+    onMouseMove = () =>
+    {
+        // ed.m_SelectCss.SetEnd(event.clientX, event.clientY)
+    }
+}

src/GraphicsSystem/Camera.ts

@@ -6,7 +6,6 @@ import { Viewer } from "./Viewer";
 import { Line, Solid3d } from "../DatabaseServices/Entity";
 import { CoordinateSystem } from '../Geometry/CoordinateSystem';
 import { OBB } from '../Geometry/OBB/obb';
-// import { UiManage } from '../UI/UIManage';
 import { PlaneExt } from '../Geometry/Plane';
 import { Line3 } from 'three';
 import { ed, db, MouseMove } from '../ApplicationServices/Application';
@@ -70,6 +69,3 @@ export class Camera
         }
     }
 }
-
-
-