New mouse movement damping

mistic100 · Oct 12, 2024 · ae23e17 · ae23e17
1 parent 6e82414
commit ae23e17
Show file tree

Hide file tree

Showing 8 changed files with 107 additions and 161 deletions.
diff --git a/docs/guide/config.md b/docs/guide/config.md
@@ -279,10 +279,10 @@ requestHeaders: (url) => ({
 
 #### `moveInertia`
 
--   type: `boolean`
--   default: `true`
+-   type: `boolean | number`
+-   default: `0.8`
 
-Enabled smooth animation after a manual move.
+Applies damping to the camera movement, higher value mean stronger damping (`true` is default damping factor, `false` is not damping).
 
 #### `withCredentials`
 

diff --git a/examples/adapter-equirectangular.html b/examples/adapter-equirectangular.html
@@ -74,6 +74,7 @@
                 // mousewheelCtrlKey: true,
                 // moveSpeed: 2,
                 // zoomSpeed: 2,
+                // moveInertia: false,
                 keyboard: 'always',
                 navbar: [
                     'zoom',
@@ -129,6 +130,10 @@
                 },
             });
 
+            viewer.addEventListener('click', ({ data }) => {
+                console.log('click', data);
+            });
+
             window.viewer = viewer;
         </script>
     </body>

diff --git a/packages/core/src/data/config.ts b/packages/core/src/data/config.ts
@@ -31,7 +31,7 @@ export const DEFAULTS: Required<ParsedViewerConfig> = {
     sphereCorrection: null,
     moveSpeed: 1,
     zoomSpeed: 1,
-    moveInertia: true,
+    moveInertia: 0.8,
     mousewheel: true,
     mousemove: true,
     mousewheelCtrlKey: false,
@@ -153,6 +153,15 @@ export const CONFIG_PARSERS: ConfigParsers<ViewerConfig, ParsedViewerConfig> = {
         // maxFov between 1 and 179
         return MathUtils.clamp(maxFov, 1, 179);
     },
+    moveInertia: (moveInertia, { defValue }) => {
+        if (moveInertia === true) {
+            return defValue;
+        }
+        if (moveInertia === false) {
+            return 0;
+        }
+        return moveInertia;
+    },
     lang: (lang) => {
         return {
             ...DEFAULTS.lang,

diff --git a/packages/core/src/data/constants.ts b/packages/core/src/data/constants.ts
@@ -43,11 +43,6 @@ export const TWOFINGERSOVERLAY_DELAY = 100;
  */
 export const CTRLZOOM_TIMEOUT = 2000;
 
-/**
- * Duration of the mouse position history used to compute inertia
- */
-export const INERTIA_WINDOW = 300;
-
 /**
  * Radius of the SphereGeometry, Half-length of the BoxGeometry
  */

diff --git a/packages/core/src/model.ts b/packages/core/src/model.ts
@@ -352,8 +352,8 @@ export type ViewerConfig = {
     moveSpeed?: number;
     /** @default 1 */
     zoomSpeed?: number;
-    /** @default true */
-    moveInertia?: boolean;
+    /** @default 0.8 */
+    moveInertia?: boolean | number;
     /** @default true */
     mousewheel?: boolean;
     /** @default true */
@@ -386,6 +386,7 @@ export type ParsedViewerConfig = Omit<
     | 'plugins'
     | 'defaultYaw'
     | 'defaultPitch'
+    | 'moveInertia'
     | 'fisheye'
     | 'requestHeaders'
     | 'navbar'
@@ -395,6 +396,7 @@ export type ParsedViewerConfig = Omit<
     plugins?: Array<[PluginConstructor, any]>;
     defaultYaw?: number;
     defaultPitch?: number;
+    moveInertia?: number;
     fisheye?: number;
     requestHeaders?: (url: string) => Record<string, string>;
     navbar?: Array<string | NavbarCustomButton>;