Merge pull request #93 from ux3d/fix/multicastsForSceneChange

turned scene change into multicasts (GSVN-211)
KhronosGroup · Jan 25, 2021 · c9441e2 · c9441e2
2 parents 6431a18 + c859938
commit c9441e2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/app_web/src/logic/uimodel.js b/app_web/src/logic/uimodel.js
@@ -1,7 +1,6 @@
-import { bindCallback, fromEvent, merge } from 'rxjs';
+import { fromEvent, merge } from 'rxjs';
 import { map, filter, startWith, pluck } from 'rxjs/operators';
 import { glTF, ToneMaps, DebugOutput } from 'gltf-sample-viewer';
-import { gltfInput } from '../input.js';
 
 import { getIsGltf, getIsGlb, getIsHdr } from 'gltf-sample-viewer';
 

diff --git a/app_web/src/main.js b/app_web/src/main.js
@@ -29,7 +29,7 @@ async function main()
 
     // whenever a new model is selected, load it and when complete pass the loaded gltf
     // into a stream back into the UI
-    const subject = new Subject();
+    const gltfLoadedSubject = new Subject();
     const gltfLoadedMulticast = uiModel.model.pipe(
         mergeMap( (model) =>
         {
@@ -50,18 +50,20 @@ async function main()
             );
         }),
         // transform gltf loaded observable to multicast observable to avoid multiple execution with multiple subscriptions
-        multicast(subject)
+        multicast(gltfLoadedSubject)
     );
 
-
+    const sceneChangedSubject = new Subject();
     const sceneChangedObservable = uiModel.scene.pipe(map( newSceneIndex => {
         state.sceneIndex = newSceneIndex;
         state.cameraIndex = undefined;
         const scene = state.gltf.scenes[state.sceneIndex];
         scene.applyTransformHierarchy(state.gltf);
         computePrimitiveCentroids(state.gltf);
         state.userCamera.fitViewToScene(state.gltf, state.sceneIndex);
-    }));
+    }),
+    multicast(sceneChangedSubject)
+    );
 
     const statisticsUpdateObservableTemp = merge(
         gltfLoadedMulticast,