Browse Source

further tests

Raanan Weber 7 years ago
parent
commit
41fd131df9
2 changed files with 18 additions and 1 deletions
  1. 3 1
      Viewer/src/viewer/sceneManager.ts
  2. 15 0
      Viewer/tests/unit/src/viewer/sceneManager.ts

+ 3 - 1
Viewer/src/viewer/sceneManager.ts

@@ -435,7 +435,8 @@ export class SceneManager {
     private _defaultRenderingPipelineShouldBuild: boolean = true;
 
     private _rebuildPostprocesses(configuration?: IDefaultRenderingPipelineConfiguration): void {
-        if (!this.defaultRenderingPipelineEnabled || !getConfigurationKey("scene.imageProcessingConfiguration.isEnabled", this._viewer.configuration)) {
+        console.log("_rebuild");
+        if (!this._defaultRenderingPipelineEnabled || !getConfigurationKey("scene.imageProcessingConfiguration.isEnabled", this._viewer.configuration)) {
             if (this._defaultRenderingPipeline) {
                 this._defaultRenderingPipeline.dispose();
                 this._defaultRenderingPipeline = null;
@@ -448,6 +449,7 @@ export class SceneManager {
         }
 
         let pipelineConfig = configuration || (this._viewer.configuration.lab && this._viewer.configuration.lab.defaultRenderingPipelines);
+        console.log(pipelineConfig);
         if (pipelineConfig) {
 
             if (!this._defaultRenderingPipeline) {

+ 15 - 0
Viewer/tests/unit/src/viewer/sceneManager.ts

@@ -99,6 +99,12 @@ describe(name, function () {
             }
         });
 
+        viewer.runRenderLoop = false;
+        viewer.sceneManager.onSceneInitObservable.clear();
+        viewer.sceneManager.onSceneInitObservable.add((scene) => {
+            viewer.onSceneInitObservable.notifyObserversWithPromise(scene);
+        })
+
         viewer.onInitDoneObservable.add(() => {
             assert.isDefined(viewer.sceneManager.defaultRenderingPipeline);
             assert.isTrue(viewer.sceneManager.defaultRenderingPipelineEnabled);
@@ -113,6 +119,15 @@ describe(name, function () {
             assert.isDefined(viewer.sceneManager.defaultRenderingPipeline);
             assert.isTrue(viewer.sceneManager.defaultRenderingPipelineEnabled);
 
+            viewer.updateConfiguration({
+                lab: {
+                    defaultRenderingPipelines: false
+                }
+            });
+
+            assert.isNull(viewer.sceneManager.defaultRenderingPipeline);
+            assert.isTrue(viewer.sceneManager.defaultRenderingPipelineEnabled);
+
             viewer.dispose();
             done();
         });