Change dummies

Author: Léna Voinchet

js/scene/SceneManager.js

@@ -3,6 +3,7 @@ import {
     AxesHelper,
     GridHelper,
     AmbientLight,
+    DirectionalLight,
     PlaneGeometry,
     BufferGeometry,
     LineBasicMaterial,
@@ -141,9 +142,13 @@ class SceneManager{
         this.initScene = function(floor, wallX, wallY)
         {
             // Lighting
-            const ambient = new AmbientLight( 0xffffff, 1.8);
+            const ambient = new AmbientLight( 0xffffff, 0.2);
             this.scene.add(ambient);
 
+            const directionalLight = new DirectionalLight(0xffffff, 3.5); // Assez intense pour être visible
+            directionalLight.position.set(3, 10, 10); // Positionnée en hauteur, venant d'un côté
+            this.scene.add(directionalLight);
+
             // Floor
             //const floor = buildFloorMesh(this.size, wallX.position.x, wallY.position.z);
             this.scene.add(floor);
@@ -235,7 +240,7 @@ class SceneManager{
 
         function buildFloorMesh(size, wallXDepth, wallYDepth)
         {
-            const materialFloor = new MeshPhongMaterial( {side:DoubleSide, color: 0x555555});
+            const materialFloor = new MeshPhongMaterial( {side:DoubleSide, color: 0x373737});
 
             const geometryFloor = new PlaneGeometry( size + 0.02, size + 0.02 );
 
@@ -248,7 +253,7 @@ class SceneManager{
 
         function buildWallXMesh(size, wallXDepth, wallYDepth)
         {
-            const materialWallX = new MeshPhongMaterial( {color: 0xCCCCCC});//{ color: 0x522B47, dithering: true } ); // violet
+            const materialWallX = new MeshPhongMaterial( {color: 0xFFFFFF});
 
             const geometryWallX = new PlaneGeometry( size + 0.02, size + 0.02 );
 
@@ -261,7 +266,7 @@ class SceneManager{
 
         function buildWallYMesh(size, wallYDepth, wallXDepth)
         {
-            const materialWallY = new MeshPhongMaterial( {color: 0xAAAAAA});//{ color: 0x7B0828, dithering: true } ); // magenta
+            const materialWallY = new MeshPhongMaterial( {color: 0x999999});
 
             const geometryWallY = new PlaneGeometry( size + 0.02, size + 0.02 );
 

js/scene/objects/SceneObjects.js

@@ -90,7 +90,7 @@ class SceneObjects{
 
         this.addDummy = function()
         {
-            if(!Dummy.maleModel || !Dummy.femaleModel)
+            if(!Dummy.maleModel || !Dummy.male2Model || !Dummy.femaleModel || !Dummy.female2Model || !Dummy.childModel)
             {
                 console.log("Add Dummy button will work in an instant");
                 return;
@@ -100,7 +100,7 @@ class SceneObjects{
             //Rotation towards wall
             if(sceneManager.trackingMode == "wall-tracking")
             {
-                newDummy.model.rotateY(180);
+                newDummy.model.rotateY(Math.PI);
                 newDummy.mesh.position.set(0, 1, 1);
                 newDummy.updateTransformation();
             }
@@ -512,7 +512,7 @@ class SceneObjects{
                 }
                 if(datas.objects.hasOwnProperty('dummies'))
                 {
-                    if(!Dummy.maleModel || !Dummy.femaleModel)
+                    if(!Dummy.maleModel || Dummy.male2Model || !Dummy.femaleModel || !Dummy.female2Model || !Dummy.childModel)
                     {
                         return;
                     }
@@ -655,13 +655,31 @@ class SceneObjects{
                 sceneManager.drawProjection(n);
             });
         }
+
+        function changeDummyColor(model, color) {
+            model.traverse(function (child) {
+                if (child.isMesh && child.material) {
+                    child.material.color.set(color);
+                }
+            });
+        }
 
         async function loadScene(isBuilder) {
             // Wait until models are loaded
-            await Promise.all([
-                loadModel(isBuilder, 'male'),
-                loadModel(isBuilder, 'female')
+            const [maleModel, male2Model, femaleModel, female2Model, childModel] = await Promise.all([
+                loadModel('male'),
+                loadModel('male_2'),
+                loadModel('female'),
+                loadModel('female_2'),
+                loadModel('child')
             ]);
+
+            const newColor = 0x747474;
+            changeDummyColor(maleModel, newColor);
+            changeDummyColor(male2Model, newColor);
+            changeDummyColor(femaleModel, newColor);
+            changeDummyColor(female2Model, newColor);
+            changeDummyColor(childModel, newColor);
 
             await new Promise((resolve, reject) => {
                 SceneObjects.loadFont(isBuilder, () => {

js/scene/objects/props/Dummy.js

@@ -5,14 +5,15 @@ import {
     Object3D
 } from 'three';
 
-import { MTLLoader } from 'three-loaders/MTLLoader.js';
-import { OBJLoader } from 'three-loaders/OBJLoader.js';
-
+import { GLTFLoader } from 'three-loaders/GLTFLoader.js';
 
 class Dummy {
     static DEFAULT_DUMMIES_HEIGHT = document.getElementById('dummy-height-reference') ? document.getElementById('dummy-height-reference').value : 2;
     static maleModel;
+    static male2Model;
     static femaleModel;
+    static female2Model;
+    static childModel;
 
     constructor(id)
     {
@@ -47,7 +48,19 @@ class Dummy {
 
     buildModel()
     {
-        const model = new Object3D().copy((Math.random() < 0.5) ? Dummy.maleModel : Dummy.femaleModel);
+        const modelChoice = Math.random();
+        let model;
+        if (modelChoice < 0.2) {
+            model = new Object3D().copy(Dummy.maleModel);
+        } else if (modelChoice < 0.4) {
+            model = new Object3D().copy(Dummy.male2Model);
+        } else if (modelChoice < 0.6) {
+            model = new Object3D().copy(Dummy.femaleModel);
+        } else if (modelChoice < 0.8) {
+            model = new Object3D().copy(Dummy.female2Model);
+        } else {
+            model = new Object3D().copy(Dummy.childModel);
+        }
         const scaling = Dummy.DEFAULT_DUMMIES_HEIGHT / 220.0; 
         model.scale.set(scaling, scaling, scaling);
         //model.position.set(dummy.xPos, dummy.zPos, dummy.yPos);
@@ -94,37 +107,38 @@ class Dummy {
 
 }
 
-async function loadModel(isBuilder, genre) {
-    const path = isBuilder ? './designer/' : './';
+async function loadModel(genre) {
+    const loader = new GLTFLoader();
 
-    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);
-    });
+    const path = `./models/${genre}.glb`;
 
-    materials.preload();
+    const gltf = await loader.loadAsync(path);
 
-    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', resolve, undefined, reject);
-    });
+    const object = gltf.scene;
 
-    if (genre === 'male') Dummy.maleModel = object;
-    else if (genre === 'female') Dummy.femaleModel = object;
+    if (genre === 'male') {
+        Dummy.maleModel = object;
+    } else if (genre === 'male_2') {
+        Dummy.male2Model = object;
+    } else if (genre === 'female') {
+        Dummy.femaleModel = object;
+    } else if (genre === 'female_2') {
+        Dummy.female2Model = object;
+    } else if (genre === 'child') {
+        Dummy.childModel = object;
+    }
 
     return object;
 }
 
 (async () => {
 
-    const [maleModel, femaleModel] = await Promise.all([
-        loadModel(false, 'male'),
-        loadModel(false, 'female')
+    const [maleModel, male2Model, femaleModel, female2Model, childModel] = await Promise.all([
+        loadModel('male'),
+        loadModel('male_2'),
+        loadModel('female'),
+        loadModel('female_2'),
+        loadModel('child')
     ]);
 
 })();