Home Explore Help
Register Sign In
zhangyupeng
/
Babylon.js
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Object was not initialized so cache didn't work correctly.

Raanan Weber 7 years ago
parent
ad26b7c895
commit
30d657d0f3
2 changed files with 12 additions and 7 deletions
Unified View Show Diff Stats
  1. 4 3
      Viewer/dist/basicExample.html
  2. 8 4
      Viewer/src/configuration/loader.ts

+ 4 - 3
Viewer/dist/basicExample.html
View File 

@@ -17,8 +17,9 @@
 
     </head>

     </head>

 

 

     <body>

     <body>

-        <babylon model.title="Damaged Helmet" model.subtitle="BabylonJS" model.thumbnail="https://www.babylonjs.com/img/favicon/apple-icon-144x144.png"

-            model.url="https://www.babylonjs.com/Assets/DamagedHelmet/glTF/DamagedHelmet.gltf" camera.behaviors.auto-rotate="0" templates.nav-bar.params.disable-on-fullscreen="true"></babylon>

+        <babylon configuration="config.json" model.title="Damaged Helmet" model.subtitle="BabylonJS" model.thumbnail="https://www.babylonjs.com/img/favicon/apple-icon-144x144.png"

+            model.url="https://www.babylonjs.com/Assets/DamagedHelmet/glTF/DamagedHelmet.gltf" camera.behaviors.auto-rotate="0"

+            templates.nav-bar.params.disable-on-fullscreen="true"></babylon>

         <script src="viewer.js"></script>

         <script src="viewer.js"></script>

         <script>

         <script>

             // The following lines are redundant. 

             // The following lines are redundant. 

@@ -31,4 +32,4 @@
 
         </script>

         </script>

     </body>

     </body>

 

 

-</html>

+</html>

+ 8 - 4
Viewer/src/configuration/loader.ts
View File 

@@ -6,7 +6,11 @@ import * as deepmerge from '../../assets/deepmerge.min.js';
 
 

 

 export class ConfigurationLoader {

 export class ConfigurationLoader {

 

 

-    private configurationCache: { (url: string): any };

+    private configurationCache: { [url: string]: any };

+

+    constructor() {

+        this.configurationCache = {};

+    }

 

 

     public loadConfiguration(initConfig: ViewerConfiguration = {}): Promise<ViewerConfiguration> {

     public loadConfiguration(initConfig: ViewerConfiguration = {}): Promise<ViewerConfiguration> {

 

 

@@ -62,10 +66,10 @@ export class ConfigurationLoader {
 
                     if (xhr.status === OK) {

                     if (xhr.status === OK) {

                         cacheReference[url] = xhr.responseText;

                         cacheReference[url] = xhr.responseText;

                         resolve(xhr.responseText); // 'This is the returned text.'

                         resolve(xhr.responseText); // 'This is the returned text.'

+                    } else {

+                        console.log('Error: ' + xhr.status, url);

+                        reject('Error: ' + xhr.status); // An error occurred during the request.

                     }

                     }

-                } else {

-                    console.log('Error: ' + xhr.status, url);

-                    reject('Error: ' + xhr.status); // An error occurred during the request.

                 }

                 }

             }

             }

         });

         });