diff --git a/jsm/TetraGUI.js b/jsm/TetraGUI.js index 621fe04..b9f533f 100644 --- a/jsm/TetraGUI.js +++ b/jsm/TetraGUI.js @@ -48,26 +48,40 @@ class TetraGUI extends GUI { scene.vortex.darkCylinder.material.opacity = 0.1 scene.vortex.colorFullCylinder.material.map = colorfullTexture scene.vortex.colorFullCylinder.material.opacity = 0.6 + + scene.vortex.globalRotation = 0.028 + scene.vortex.darkTextureRotation = 0.006 + scene.vortex.darkMoveForward = 0.007 + scene.vortex.colorFullTextureRotation = 0.006 + scene.vortex.colorFullMoveForward = 0.02 + + scene.ambientLight.intensity = 0.1 + scene.directionalLight.intensity = 15 } - scene.ambientLight.intensity = 2 - scene.directionalLight.intensity = 3 break case "Espace": darkTexture = new THREE.TextureLoader(loadingManager).load("./images/dark.jpg", texture => { texture.wrapS = THREE.RepeatWrapping texture.wrapT = THREE.MirroredRepeatWrapping - texture.repeat.set(1, 1) + texture.repeat.set(1, 2) }) colorfullTexture = new THREE.TextureLoader(loadingManager).load("./images/colorfull.jpg", texture => { texture.wrapS = THREE.RepeatWrapping texture.wrapT = THREE.MirroredRepeatWrapping - texture.repeat.set(1, 1) + texture.repeat.set(1, 2) }) loadingManager.onLoad = function() { scene.vortex.darkCylinder.material.map = darkTexture scene.vortex.darkCylinder.material.opacity = 0.2 scene.vortex.colorFullCylinder.material.map = colorfullTexture scene.vortex.colorFullCylinder.material.opacity = 0.2 + + scene.vortex.globalRotation = 0.028 + scene.vortex.darkTextureRotation = 0.006 + scene.vortex.darkMoveForward = 0.007 + scene.vortex.colorFullTextureRotation = 0.006 + scene.vortex.colorFullMoveForward = 0.02 + scene.ambientLight.intensity = 2 scene.directionalLight.intensity = 3 } diff --git a/jsm/Vortex.js b/jsm/Vortex.js index 96c86a3..6d31003 100644 --- a/jsm/Vortex.js +++ b/jsm/Vortex.js @@ -1,21 +1,21 @@ import * as THREE from 'three' -const GLOBAL_ROTATION = 0.028 - -const darkTextureRotation = 0.006 -const darkMoveForward = 0.007 - -const colorFullTextureRotation = 0.006 -const colorFullMoveForward = 0.02 - - class Vortex extends THREE.Group { constructor(loadingManager) { super() const commonCylinderGeometry = new THREE.CylinderGeometry(35, 35, 500, 12, 1, true) + + this.globalRotation = 0.028 + + this.darkTextureRotation = 0.006 + this.darkMoveForward = 0.007 + + this.colorFullTextureRotation = 0.006 + this.colorFullMoveForward = 0.02 + this.background = "Plasma" this.darkCylinder = new THREE.Mesh( @@ -52,13 +52,13 @@ class Vortex extends THREE.Group { } update(delta) { - this.darkCylinder.rotation.y += GLOBAL_ROTATION * delta - this.darkCylinder.material.map.offset.y += darkMoveForward * delta - this.darkCylinder.material.map.offset.x += darkTextureRotation * delta + this.darkCylinder.rotation.y += this.globalRotation * delta + this.darkCylinder.material.map.offset.y += this.darkMoveForward * delta + this.darkCylinder.material.map.offset.x += this.darkTextureRotation * delta - this.colorFullCylinder.rotation.y += GLOBAL_ROTATION * delta - this.colorFullCylinder.material.map.offset.y += colorFullMoveForward * delta - this.colorFullCylinder.material.map.offset.x += colorFullTextureRotation * delta + this.colorFullCylinder.rotation.y += this.globalRotation * delta + this.colorFullCylinder.material.map.offset.y += this.colorFullMoveForward * delta + this.colorFullCylinder.material.map.offset.x += this.colorFullTextureRotation * delta } } diff --git a/loading.css b/loading.css index 81dc7e0..3d78d4d 100644 --- a/loading.css +++ b/loading.css @@ -118,6 +118,10 @@ } } +body { + background-color: #222; +} + #loaddingCircle { margin: 0; padding: 0;