diff --git a/site/interface/site/home3D/home3D.js b/site/interface/site/home3D/home3D.js new file mode 100644 index 0000000..5b911f8 --- /dev/null +++ b/site/interface/site/home3D/home3D.js @@ -0,0 +1,93 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* home3D.js :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: edbernar { + const tv = gltf.scene.children[0]; + console.log(tv); + tv.position.set(0, 0.68, 0); + tv.material = new THREE.MeshPhysicalMaterial({color: 0x222222}); + tv.scale.set(0.1, 0.08, 0.12); + tv.castShadow = true; + tv.receiveShadow = true; + scene.add(tv); + }, undefined, function ( error ) { + console.error( error ); + } ); + + renderer.setAnimationLoop(loop) +} + +function createPlane() +{ + const geometry = new THREE.PlaneGeometry(20, 20); + const material = new THREE.MeshPhysicalMaterial({side: THREE.DoubleSide, color: 0xffffff}); + 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 createBox() +{ + const geometry = new THREE.BoxGeometry(1, 1, 1); + const material = new THREE.MeshPhysicalMaterial({color: 0xffffff}); + const mesh = new THREE.Mesh(geometry, material); + + mesh.position.set(-3, 0.5, -3); + mesh.receiveShadow = true; + scene.add(mesh); +} + + +function loop() +{ + controls.update(); + renderer.render(scene, camera); +} + +export { home3D }; \ No newline at end of file diff --git a/site/interface/site/index.html b/site/interface/site/index.html index c5eb426..6ce8e34 100644 --- a/site/interface/site/index.html +++ b/site/interface/site/index.html @@ -40,7 +40,6 @@
-

THREEJS

diff --git a/site/interface/site/main.js b/site/interface/site/main.js index ce180b5..7700c2d 100644 --- a/site/interface/site/main.js +++ b/site/interface/site/main.js @@ -3,33 +3,30 @@ /* ::: :::::::: */ /* main.js :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: madegryc +#+ +:+ +#+ */ +/* By: edbernar { const scrollPosition = window.scrollY; - const rotationAngle = scrollPosition * 0.1; // Ajustez ce facteur pour contrôler l'angle de rotation + const rotationAngle = scrollPosition * 0.1; const parallaxElement = document.querySelector('#firstBall'); const parallaxElement2 = document.querySelector('#secondBall'); - const parallaxSpeed = scrollPosition * -0.17; // Ajustez ce facteur pour ralentir le défilement + const parallaxSpeed = scrollPosition * -0.17; - // Appliquer la rotation en fonction de la position de défilement parallaxElement.style.transform = `translateX(-50%) translateY(${-parallaxSpeed}px) rotate(${rotationAngle}deg)`; parallaxElement2.style.transform = `translateX(50%) translateY(${-parallaxSpeed}px) rotate(${rotationAngle}deg)`; - - // Ajuster la position de l'arrière-plan pour l'effet de parallaxe - // parallaxElement.style.backgroundPositionY = `${parallaxSpeed}px`; }); document.addEventListener('DOMContentLoaded', () => { liveChat(); login(); + home3D(); }); diff --git a/site/interface/site/modeles/tv.glb b/site/interface/site/modeles/tv.glb new file mode 100644 index 0000000..0bf343a Binary files /dev/null and b/site/interface/site/modeles/tv.glb differ diff --git a/site/interface/site/package-lock.json b/site/interface/site/package-lock.json index a151614..7f993ac 100644 --- a/site/interface/site/package-lock.json +++ b/site/interface/site/package-lock.json @@ -5,6 +5,7 @@ "packages": { "": { "dependencies": { + "@rollup/rollup-darwin-arm64": "^4.21.0", "stats": "^1.0.0", "stats.js": "^0.17.0" }, @@ -433,15 +434,13 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.19.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.19.1.tgz", - "integrity": "sha512-8o6eqeFZzVLia2hKPUZk4jdE3zW7LCcZr+MD18tXkgBBid3lssGVAYuox8x6YHoEPDdDa9ixTaStcmx88lio5Q==", + "version": "4.21.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.0.tgz", + "integrity": "sha512-zOnKWLgDld/svhKO5PD9ozmL6roy5OQ5T4ThvdYZLpiOhEGY+dp2NwUmxK0Ld91LrbjrvtNAE0ERBwjqhZTRAA==", "cpu": [ "arm64" ], - "dev": true, "license": "MIT", - "optional": true, "os": [ "darwin" ] @@ -788,6 +787,20 @@ "fsevents": "~2.3.2" } }, + "node_modules/rollup/node_modules/@rollup/rollup-darwin-arm64": { + "version": "4.19.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.19.1.tgz", + "integrity": "sha512-8o6eqeFZzVLia2hKPUZk4jdE3zW7LCcZr+MD18tXkgBBid3lssGVAYuox8x6YHoEPDdDa9ixTaStcmx88lio5Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, "node_modules/source-map-js": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", diff --git a/site/interface/site/package.json b/site/interface/site/package.json index ac044d6..db9e194 100644 --- a/site/interface/site/package.json +++ b/site/interface/site/package.json @@ -7,6 +7,7 @@ "vite": "^5.4.0" }, "dependencies": { + "@rollup/rollup-darwin-arm64": "^4.21.0", "stats": "^1.0.0", "stats.js": "^0.17.0" } diff --git a/site/real_game/blender/banner.blend b/site/real_game/blender/banner.blend index 8594a43..f44aaad 100644 Binary files a/site/real_game/blender/banner.blend and b/site/real_game/blender/banner.blend differ diff --git a/site/real_game/blender/banner.blend1 b/site/real_game/blender/banner.blend1 new file mode 100644 index 0000000..8594a43 Binary files /dev/null and b/site/real_game/blender/banner.blend1 differ diff --git a/site/real_game/blender/exported/tv.glb b/site/real_game/blender/exported/tv.glb new file mode 100644 index 0000000..af31fb9 Binary files /dev/null and b/site/real_game/blender/exported/tv.glb differ diff --git a/site/real_game/blender/tv.blend b/site/real_game/blender/tv.blend new file mode 100644 index 0000000..d67186d Binary files /dev/null and b/site/real_game/blender/tv.blend differ diff --git a/site/real_game/blender/tv.blend1 b/site/real_game/blender/tv.blend1 new file mode 100644 index 0000000..4e61a0a Binary files /dev/null and b/site/real_game/blender/tv.blend1 differ