fix(RenderWindowInteractor): only request/cancel

Author: Alexis Girault

Sources/Interaction/Misc/DeviceOrientationToCamera/index.js

@@ -43,7 +43,7 @@ function addWindowListeners() {
   orientation.update = true;
   listeners
     .filter((i) => !!i)
-    .forEach((i) => i.renderWindowInteractor.requestAnimation());
+    .forEach((i) => i.renderWindowInteractor.requestAnimation(i));
 }
 
 function removeWindowListeners() {
@@ -60,7 +60,7 @@ function removeWindowListeners() {
   orientation.update = false;
   listeners
     .filter((i) => !!i)
-    .forEach((i) => i.renderWindowInteractor.cancelAnimation());
+    .forEach((i) => i.renderWindowInteractor.cancelAnimation(i));
 }
 
 function addCameraToSynchronize(

Sources/Proxy/Core/ViewProxy/index.js

@@ -253,9 +253,9 @@ function vtkViewProxy(publicAPI, model) {
 
   publicAPI.setAnimation = (enable) => {
     if (enable) {
-      model.renderWindow.getInteractor().requestAnimation('proxy');
+      model.renderWindow.getInteractor().requestAnimation(publicAPI);
     } else {
-      model.renderWindow.getInteractor().cancelAnimation('proxy');
+      model.renderWindow.getInteractor().cancelAnimation(publicAPI);
     }
   };
 

Sources/Rendering/Core/RenderWindowInteractor/index.js

@@ -261,8 +261,15 @@ function vtkRenderWindowInteractor(publicAPI, model) {
   };
 
   publicAPI.requestAnimation = (requestor) => {
-    model.requestAnimationCount += 1;
-    if (model.requestAnimationCount === 1) {
+    if (requestor === undefined) {
+      vtkErrorMacro(`undefined requester, can not start animating`);
+      return;
+    }
+    if (model.animationRequesters.has(requestor)) {
+      return;
+    }
+    model.animationRequesters.add(requestor);
+    if (model.animationRequesters.size === 1) {
       model.lastFrameTime = 0.1;
       model.lastFrameStart = new Date().getTime();
       model.animationRequest = requestAnimationFrame(publicAPI.handleAnimation);
@@ -274,9 +281,12 @@ function vtkRenderWindowInteractor(publicAPI, model) {
     model.vrAnimation || model.animationRequest !== null;
 
   publicAPI.cancelAnimation = (requestor) => {
-    model.requestAnimationCount -= 1;
-
-    if (model.animationRequest && model.requestAnimationCount === 0) {
+    if (!model.animationRequesters.has(requestor)) {
+      vtkWarningMacro(`${requestor} did not request an animation`);
+      return;
+    }
+    model.animationRequesters.delete(requestor);
+    if (model.animationRequest && model.animationRequesters.size === 0) {
       cancelAnimationFrame(model.animationRequest);
       model.animationRequest = null;
       publicAPI.endAnimationEvent();
@@ -622,7 +632,7 @@ function vtkRenderWindowInteractor(publicAPI, model) {
   // do not want extra renders as the make the apparent interaction
   // rate slower.
   publicAPI.render = () => {
-    if (model.requestAnimationCount === 0) {
+    if (model.animationRequest === null) {
       publicAPI.forceRender();
     }
   };
@@ -858,7 +868,7 @@ const DEFAULT_VALUES = {
   recognizeGestures: true,
   currentGesture: 'Start',
   animationRequest: null,
-  requestAnimationCount: 0,
+  animationRequesters: new Set(),
   lastFrameTime: 0.1,
   wheelTimeoutID: 0,
   moveTimeoutID: 0,