Merge pull request #8 from geoblocks/pass_scene_to_model

Pass the scene to the model
geoblocks · Sep 27, 2024 · 9cda36d · 9cda36d
2 parents 426f1f2 + d9a7903
commit 9cda36d
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 52 deletions.
diff --git a/src/apps/permits/demoPermitConfig.ts b/src/apps/permits/demoPermitConfig.ts
@@ -33,7 +33,7 @@ export const config: IPermitsConfig = {
         // terrain: '@geoadmin/terrain',
       },
       camera: {
-        position: [6.628484, 46.5, 1000],
+        position: [6.628484, 46.5, 100],
         orientation: {
           heading: 0,
           pitch: -30.0,

diff --git a/src/plugins/cesium/ngv-cesium-factories.ts b/src/plugins/cesium/ngv-cesium-factories.ts
@@ -272,65 +272,74 @@ export async function initCesiumWidget(
     );
   });
 
-  cesiumContext.layers.models?.forEach((name) => {
-    const config = resolvedLayers[name];
-    if (isModelConfig(config)) {
-      stuffToDo.push(
-        instantiateModel(config, cesiumContext.layerOptions[name]).then(
-          (model) => {
-            console.log('Got model!', config);
-            modelCallback(name, model);
-            viewer.scene.primitives.add(model);
-          },
-          (e) => {
-            console.error('o', e);
+  const modelPromises = cesiumContext.layers.models?.map(async (name) => {
+    let config = resolvedLayers[name];
+    let toRevokeUrl: string;
+
+    if (isIFCConfig(config)) {
+      const ifcUrl = config.url;
+      const modelOptions = config.options?.modelOptions;
+      const {ifcToGLTF} = await import('@geoblocks/ifc-gltf');
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+      const {metadata, glb, coordinationMatrix} = await ifcToGLTF({
+        url: ifcUrl,
+        webIfcSettings: {
+          wasm: {
+            path: '/',
+            absolute: true,
           },
-        ),
-      );
-    } else if (isIFCConfig(config)) {
+        },
+      });
+      // FIXME: we are missing a mechnism to place the model at a particular place
+      console.log('IFC transformed to glTF', metadata, coordinationMatrix);
+      const glbBlob = new Blob([glb]);
+      toRevokeUrl = URL.createObjectURL(glbBlob);
+      const modelConfig: INGVCesiumModel = {
+        type: 'model',
+        options: Object.assign({}, modelOptions, {
+          url: toRevokeUrl,
+        }),
+      };
+      config = modelConfig;
+    }
+    if (isModelConfig(config)) {
+      const bmConfig: Omit<INGVCesiumModel['options'], 'url'> = {
+        scene: viewer.scene,
+        gltfCallback(gltf) {
+          // FIXME: here we can enable animations, ...
+          // This should be exposed in some way to the apps
+          console.log('received glTF', gltf);
+        },
+        // heightReference: HeightReference.CLAMP_TO_GROUND,
+      };
       stuffToDo.push(
-        import('@geoblocks/ifc-gltf').then(async (module) => {
-          const {ifcToGLTF} = module;
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-          const {metadata, glb, coordinationMatrix} = await ifcToGLTF({
-            url: config.url,
-            webIfcSettings: {
-              wasm: {
-                path: '/',
-                absolute: true,
-              },
+        instantiateModel(
+          config,
+          Object.assign(bmConfig, cesiumContext.layerOptions[name]),
+        )
+          .then(
+            (model) => {
+              console.log('Got model!', config);
+              modelCallback(name, model);
+              viewer.scene.primitives.add(model);
             },
-          });
-          // FIXME: we are missing a mechnism to place the model at a particular place
-          console.log('IFC transformed to glTF', metadata, coordinationMatrix);
-          const glbBlob = new Blob([glb]);
-          const glbURL = URL.createObjectURL(glbBlob);
-          const modelConfig: INGVCesiumModel = {
-            type: 'model',
-            options: Object.assign({}, config.options?.modelOptions, {
-              url: glbURL,
-            }),
-          };
-          return instantiateModel(modelConfig, cesiumContext.layerOptions[name])
-            .then(
-              (model) => {
-                modelCallback(name, model);
-                console.log('Got IFC!', config, modelConfig);
-                viewer.scene.primitives.add(model);
-              },
-              (e) => {
-                console.error('o', e);
-              },
-            )
-            .finally(() => {
-              URL.revokeObjectURL(glbURL);
-            });
-        }),
+            (e) => {
+              console.error('o', e);
+            },
+          )
+          .finally(() => {
+            if (toRevokeUrl) {
+              URL.revokeObjectURL(toRevokeUrl);
+            }
+          }),
       );
     } else {
       throw new Error(`Not a supported model config: ${config.type}`);
     }
   });
+  // Here we wait for all models to be loaded, before continuing.
+  // It pleases the linter, but is to be decided if this is really necessary / suitable.
+  await Promise.allSettled(modelPromises);
 
   cesiumContext.layers.imageries.map((name) => {
     const config = resolvedLayers[name];