diff --git a/docker-compose/requirements/nginx/static/javascript/filesLoader.js b/docker-compose/requirements/nginx/static/javascript/filesLoader.js index d0cda04..863cc89 100644 --- a/docker-compose/requirements/nginx/static/javascript/filesLoader.js +++ b/docker-compose/requirements/nginx/static/javascript/filesLoader.js @@ -6,7 +6,7 @@ /* By: edbernar 0.99) video.pong = files.easterEggVideo; - // newBgWall(); putObject(files.lampModel, -2.5, 0, 2.5, 3, 0, Math.PI + Math.PI / 8, 0); putObject(files.plantModel, 1.5, 0, 3, 0.5, 0, 0, 0); putObject(files.gameboyModel, -0.5, -0.075, 0.5, 0.1, 0, 0.4, 0); + putObject(files.infinitPlane, -1, 0, 0, 10, 0, Math.PI / 2 + 0.5, 0, 0x252525); renderer.toneMapping = THREE.LinearToneMapping; renderer.shadowMap.enabled = true; renderer.shadowMap.type = THREE.PCFSoftShadowMap; @@ -141,7 +141,7 @@ function home3D() scene.background = new THREE.Color(0x020202) scene.add(ambiantLight); - createPlane(); + // createPlane(); createCube(); document.body.getElementsByClassName('homeSection')[0].appendChild(renderer.domElement); @@ -172,7 +172,7 @@ function home3D() if (camera.position.x < 3.3 && interval) fadeInOut(); if (dofPass.materialBokeh.uniforms.aperture.value > 0 && interval) - dofPass.materialBokeh.uniforms.aperture.value -= 0.0001; + dofPass.materialBokeh.uniforms.aperture.value -= 0.0003; if (camera.position.x < 3 && interval) { clearInterval(interval); @@ -271,10 +271,11 @@ function home3D() composer.render(); } - function putObject(objUrl, x, y, z, scale, rX, rY, rZ) { + function putObject(objUrl, x, y, z, scale, rX, rY, rZ, color = 0x080808) + { loader.load(objUrl, (gltf) => { const group = new THREE.Group(); - const material = new THREE.MeshPhysicalMaterial({color: 0x080808}); + const material = new THREE.MeshPhysicalMaterial({color: color}); gltf.scene.children.forEach(elem => { elem.traverse((child) => { @@ -294,21 +295,6 @@ function home3D() }); } - 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); @@ -319,18 +305,6 @@ function home3D() scene.add(mesh); } - function createPlane() - { - const geometry = new THREE.PlaneGeometry(500, 500); - const material = new THREE.MeshPhysicalMaterial({side: THREE.DoubleSide, color: 0x020202}); - const mesh = new THREE.Mesh(geometry, material); - - mesh.position.set(0, 0, 0); - mesh.rotateX(-(Math.PI / 2)); - mesh.receiveShadow = true; - scene.add(mesh); - } - function fadeInOut() { if (isInFade) return; diff --git a/docker-compose/requirements/nginx/static/javascript/lobbyPage/main.js b/docker-compose/requirements/nginx/static/javascript/lobbyPage/main.js index 0c1369c..2e0d124 100644 --- a/docker-compose/requirements/nginx/static/javascript/lobbyPage/main.js +++ b/docker-compose/requirements/nginx/static/javascript/lobbyPage/main.js @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* main.js :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: madegryc +#+ +:+ +#+ */ +/* By: edbernar usernameP.innerHTML = userMeInfo.username); else usernameP.innerHTML = userMeInfo.username; + if (usernameP.length > 8) + usernameP.innerHTML = usernameP.innerHTML.substring(0, 8) + '...'; LiveChat.create(); inputUser.addEventListener('input', searchUser); loginButton.addEventListener('click', showMenu); diff --git a/docker-compose/requirements/nginx/static/javascript/login/main.js b/docker-compose/requirements/nginx/static/javascript/login/main.js index dfdc78a..6726479 100644 --- a/docker-compose/requirements/nginx/static/javascript/login/main.js +++ b/docker-compose/requirements/nginx/static/javascript/login/main.js @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* main.js :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: madegryc +#+ +:+ +#+ */ +/* By: edbernar 8 ? userMeInfo.username.substring(0, 8) + '...' : userMeInfo.username); loginButton.replaceChild(usernameNode, pLoginButton); loginButton.addEventListener('click', showMenu); window.addEventListener('resize', movePopMenuLoginButton); diff --git a/docker-compose/requirements/nginx/static/javascript/profilPage/main.js b/docker-compose/requirements/nginx/static/javascript/profilPage/main.js index aacddb4..d1b6af0 100644 --- a/docker-compose/requirements/nginx/static/javascript/profilPage/main.js +++ b/docker-compose/requirements/nginx/static/javascript/profilPage/main.js @@ -6,7 +6,7 @@ /* By: edbernar { if (userMeInfo.username != "") { - loginButton.innerText = userMeInfo.username; + loginButton.innerText = userMeInfo.username.length > 8 ? userMeInfo.username.substring(0, 8) + '...' : userMeInfo.username; clearInterval(interval); } }, 200); diff --git a/docker-compose/requirements/nginx/static/models3D/homePage/infinitPlane.glb b/docker-compose/requirements/nginx/static/models3D/homePage/infinitPlane.glb new file mode 100644 index 0000000..74c710d Binary files /dev/null and b/docker-compose/requirements/nginx/static/models3D/homePage/infinitPlane.glb differ diff --git a/docker-compose/requirements/nginx/static/video/homePage/pong.mp4 b/docker-compose/requirements/nginx/static/video/homePage/pong.mp4 index ef6dd1a..3607d0e 100644 Binary files a/docker-compose/requirements/nginx/static/video/homePage/pong.mp4 and b/docker-compose/requirements/nginx/static/video/homePage/pong.mp4 differ