diff --git a/docker-compose/requirements/nginx/static/javascript/home3D/home3D.js b/docker-compose/requirements/nginx/static/javascript/home3D/home3D.js index 7b641da..c394aa7 100644 --- a/docker-compose/requirements/nginx/static/javascript/home3D/home3D.js +++ b/docker-compose/requirements/nginx/static/javascript/home3D/home3D.js @@ -6,13 +6,14 @@ /* By: edbernar 0.97) video.pong = '/static/video/homePage/easteregg.webm' + newBgWall(); + putObject('/static/models3D/homePage/lamp.glb', -2.5, 0, 2.5, 3, 0, Math.PI + Math.PI / 8, 0); + putObject('/static/models3D/homePage/plant.glb', 1.5, 0, 3, 0.5, 0, 0, 0); + putObject('/static/models3D/homePage/gameboy.glb', -0.5, -0.075, 0.5, 0.1, 0, 0.4, 0); renderer.toneMapping = THREE.LinearToneMapping; renderer.shadowMap.enabled = true; renderer.shadowMap.type = THREE.PCFSoftShadowMap; @@ -252,6 +258,44 @@ function home3D() composer.render(); } + function putObject(objUrl, x, y, z, scale, rX, rY, rZ) { + loader.load(objUrl, (gltf) => { + const group = new THREE.Group(); + const material = new THREE.MeshPhysicalMaterial({color: 0x080808}); + + gltf.scene.children.forEach(elem => { + elem.traverse((child) => { + if (child.isMesh) { + child.material = material; // Appliquer le matériau aux meshes + child.receiveShadow = true; + child.castShadow = true; + } + }); + group.add(elem); + }); + + group.position.set(x, y, z); + group.scale.set(scale, scale, scale); + group.rotation.set(rX, rY, rZ); + scene.add(group); + }); + } + + function newBgWall() + { + const geometry = new THREE.BoxGeometry(100, 100, 0.1); + const material = new THREE.MeshStandardMaterial({color: 0x020202}); + const mesh = new THREE.Mesh(geometry, material); + const geometry2 = new THREE.BoxGeometry(10, 10, 0.1); + const material2 = new THREE.MeshStandardMaterial({color: 0x020202}); + const mesh2 = new THREE.Mesh(geometry2, material2); + mesh.position.set(0, 0, 5); + scene.add(mesh); + mesh2.position.set(-5, 0, 0); + mesh2.rotateY(Math.PI / 2); + scene.add(mesh2); + } + function createCube() { const geometry = new THREE.BoxGeometry(5, 5, 0.1); diff --git a/docker-compose/requirements/nginx/static/javascript/login/main.js b/docker-compose/requirements/nginx/static/javascript/login/main.js index 0ce95e0..5e33819 100644 --- a/docker-compose/requirements/nginx/static/javascript/login/main.js +++ b/docker-compose/requirements/nginx/static/javascript/login/main.js @@ -6,7 +6,7 @@ /* By: edbernar { + waitForLogin().then(() => { if (userMeInfo.id !== -1) { nodeText = document.createTextNode(userMeInfo.username); diff --git a/docker-compose/requirements/nginx/static/javascript/typeResponse/typeSearchUser.js b/docker-compose/requirements/nginx/static/javascript/typeResponse/typeSearchUser.js index a5866b8..0162532 100644 --- a/docker-compose/requirements/nginx/static/javascript/typeResponse/typeSearchUser.js +++ b/docker-compose/requirements/nginx/static/javascript/typeResponse/typeSearchUser.js @@ -6,7 +6,7 @@ /* By: edbernar ' + '' + div.innerHTML = '' + '

' + user[0] + '

'; searchResult.appendChild(div); div.addEventListener('click', () => { console.log("Show profil " + user[0]); diff --git a/docker-compose/requirements/nginx/static/models3D/homePage/gameboy.glb b/docker-compose/requirements/nginx/static/models3D/homePage/gameboy.glb new file mode 100644 index 0000000..a117967 Binary files /dev/null and b/docker-compose/requirements/nginx/static/models3D/homePage/gameboy.glb differ diff --git a/docker-compose/requirements/nginx/static/models3D/homePage/lamp.glb b/docker-compose/requirements/nginx/static/models3D/homePage/lamp.glb new file mode 100644 index 0000000..bb77e7b Binary files /dev/null and b/docker-compose/requirements/nginx/static/models3D/homePage/lamp.glb differ diff --git a/docker-compose/requirements/nginx/static/models3D/homePage/plant.glb b/docker-compose/requirements/nginx/static/models3D/homePage/plant.glb new file mode 100644 index 0000000..dd389d8 Binary files /dev/null and b/docker-compose/requirements/nginx/static/models3D/homePage/plant.glb differ diff --git a/docker-compose/requirements/nginx/static/style/lobbyPage/lobbyPage.css b/docker-compose/requirements/nginx/static/style/lobbyPage/lobbyPage.css index e38dbd8..f21f7c3 100644 --- a/docker-compose/requirements/nginx/static/style/lobbyPage/lobbyPage.css +++ b/docker-compose/requirements/nginx/static/style/lobbyPage/lobbyPage.css @@ -355,7 +355,6 @@ body { cursor: pointer; display: flex; flex-direction: row; - justify-content: space-between; } #searchResult .searchResultLine p { @@ -370,4 +369,6 @@ body { width: 50px; height: 50px; padding: 5px; + border-radius: 50%; + margin-left: 10px; } \ No newline at end of file