🦄 refactor: remove CameraController

xiangechen · Jan 9, 2025 · 7acca05 · 7acca05
1 parent 75b403a
commit 7acca05
Show file tree

Hide file tree

Showing 21 changed files with 323 additions and 454 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -6,5 +6,6 @@ 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",
     },
 };
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/chili-core/src/visual/cameraController.ts b/packages/chili-core/src/visual/cameraController.ts
diff --git a/packages/chili-core/src/visual/index.ts b/packages/chili-core/src/visual/index.ts
@@ -1,6 +1,5 @@
 // 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";

diff --git a/packages/chili-core/src/visual/view.ts b/packages/chili-core/src/visual/view.ts
@@ -5,23 +5,35 @@ 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): void;
+    zoomIn(): void;
+    zoomOut(): void;
     rayAt(mx: number, my: number): Ray;
     screenToWorld(mx: number, my: number): XYZ;
     worldToScreen(point: XYZ): XY;
+    fitContent(): void;
     resize(width: number, heigth: number): void;
     setDom(element: HTMLElement): void;
     close(): void;

diff --git a/packages/chili-core/src/visual/visual.ts b/packages/chili-core/src/visual/visual.ts
@@ -11,7 +11,6 @@ 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;

diff --git a/packages/chili-three/package.json b/packages/chili-three/package.json
@@ -4,10 +4,11 @@
     "description": "",
     "main": "src/index.ts",
     "devDependencies": {
+        "@types/three": "0.172.0",
+        "camera-controls": "^2.9.0",
         "chili-core": "*",
         "chili-vis": "*",
-        "@types/three": "0.170.0",
-        "three": "0.171.0",
+        "three": "0.172.0",
         "three-mesh-bvh": "0.8.3"
     }
 }