@cornerstonejs/core 3.12.0 → 3.12.1

package/dist/esm/RenderingEngine/StackViewport.js

@@ -42,6 +42,7 @@ import { Transform } from './helpers/cpuFallback/rendering/transform';
 import uuidv4 from '../utilities/uuidv4';
 import getSpacingInNormalDirection from '../utilities/getSpacingInNormalDirection';
 import getClosestImageId from '../utilities/getClosestImageId';
+import { adjustInitialViewUp } from '../utilities/adjustInitialViewUp';
 const EPSILON = 1;
 const log = coreLog.getLogger('RenderingEngine', 'StackViewport');
 class StackViewport extends Viewport {
@@ -128,12 +129,11 @@ class StackViewport extends Viewport {
             return viewport.rotation;
         };
         this.getRotationGPU = () => {
-            const { viewUp: currentViewUp, viewPlaneNormal, flipVertical, } = this.getCameraNoRotation();
-            const initialViewUp = flipVertical
-                ? vec3.negate(vec3.create(), this.initialViewUp)
-                : this.initialViewUp;
-            const initialToCurrentViewUpAngle = (vec3.angle(initialViewUp, currentViewUp) * 180) / Math.PI;
-            const initialToCurrentViewUpCross = vec3.cross(vec3.create(), initialViewUp, currentViewUp);
+            const { viewUp: currentViewUp, viewPlaneNormal, flipVertical, flipHorizontal, } = this.getCameraNoRotation();
+            const adjustedViewUp = adjustInitialViewUp(this.initialViewUp, flipHorizontal, flipVertical, viewPlaneNormal);
+            const angleRad = vec3.angle(adjustedViewUp, currentViewUp);
+            const initialToCurrentViewUpAngle = (angleRad * 180) / Math.PI;
+            const initialToCurrentViewUpCross = vec3.cross(vec3.create(), adjustedViewUp, currentViewUp);
             const normalDot = vec3.dot(initialToCurrentViewUpCross, viewPlaneNormal);
             return normalDot >= 0
                 ? initialToCurrentViewUpAngle
@@ -795,12 +795,10 @@ class StackViewport extends Viewport {
         const pan = this.getPan();
         const panSub = vec2.sub([0, 0], panFit, pan);
         this.setPan(panSub, false);
-        const { flipVertical } = this.getCamera();
-        const initialViewUp = flipVertical
-            ? vec3.negate(vec3.create(), this.initialViewUp)
-            : this.initialViewUp;
+        const { flipVertical, flipHorizontal, viewPlaneNormal } = this.getCamera();
+        const adjustedViewUp = adjustInitialViewUp(this.initialViewUp, flipHorizontal, flipVertical, viewPlaneNormal);
         this.setCameraNoEvent({
-            viewUp: initialViewUp,
+            viewUp: adjustedViewUp,
         });
         this.getVtkActiveCamera().roll(-rotation);
         const afterPan = this.getPan();

package/dist/esm/RenderingEngine/Viewport.js

@@ -949,9 +949,6 @@ class Viewport {
         if (pan) {
             this.setPan(vec2.scale([0, 0], pan, zoom));
         }
-        if (rotation >= 0) {
-            this.setRotation(rotation);
-        }
         if (flipHorizontal !== undefined &&
             flipHorizontal !== this.flipHorizontal) {
             this.flip({ flipHorizontal });
@@ -959,6 +956,9 @@ class Viewport {
         if (flipVertical !== undefined && flipVertical !== this.flipVertical) {
             this.flip({ flipVertical });
         }
+        if (rotation >= 0) {
+            this.setRotation(rotation);
+        }
     }
     _getCorners(bounds) {
         return [

package/dist/esm/utilities/adjustInitialViewUp.d.ts

@@ -0,0 +1,2 @@
+import type { Point3 } from '../types';
+export declare function adjustInitialViewUp(initialViewUp: Point3, flipHorizontal: boolean, flipVertical: boolean, viewPlaneNormal: Point3): Point3;

package/dist/esm/utilities/adjustInitialViewUp.js

@@ -0,0 +1,14 @@
+import { vec3 } from 'gl-matrix';
+import { reflectVector } from './reflectVector';
+export function adjustInitialViewUp(initialViewUp, flipHorizontal, flipVertical, viewPlaneNormal) {
+    let adjustedInitialViewUp = vec3.clone(initialViewUp);
+    if (flipVertical) {
+        vec3.negate(adjustedInitialViewUp, adjustedInitialViewUp);
+    }
+    if (flipHorizontal) {
+        const screenVerticalAxis = vec3.cross(vec3.create(), viewPlaneNormal, adjustedInitialViewUp);
+        vec3.normalize(screenVerticalAxis, screenVerticalAxis);
+        adjustedInitialViewUp = reflectVector(adjustedInitialViewUp, screenVerticalAxis);
+    }
+    return adjustedInitialViewUp;
+}

package/dist/esm/utilities/reflectVector.d.ts

@@ -0,0 +1,2 @@
+import { vec3 } from 'gl-matrix';
+export declare function reflectVector(v: vec3, normal: vec3): vec3;

package/dist/esm/utilities/reflectVector.js

@@ -0,0 +1,6 @@
+import { vec3 } from 'gl-matrix';
+export function reflectVector(v, normal) {
+    const dotProduct = vec3.dot(v, normal);
+    const scaledNormal = vec3.scale(vec3.create(), normal, 2 * dotProduct);
+    return vec3.sub(vec3.create(), v, scaledNormal);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/core",
-  "version": "3.12.0",
+  "version": "3.12.1",
   "description": "Cornerstone3D Core",
   "module": "./dist/esm/index.js",
   "types": "./dist/esm/index.d.ts",
@@ -91,5 +91,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "763786d4994c50236c5fe7f964546e758bdbe64d"
+  "gitHead": "1078f671cf67a8f38f561887940ac91b33756719"
 }