Merge branch 'master' into volumeShadowExample

Author: JiayiXuu

Sources/Proxy/Core/ViewProxy/index.js

@@ -166,7 +166,10 @@ function vtkViewProxy(publicAPI, model) {
   // --------------------------------------------------------------------------
 
   publicAPI.setContainer = (container) => {
+    const orientationWidgetEnabled = model.orientationWidget.getEnabled();
+
     if (model.container) {
+      model.orientationWidget.setEnabled(false);
       model.interactor.unbindEvents(model.container);
       model.openglRenderWindow.setContainer(null);
       model.cornerAnnotation.setContainer(null);
@@ -179,6 +182,7 @@ function vtkViewProxy(publicAPI, model) {
       model.cornerAnnotation.setContainer(container);
       model.interactor.initialize();
       model.interactor.bindEvents(container);
+      model.orientationWidget.setEnabled(orientationWidgetEnabled);
     }
   };
 
@@ -577,11 +581,21 @@ function vtkViewProxy(publicAPI, model) {
 
   // --------------------------------------------------------------------------
 
-  publicAPI.delete = macro.chain(
-    publicAPI.setContainer,
-    model.openglRenderWindow.delete,
-    publicAPI.delete
-  );
+  publicAPI.delete = macro.chain(() => {
+    publicAPI.setContainer(null);
+    model.orientationWidget.setEnabled(false);
+    model.orientationWidget.delete();
+    model.orientationAxesArrow.delete();
+    model.orientationAxesCube.delete();
+    model.interactorStyle2D.delete();
+    model.interactorStyle3D.delete();
+    model.cornerAnnotation.delete();
+    // in reverse order
+    model.interactor.delete();
+    model.renderer.delete();
+    model.openglRenderWindow.delete();
+    model.renderWindow.delete();
+  }, publicAPI.delete);
 
   // --------------------------------------------------------------------------
   // Initialization from state or input

Sources/Rendering/OpenGL/RenderWindow/index.js

@@ -92,6 +92,26 @@ function vtkOpenGLRenderWindow(publicAPI, model) {
 
   publicAPI.getViewNodeFactory = () => model.myFactory;
 
+  // prevent default context lost handler
+  model.canvas.addEventListener(
+    'webglcontextlost',
+    (event) => {
+      event.preventDefault();
+    },
+    false
+  );
+
+  model.canvas.addEventListener(
+    'webglcontextrestored',
+    publicAPI.restoreContext,
+    false
+  );
+
+  // Cache the value here as calling it on each frame is expensive
+  const isImmersiveVrSupported =
+    navigator.xr !== undefined &&
+    navigator.xr.isSessionSupported('immersive-vr');
+
   // Auto update style
   const previousSize = [0, 0];
   function updateWindow() {
@@ -244,10 +264,7 @@ function vtkOpenGLRenderWindow(publicAPI, model) {
     let result = null;
 
     // Do we have webxr support
-    if (
-      navigator.xr !== undefined &&
-      navigator.xr.isSessionSupported('immersive-vr')
-    ) {
+    if (isImmersiveVrSupported) {
       publicAPI.invokeHaveVRDisplay();
     }
 
@@ -267,21 +284,6 @@ function vtkOpenGLRenderWindow(publicAPI, model) {
         model.canvas.getContext('experimental-webgl', options);
     }
 
-    // prevent default context lost handler
-    model.canvas.addEventListener(
-      'webglcontextlost',
-      (event) => {
-        event.preventDefault();
-      },
-      false
-    );
-
-    model.canvas.addEventListener(
-      'webglcontextrestored',
-      publicAPI.restoreContext,
-      false
-    );
-
     return result;
   };