adrien/teTra
adrien/teTra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

LoadingManager for audio

Browse Source
This commit is contained in:
Adrien MALINGREY 2023-07-01 18:28:11 +02:00
parent 4962baf442
commit 33019ebf87
1 changed files with 15 additions and 13 deletions

28
app.js

@ -594,7 +594,7 @@ class Stats {
this.init() this.init()
this.gui = parentGui.addFolder("Stats") this.gui = parentGui.addFolder("Stats").hide()
this.gui.add(this, "time").name("Temps").disable().listen() this.gui.add(this, "time").name("Temps").disable().listen()
this.gui.add(this, "score").name("Score").disable().listen() this.gui.add(this, "score").name("Score").disable().listen()
this.gui.add(this, "highScore").name("Meilleur score").disable().listen() this.gui.add(this, "highScore").name("Meilleur score").disable().listen()
@ -756,18 +756,19 @@ class Stats {
/* Scene */ /* Scene */
const loadManager = new THREE.LoadingManager() const loadingManager = new THREE.LoadingManager()
loadManager.onStart = function (url, itemsLoaded, itemsTotal) { loadingManager.onStart = function (url, itemsLoaded, itemsTotal) {
loadingPercent.innerText = "0%" loadingPercent.innerText = "0%"
} }
loadManager.onProgress = function (url, itemsLoaded, itemsTotal) { loadingManager.onProgress = function (url, itemsLoaded, itemsTotal) {
loadingPercent.innerText = 100 * itemsLoaded / itemsTotal + '%' loadingPercent.innerText = Math.floor(100 * itemsLoaded / itemsTotal) + '%'
} }
loadManager.onLoad = function () { loadingManager.onLoad = function () {
loaddingCircle.remove() loaddingCircle.remove()
renderer.setAnimationLoop(animate) renderer.setAnimationLoop(animate)
startButton.show()
} }
loadManager.onError = function (url) { loadingManager.onError = function (url) {
messagesSpan.innerHTML = 'Erreur de chargement' messagesSpan.innerHTML = 'Erreur de chargement'
} }
@ -821,7 +822,7 @@ const colorFullOpacity = 0.2
const commonCylinderGeometry = new THREE.CylinderGeometry(25, 25, 500, 12, 1, true) const commonCylinderGeometry = new THREE.CylinderGeometry(25, 25, 500, 12, 1, true)
// dark space full of stars - background cylinder // dark space full of stars - background cylinder
const darkCylinderTexture = new THREE.TextureLoader(loadManager).load("images/dark.jpg") const darkCylinderTexture = new THREE.TextureLoader(loadingManager).load("images/dark.jpg")
darkCylinderTexture.wrapS = THREE.RepeatWrapping darkCylinderTexture.wrapS = THREE.RepeatWrapping
darkCylinderTexture.wrapT = THREE.MirroredRepeatWrapping darkCylinderTexture.wrapT = THREE.MirroredRepeatWrapping
darkCylinderTexture.repeat.set(1, 1) darkCylinderTexture.repeat.set(1, 1)
@ -839,7 +840,7 @@ darkCylinder.position.set(5, 10, -10)
scene.add(darkCylinder) scene.add(darkCylinder)
// colourfull space full of nebulas - main universe cylinder // colourfull space full of nebulas - main universe cylinder
const colorFullCylinderTexture = new THREE.TextureLoader(loadManager).load("images/colorfull.jpg") const colorFullCylinderTexture = new THREE.TextureLoader(loadingManager).load("images/colorfull.jpg")
colorFullCylinderTexture.wrapS = THREE.RepeatWrapping colorFullCylinderTexture.wrapS = THREE.RepeatWrapping
colorFullCylinderTexture.wrapT = THREE.MirroredRepeatWrapping colorFullCylinderTexture.wrapT = THREE.MirroredRepeatWrapping
colorFullCylinderTexture.repeat.set(1, 1) colorFullCylinderTexture.repeat.set(1, 1)
@ -970,6 +971,7 @@ let game = {
start: function() { start: function() {
startButton.hide() startButton.hide()
stats.gui.show()
this.playing = true this.playing = true
stats.clock.start() stats.clock.start()
@ -1120,13 +1122,13 @@ let playerActions = {
// Sounds // Sounds
const listener = new THREE.AudioListener() const listener = new THREE.AudioListener()
camera.add( listener ) camera.add( listener )
const audioLoader = new THREE.AudioLoader() const audioLoader = new THREE.AudioLoader(loadingManager)
const music = new THREE.Audio(listener) const music = new THREE.Audio(listener)
audioLoader.load('audio/Tetris_CheDDer_OC_ReMix.mp3', function( buffer ) { audioLoader.load('audio/Tetris_CheDDer_OC_ReMix.mp3', function( buffer ) {
music.setBuffer(buffer) music.setBuffer(buffer)
music.setLoop(true) music.setLoop(true)
music.setVolume(settings.musicVolume/100) music.setVolume(settings.musicVolume/100)
music.play() if (game.playing) music.play()
}) })
const lineClearSound = new THREE.Audio(listener) const lineClearSound = new THREE.Audio(listener)
audioLoader.load('audio/line-clear.wav', function( buffer ) { audioLoader.load('audio/line-clear.wav', function( buffer ) {
@ -1146,9 +1148,9 @@ audioLoader.load('audio/hard-drop.wav', function( buffer ) {
let scheduler = new Scheduler() let scheduler = new Scheduler()
var gui = new GUI().title("teTra") var gui = new GUI().title("teTra")
let startButton = gui.add(game, "start").name("Démarrer") let startButton = gui.add(game, "start").name("Démarrer").hide()
let settings = new Settings(gui)
let stats = new Stats(gui) let stats = new Stats(gui)
let settings = new Settings(gui)
if (debug) { if (debug) {
let debugFolder = gui.addFolder("debug") let debugFolder = gui.addFolder("debug")