✨ feat: roll back the CameraController

Author: xiangechen

jest.config.js

@@ -6,6 +6,5 @@ module.exports = {
     moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
     moduleNameMapper: {
         threeRenderBuilder: "<rootDir>/packages/chili-three/test/threeRenderBuilder.ts",
-        "camera-controls": "<rootDir>/packages/chili-three/test/cameraControls.ts",
     },
 };

package-lock.json

@@ -0,0 +1,20 @@
+// Copyright 2022-2023 the Chili authors. All rights reserved. AGPL-3.0 license.
+
+import { IDisposable, IPropertyChanged } from "../foundation";
+import { XYZ, XYZLike } from "../math";
+
+export type CameraType = "perspective" | "orthographic";
+
+export interface ICameraController extends IPropertyChanged, IDisposable {
+    readonly cameraPosition: XYZ;
+    cameraType: CameraType;
+    fitContent(): void;
+    lookAt(eye: XYZLike, target: XYZLike, up: XYZLike): void;
+    pan(dx: number, dy: number): void;
+    startRotate(x: number, y: number): void;
+    rotate(dx: number, dy: number): void;
+    zoom(x: number, y: number, delta: number): void;
+    zoomIn(): void;
+    zoomOut(): void;
+    update(): void;
+}

packages/chili-core/src/visual/cameraController.ts

@@ -1,5 +1,6 @@
 // Copyright 2022-2023 the Chili authors. All rights reserved. AGPL-3.0 license.
 
+export * from "./cameraController";
 export * from "./cursorType";
 export * from "./detectedData";
 export * from "./eventHandler";

packages/chili-core/src/visual/index.ts

@@ -5,35 +5,23 @@ import { IDisposable, IPropertyChanged } from "../foundation";
 import { Plane, Ray, XY, XYZ } from "../math";
 import { INodeFilter, IShapeFilter } from "../selectionFilter";
 import { ShapeType } from "../shape";
+import { ICameraController } from "./cameraController";
 import { VisualShapeData } from "./detectedData";
 import { IVisualObject } from "./visualObject";
 
-export enum CameraType {
-    perspective,
-    orthographic,
-}
-
 export interface IView extends IPropertyChanged, IDisposable {
     readonly document: IDocument;
+    readonly cameraController: ICameraController;
     get isClosed(): boolean;
     name: string;
     workplane: Plane;
-    cameraType: CameraType;
-    cameraTarget: XYZ;
-    cameraPosition: XYZ;
-    onKeyDown(e: KeyboardEvent): void;
-    onKeyUp(e: KeyboardEvent): void;
     update(): void;
     up(): XYZ;
     toImage(): string;
     direction(): XYZ;
-    rotate(dx: number, dy: number): Promise<void>;
-    zoomIn(): Promise<void>;
-    zoomOut(): Promise<void>;
     rayAt(mx: number, my: number): Ray;
     screenToWorld(mx: number, my: number): XYZ;
     worldToScreen(point: XYZ): XY;
-    fitContent(): Promise<void>;
     resize(width: number, heigth: number): void;
     setDom(element: HTMLElement): void;
     close(): void;

packages/chili-core/src/visual/view.ts

@@ -11,6 +11,7 @@ import { IVisualContext } from "./visualContext";
 export interface IVisual extends IDisposable {
     readonly document: IDocument;
     readonly context: IVisualContext;
+    readonly viewHandler: IEventHandler;
     readonly highlighter: IHighlighter;
     update(): void;
     eventHandler: IEventHandler;

packages/chili-core/src/visual/visual.ts

@@ -5,7 +5,6 @@
     "main": "src/index.ts",
     "devDependencies": {
         "@types/three": "0.173.0",
-        "camera-controls": "^2.9.0",
         "chili-core": "*",
         "chili-vis": "*",
         "three": "0.173.0",