fixed some sounds

flokleiser · Feb 9, 2024 · c9c9bf6 · c9c9bf6
1 parent dcb0ffa
commit c9c9bf6
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 43 deletions.
diff --git a/README.md b/README.md
@@ -48,6 +48,7 @@ ___
         - [ ] one ambient sound that loops: night 
 
     - [ ] Global button to enable/disable all sound
+    - [ ] "reset sound" button?
 
 #### Visual:
 - [ ] Finish all the details

diff --git a/canvas.js b/canvas.js
@@ -199,6 +199,7 @@ function halfNight() {
   currentOpacity = 0;
   resetToggles(); 
   drawImages(); 
+  toggleSmoking();
   toggleMoon();
   loadBellSound();
   loadChatterSound();

diff --git a/effects/buttons.js b/effects/buttons.js
@@ -343,6 +343,14 @@ function resetToggles() {
         console.log('moon off')
         toggleMoon();
     }
+    if (enableBellSound) {
+        console.log('bell sound off')
+        loadBellSound();
+    }
+    if (enableNightAmbience) {
+        console.log('night chatter off')
+        loadNightAmbienceSound();
+    }
   }
 
 function hideButtons() {

diff --git a/effects/sound.js b/effects/sound.js
@@ -239,12 +239,12 @@ function loadNightAmbienceSound() {
     enableNightAmbience= !enableNightAmbience
     if (enableNightAmbience&& enableSound) {
         nightAmbienceSound.volume = 0;
-        $(nightAmbienceSound).animate({volume: 0.9},1000);
+        $(nightAmbienceSound).animate({volume: 1},1000);
         nightAmbienceSound.play();
         console.log('night sound',enableNightAmbience);
     }
     else if (!enableNightAmbience) {
-        nightAmbienceSound.volume = 0.9;
+        nightAmbienceSound.volume = 1;
         $(nightAmbienceSound).animate({volume: 0},1000, function(){
             nightAmbienceSound.pause();
         });

diff --git a/effects/title.js b/effects/title.js
@@ -14,41 +14,9 @@ canvasTitle.height = 1000
 canvasTitleFront.width = 1000
 canvasTitleFront.height = 1000
 
-// document.documentElement.style.setProperty('--resized-width', `${canvasTitle.width}px`);
-
-// var titleImage = new Image()
-// // titleImage.src = "images/title test6.png"
-// // titleImage.src = "images/title test2.png"
-// // titleImage.src =  "images/clouds6 test.png"
-
-// var titleOpacity= 1;
-
-// function toggleTitle() {
-//         if (titleOpacity > 0) {
-//             ctxTitle.clearRect(0,0,canvasTitle.width,canvasTitle.height)
-//             ctxTitle.globalAlpha = titleOpacity
-//             titleOpacity-= 0.01;
-//             ctxTitle.drawImage(titleImage,0,0,canvasTitle.width,canvasTitle.height);
-//             requestAnimationFrame(toggleTitle)
-//         }
-
-//         setTimeout(function() { 
-//             ctxTitle.clearRect(0,0,canvasTitle.width,canvasTitle.height);    
-//             titleOpacity= 0;
-//         },3000)
-// };
-
-
-// function drawTitle() {
-//     ctxTitle.drawImage(titleImage,0,0,canvasTitle.width,canvasTitle.height); 
-// }
-
 var titleImage = new Image()
 titleImage.src = "images/clouds6.png"
 var titleImageFront = new Image()
-// titleImageFront.src = "images/titleclouds.png"
-// titleImageFront.src = "images/titleclouds2.png"
-// titleImageFront.src = "images/titleclouds2.png"
 titleImageFront.src = "images/titleclouds4.png"
 
 console.log('toggled',titleToggled)
@@ -66,35 +34,27 @@ function toggleTitleBool() {
 
 function toggleTitle() {
     if (titleActive) {
-        // ctxTitle.drawImage(titleImage,0,0,canvasTitle.width,canvasTitle.height)
         titleFadeIn = true;
         drawTitle();
         console.log('title', titleActive)
     }
     else {
-        // ctxTitle.clearRect(0,0,canvasTitle.width,canvasTitle.height)
         titleFadeIn= false;
         setTimeout(function() { 
             ctxTitle.clearRect(0,0,canvasTitle.width,canvasTitle.height);    
             ctxTitleFront.clearRect(0,0,canvasTitle.width,canvasTitle.height);    
             titleOpacity= 0;
 
-            // scrollSpeedTitle = 1; 
-            // scrollValTitle = 0;
-           // scrollSpeedTitleFront = 1.5; 
-            // scrollValTitleFront = 0;
             scrollSpeedTitle = 0; 
             scrollSpeedTitleFront = 0; 
         },3000)
         console.log('title', titleActive)
     }
 }
 
-// var scrollSpeedTitle = 0.1; 
 var scrollSpeedTitle = 0.5; 
 var scrollValTitle = 0;
 
-// var scrollSpeedTitleFront = 0.15; 
 var scrollSpeedTitleFront = 0.9; 
 var scrollValTitleFront = 0;
 

diff --git a/images/title mask2.png b/images/title mask2.png
diff --git a/style.css b/style.css
@@ -109,7 +109,7 @@
     mask-mode: alpha;
     mask-size: cover;
     mask-repeat: no-repeat;
-    mask-image: url(images/title\ mask.png);
+    mask-image: url(images/title\ mask2.png);
     overflow: hidden;
 }