Преглед изворни кода

model configuration called after models are loaded.

Raanan Weber пре 7 година
родитељ
комит
daf978e471
2 измењених фајлова са 2 додато и 4 уклоњено
  1. 0 4
      Viewer/src/viewer/defaultViewer.ts
  2. 2 0
      Viewer/src/viewer/viewer.ts

+ 0 - 4
Viewer/src/viewer/defaultViewer.ts

@@ -144,10 +144,6 @@ export class DefaultViewer extends AbstractViewer {
     }
 
     private onModelLoaded = (meshes: Array<AbstractMesh>) => {
-
-        // here we could set the navbar's model information:
-        this.configureModel(this.configuration.model || {});
-
         // with a short timeout, making sure everything is there already.
         let hideLoadingDelay = 500;
         if (this.configuration.lab && this.configuration.lab.hideLoadingDelay !== undefined) {

+ 2 - 0
Viewer/src/viewer/viewer.ts

@@ -441,6 +441,8 @@ export abstract class AbstractViewer {
                 this.onLoaderInitObservable.notifyObserversWithPromise(this.lastUsedLoader);
             });
         }).then((meshes: Array<AbstractMesh>) => {
+            // update the models' configuration
+            this.configureModel(model);
             return this.onModelLoadedObservable.notifyObserversWithPromise(meshes)
                 .then(() => {
                     this.initEnvironment();