Fix dummies disappearing when refreshing

Author: Léna Voinchet

js/scene/objects/SceneObjects.js

@@ -98,32 +98,32 @@ class SceneObjects{
             const newDummy = new Dummy(dummies.length);
 
             //Rotation towards wall
-            if(sceneManager.trackingMode == "wall-tracking"){
+            if(sceneManager.trackingMode == "wall-tracking")
+            {
                 newDummy.model.rotateY(180);
-                newDummy.mesh.position.set(0, 1, 1)
+                newDummy.mesh.position.set(0, 1, 1);
                 newDummy.updatePosition();
             }
 
-            //Offset
-            for(let i = 0; i < dummies.length; i++)
-            {
-                if(newDummy.mesh.position.distanceTo(dummies[i].mesh.position) < 1.0)
+                //Offset
+                for(let i = 0; i < dummies.length; i++)
                 {
-                    newDummy.mesh.position.x++;
-                    i = 0;
+                    if(newDummy.mesh.position.distanceTo(dummies[i].mesh.position) < 1.0)
+                    {
+                        newDummy.mesh.position.x++;
+                        i = 0;
+                    }
                 }
-            }
-            console.log(newDummy)
-            newDummy.updatePosition();
+                newDummy.updatePosition();
 
-            //Add to scene
-            newDummy.addToScene(sceneManager.scene);
+                //Add to scene
+                newDummy.addToScene(sceneManager.scene);
 
-            //Management
-            dummies.push(newDummy);
-            this.dummiesMeshes.push(newDummy.mesh);
+                //Management
+                dummies.push(newDummy);
+                this.dummiesMeshes.push(newDummy.mesh);
 
-            this.populateStorage();
+                this.populateStorage();
         }
 
         this.removeDummies = function()
@@ -443,8 +443,8 @@ class SceneObjects{
                     datas.objects.dummies.forEach(d => {
                         this.addDummy();
                         const dummy = dummies[dummies.length - 1];
-                        dummy.mesh.translateX(d.p_x);
-                        dummy.mesh.translateZ(d.p_y);
+                        dummy.mesh.translateX(d.p_x - dummy.xPos);
+                        dummy.mesh.translateZ(d.p_y - dummy.yPos);
                         dummy.updatePosition();
                     });
                 }
@@ -578,10 +578,26 @@ class SceneObjects{
                 sceneManager.drawProjection(n);
             });
         }
-        SceneObjects.loadFont(isBuilder, () => SceneManager.loadFont(isBuilder, () => sceneManager.initAugmentaScene()));
 
-        loadModel(isBuilder, 'male');
-        loadModel(isBuilder, 'female');
+        async function loadScene(isBuilder) {
+            // Wait until models are loaded
+            await Promise.all([
+                loadModel(isBuilder, 'male'),
+                loadModel(isBuilder, 'female')
+            ]);
+        
+            await new Promise((resolve, reject) => {
+                SceneObjects.loadFont(isBuilder, () => {
+                    SceneManager.loadFont(isBuilder, () => {
+                        sceneManager.initAugmentaScene();
+                        resolve();
+                    });
+                });
+            });
+        }
+        
+        loadScene(isBuilder);        
+        
     }
 }
 

js/scene/objects/props/Dummy.js

@@ -22,7 +22,7 @@ class Dummy {
         this.yPos = 0;
         this.zPos = 0;
 
-        this.mesh = buildMesh(this.xPos, this.yPos)
+        this.mesh = buildMesh(this.xPos, this.yPos);
 
         //this.model = new Object3D();
 
@@ -91,40 +91,41 @@ class Dummy {
     }
 }
 
-function loadModel(isBuilder, genre)
-{
-    const onProgress = function ( xhr ) {
-
-        if ( xhr.lengthComputable ) {
-
-            const percentComplete = xhr.loaded / xhr.total * 100;
-            console.log( Math.round( percentComplete, 2 ) + '% downloaded' );
-
-        }
-
-    };
-
+async function loadModel(isBuilder, genre) {
     const path = isBuilder ? './designer/' : './';
 
-    new MTLLoader()
-    .setPath( path + 'models/'+ genre +'02/' )
-    .setRequestHeader({ "Content-Type" : "model/mtl"})
-    .load( genre +'02.mtl', function ( materials ) {
+    const materials = await new Promise((resolve, reject) => {
+        new MTLLoader()
+            .setPath(path + 'models/' + genre + '02/')
+            .setRequestHeader({ "Content-Type": "model/mtl" })
+            .load(genre + '02.mtl', resolve, undefined, reject);
+    });
 
-        materials.preload();
+    materials.preload();
 
+    const object = await new Promise((resolve, reject) => {
         new OBJLoader()
-            .setMaterials( materials )
-            .setPath( path + 'models/'+ genre +'02/' )
-            .setRequestHeader({ "Content-Type" : "model/obj"})
-            .load( genre +'02.obj', function ( object ) {
+            .setMaterials(materials)
+            .setPath(path + 'models/' + genre + '02/')
+            .setRequestHeader({ "Content-Type": "model/obj" })
+            .load(genre + '02.obj', resolve, undefined, reject);
+    });
 
-                if(genre === 'male') Dummy.maleModel = object;
-                else if(genre === 'female') Dummy.femaleModel = object;
+    if (genre === 'male') Dummy.maleModel = object;
+    else if (genre === 'female') Dummy.femaleModel = object;
 
-            }, onProgress );
-    } );
+    return object;
 }
 
+(async () => {
+
+    const [maleModel, femaleModel] = await Promise.all([
+        loadModel(false, 'male'),
+        loadModel(false, 'female')
+    ]);
+    
+})();
+
+
 export { Dummy }
 export { loadModel }