fix scaling of plane geometries; fix incorrectly scaled matrix when transforms were changed

Author: philippotto

frontend/javascripts/viewer/geometries/plane.ts

@@ -61,7 +61,8 @@ class Plane {
   // Different baseRotations for each of the planes ensures that the planes stay orthogonal to each other.
   baseRotation: Euler;
   storePropertyUnsubscribers: Array<() => void> = [];
-  datasetScaleFactor: Vector3 = [1, 1, 1];
+  originalDatasetScaleFactor: Vector3 = [1, 1, 1];
+  transformedDatasetScaleFactor: Vector3 = [1, 1, 1];
 
   // Properties are only created here to avoid new creating objects for each setRotation call.
   baseRotationMatrix = new Matrix4();
@@ -169,7 +170,7 @@ class Plane {
     // Account for the dataset scale to match one world space coordinate to one dataset scale unit.
     const scaleVector: Vector3 = V3.multiply(
       [1 * xFactor, 1 * yFactor, 1],
-      this.datasetScaleFactor,
+      this.originalDatasetScaleFactor,
     );
     this.getMeshes().map((mesh) => mesh.scale.set(...scaleVector));
   }
@@ -195,10 +196,9 @@ class Plane {
     positionOffset: Vector3 = DEFAULT_POSITION_OFFSET,
   ): void => {
     // The world scaling by the dataset scale factor is inverted by the scene group
-
     // containing all planes to avoid sheering in anisotropic scaled datasets.
     // Thus, this scale needs to be applied manually to the position here.
-    const scaledPosition = V3.multiply(originalPosition, this.datasetScaleFactor);
+    const scaledPosition = V3.multiply(originalPosition, this.transformedDatasetScaleFactor);
     // The offset is in world space already so no scaling is necessary.
     const offsetPosition = V3.add(scaledPosition, positionOffset);
     this.TDViewBorders.position.set(...offsetPosition);
@@ -234,7 +234,25 @@ class Plane {
             storeState.dataset,
             storeState.datasetConfiguration.nativelyRenderedLayerName,
           ).factor,
-        (scaleFactor) => (this.datasetScaleFactor = scaleFactor),
+        (scaleFactor) => {
+          // todop / workaround so that setScale uses new factor
+          this.lastScaleFactors[0] = -1;
+          this.transformedDatasetScaleFactor = scaleFactor;
+        },
+        true,
+      ),
+      listenToStoreProperty(
+        (storeState) =>
+          getTransformedVoxelSize(
+            storeState.dataset,
+            storeState.datasetConfiguration.nativelyRenderedLayerName,
+            true,
+          ).factor,
+        (scaleFactor) => {
+          // todop / workaround so that setScale uses new factor
+          this.lastScaleFactors[0] = -1;
+          this.originalDatasetScaleFactor = scaleFactor;
+        },
         true,
       ),
     ];

frontend/javascripts/viewer/model/accessors/flycam_accessor.ts

@@ -198,8 +198,8 @@ export function _getMaximumZoomForAllMags(
 }
 
 // Only exported for testing.
-export const _getDummyFlycamMatrix = memoizeOne((scale: Vector3) => {
-  const scaleMatrix = getMatrixScale(scale);
+export const _getDummyFlycamMatrix = memoizeOne((voxelSize: Vector3) => {
+  const scaleMatrix = getMatrixScale(voxelSize);
   return rotateOnAxis(M4x4.scale(scaleMatrix, M4x4.identity(), []), Math.PI, [0, 0, 1]);
 });
 

frontend/javascripts/viewer/model/reducers/flycam_reducer.ts

@@ -213,7 +213,13 @@ function FlycamReducer(state: WebknossosState, action: Action): WebknossosState
       return update(state, {
         flycam: {
           currentMatrix: {
-            $set: resetMatrix(state.flycam.currentMatrix, action.dataset.dataSource.scale.factor),
+            $set: resetMatrix(
+              state.flycam.currentMatrix,
+              getTransformedVoxelSize(
+                state.dataset,
+                state.datasetConfiguration.nativelyRenderedLayerName,
+              ).factor,
+            ),
           },
           rotation: {
             $set: [0, 0, 0],
@@ -307,6 +313,13 @@ function FlycamReducer(state: WebknossosState, action: Action): WebknossosState
       return setDirectionReducer(state, action.direction);
     }
 
+    case "UPDATE_DATASET_SETTING": {
+      if (action.propertyName === "nativelyRenderedLayerName") {
+        return setRotationReducer(state, state.flycam.rotation);
+      }
+      return state;
+    }
+
     case "MOVE_FLYCAM": {
       if (action.vector.includes(Number.NaN)) {
         // if the action vector is invalid, do not update

frontend/javascripts/viewer/store.ts

@@ -604,7 +604,7 @@ export const combinedReducer = reduceReducers(
   ProofreadingReducer,
   TaskReducer,
   SaveReducer,
-  FlycamReducer,
+  FlycamReducer, // needs to be executed after the settings reducer because of UPDATE_DATASET_SETTING handling in flycam reducer
   FlycamInfoCacheReducer,
   ViewModeReducer,
   AnnotationReducer,