Update viewer.js

viewer.js

@@ -207,16 +207,18 @@ export async function initializeViewer(config, instanceId) {
     modelEntity.setLocalScale(modelScale, modelScale, modelScale);
     app.root.addChild(modelEntity);
 
-    if (assets.glb && assets.glb.resource && assets.glb.resource.instantiateRenderEntity) {
+    /*if (assets.glb && assets.glb.resource && assets.glb.resource.instantiateRenderEntity) {
       const glbEntity = assets.glb.resource.instantiateRenderEntity();
       app.root.addChild(glbEntity);
-    }
+    }*/
+    const glbEntity = assets.glb.resource.instantiateRenderEntity();
+    app.root.addChild(glbEntity);
 
     const presentoirEntity =assets.presentoir.resource.instantiateRenderEntity();
     presentoirEntity.setLocalScale(presentoirScaleX, presentoirScaleY, presentoirScaleZ);
     app.root.addChild(presentoirEntity);
 
-    if(config.presentoirUrl == undefined){
+    if(config.glbUrl == undefined){
       let matSol = new pc.StandardMaterial();
       matSol.blendType = pc.BLEND_NORMAL;
       matSol.emissivve = new pc.Color(color_bg);
@@ -224,12 +226,20 @@ export async function initializeViewer(config, instanceId) {
       matSol.update();
 
       traverse(presentoirEntity, node => {
-            if (node.render && node.render.meshInstances) {
-                for (let mi of node.render.meshInstances) {
-                    mi.material = matSol;
-                }
-            }
-        });
+        if (node.render && node.render.meshInstances) {
+          for (let mi of node.render.meshInstances) {
+              mi.material = matSol;
+          }
+        }
+      });
+
+      traverse(glbEntity, node => {
+        if (node.render && node.render.meshInstances) {
+          for (let mi of node.render.meshInstances) {
+              mi.material = matSol;
+          }
+        }
+      });
 
       console.log("matSol : ok");
     }