trying to get ortho camera to work

simularium · Oct 11, 2024 · 1bbcfd9 · 1bbcfd9
1 parent 1a9d435
commit 1bbcfd9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/visGeometry/VolumeModel.ts b/src/visGeometry/VolumeModel.ts
@@ -74,9 +74,6 @@ export default class VolumeModel {
     }
 
     public getObject3D(): Object3D | undefined {
-        // TODO showing bounding box for debugging purposes.
-        //   Do we want it on by default in production? Probably not?
-        this.drawable?.setShowBoundingBox(true);
         return this.drawable?.sceneRoot;
     }
 
@@ -101,9 +98,15 @@ export default class VolumeModel {
     public onBeforeRender(
         context: HasThreeJsContext,
         width: number,
-        height: number
+        height: number,
+        orthoScale: number | undefined
     ): void {
         if (this.drawable) {
+            const isOrtho = orthoScale !== undefined;
+            this.drawable.setIsOrtho(isOrtho);
+            if (isOrtho) {
+                this.drawable.setOrthoScale(orthoScale);
+            }
             this.drawable.setResolution(width, height);
             this.drawable.onAnimate(context);
         }

diff --git a/src/visGeometry/index.ts b/src/visGeometry/index.ts
@@ -1040,10 +1040,16 @@ class VisGeometry {
                 } else if (displayType === GeometryDisplayType.VOLUME) {
                     const volObj = entry.geometry.getObject3D();
                     if (volObj) {
+                        const isOrtho = (this.camera as OrthographicCamera)
+                            .isOrthographicCamera;
+                        const orthoScale = isOrtho
+                            ? this.camera.zoom
+                            : undefined;
                         entry.geometry.onBeforeRender(
                             volRenderContext,
                             canvasWidth,
-                            canvasHeight
+                            canvasHeight,
+                            orthoScale
                         );
                         this.tempVolumeGroup.add(volObj);
                     }