Merge pull request #66 from jun-sironamedical/feature/focalpoint_prop

Added focalPoint as prop and setting on update

Author: floryst

src/core/View.js

@@ -430,7 +430,9 @@ export default class View extends Component {
       interactive,
       cameraPosition,
       cameraViewUp,
+      cameraFocalPoint,
       cameraParallelProjection,
+      autoResetCamera,
       triggerRender,
       triggerResetCamera,
       showCubeAxes,
@@ -454,23 +456,31 @@ export default class View extends Component {
     ) {
       const camera = this.renderer.getActiveCamera();
       camera.setParallelProjection(cameraParallelProjection);
-      if (previous) {
+      if (previous && autoResetCamera) {
         this.resetCamera();
       }
     }
     if (
-      cameraPosition &&
-      (!previous ||
-        JSON.stringify(cameraPosition) !==
-          JSON.stringify(previous.cameraPosition))
+      (cameraPosition &&
+        (!previous ||
+          JSON.stringify(cameraPosition) !==
+            JSON.stringify(previous.cameraPosition))) ||
+      (cameraViewUp &&
+        (!previous ||
+          JSON.stringify(cameraViewUp) !==
+            JSON.stringify(previous.cameraViewUp))) ||
+      (cameraFocalPoint &&
+        (!previous ||
+          JSON.stringify(cameraFocalPoint) !==
+            JSON.stringify(previous.cameraFocalPoint)))
     ) {
       const camera = this.renderer.getActiveCamera();
       camera.set({
         position: cameraPosition,
         viewUp: cameraViewUp,
-        focalPoint: [0, 0, 0],
+        focalPoint: cameraFocalPoint,
       });
-      if (previous) {
+      if (previous && autoResetCamera) {
         this.resetCamera();
       }
     }
@@ -676,6 +686,8 @@ View.defaultProps = {
   background: [0.2, 0.3, 0.4],
   cameraPosition: [0, 0, 1],
   cameraViewUp: [0, 1, 0],
+  cameraFocalPoint: [0, 0, 0],
+  autoResetCamera: true,
   cameraParallelProjection: false,
   triggerRender: 0,
   triggerResetCamera: 0,
@@ -759,6 +771,11 @@ View.propTypes = {
    */
   cameraPosition: PropTypes.array,
 
+  /**
+   * Initial camera focal point from an object in [0,0,0]
+   */
+  cameraFocalPoint: PropTypes.array,
+
   /**
    * Initial camera position from an object in [0,0,0]
    */
@@ -769,6 +786,15 @@ View.propTypes = {
    */
   cameraParallelProjection: PropTypes.bool,
 
+  /**
+   * Whether to automatically call resetCamera() (default: true)
+   *
+   * When set to false, the user must explicitly provide camera
+   * properties. Note that the initial resetCamera() call will
+   * still occur upon component mount.
+   */
+  autoResetCamera: PropTypes.bool,
+
   /**
    * Property use to trigger a render when changing.
    */