Issue #852: removed camera rotation from 3D viewer

src/TmFv3DApp/tmdet-extension/symmetry.ts

@@ -242,7 +242,9 @@ function collectOperations(descriptor: PDBTMDescriptor): StructureOperation[] {
         id: 0,
         chainId: "Any chain with identity operation",
         newChainId: ".",
-        operator: mat4ToRotationAndTranslation(membraneTransformation)
+        operator: mat4ToRotationAndTranslation(
+            Mat4.mul(Mat4(), Mat4.rotX90, membraneTransformation)
+        )
     });
 
     let operationId: number = 1;
@@ -257,7 +259,11 @@ function collectOperations(descriptor: PDBTMDescriptor): StructureOperation[] {
                     return;
                 }
                 const mtx = transformationForStateTransform(mx.transformation_matrix);
-                const composedTransformation = Mat4.mul(Mat4(), membraneTransformation, mtx);
+                const composedTransformation = Mat4.mul(
+                    Mat4(),
+                    Mat4.rotX90,
+                    Mat4.mul(Mat4(), membraneTransformation, mtx)
+                );
 
                 const operator: StructureOperation = {
                     id: operationId,

src/TmFv3DApp/tmdet-extension/transformation.ts

@@ -98,6 +98,7 @@ export function createMembraneOrientation(pdbtmDescriptor: PDBTMDescriptor): Mem
     const membrane = pdbtmDescriptor.additional_entry_annotations.membrane;
 
     let membraneNormal: Vec3 = Vec3.fromObj(membrane.normal);
+    membraneNormal = Vec3.transformMat4(Vec3(), membraneNormal, Mat4.rotX90);
     const result: MembraneOrientation = {
         planePoint1: membraneNormal,
         planePoint2: vneg(membraneNormal),

src/TmFv3DApp/tmdet-viewer/TmViewer.ts

@@ -19,7 +19,6 @@ import { Viewer, ViewerProps } from '@rcsb/rcsb-molstar/build/src/viewer';
 import { TmDetColorThemeProvider } from '../tmdet-extension/tmdet-color-theme';
 import { MembraneOrientationPreset } from '../tmdet-extension/behavior';
 import { TmDetLabelProvider } from '../tmdet-extension/labeling';
-import { loadInitialSnapshot, rotateCamera, storeCameraSnapshot } from '../tmdet-extension/camera';
 import { BuiltInTrajectoryFormat } from 'molstar/lib/mol-plugin-state/formats/trajectory';
 import { PresetProps } from '@rcsb/rcsb-molstar/build/src/viewer/helpers/preset';
 import { Mat4 } from 'molstar/lib/commonjs/mol-math/linear-algebra';
@@ -53,21 +52,7 @@ export class TmViewer extends Viewer {
         reprProvider?: TrajectoryHierarchyPresetProvider<P, S>;
         params?: P;
     }): Promise<any> {
-        this.plugin.canvas3dInitialized.then(() => {
-            console.log('Camera initialization started', this.plugin.canvas3d?.camera)
-            storeCameraSnapshot(this.plugin); // store if it is not stored yet
-            loadInitialSnapshot(this.plugin); // load if there is a stored one
-
-            // INVALID DATA CELL: setTimeout(() => { this.plugin.clear(); }, 100); // clear scene after some delay
-
-            setTimeout(() => { (async () => {
-                await rotateCamera(this.plugin);
-            })(); }, 500);
-        });
-
-        const result = super.loadStructureFromUrl(url, format, isBinary, config);
-
-        return result;
+        return super.loadStructureFromUrl(url, format, isBinary, config);
     }
 
 }