adding sound to the engine

ericoporto · Nov 13, 2016 · 0348757 · 0348757
1 parent d635742
commit 0348757
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 19 deletions.
diff --git a/src/index.html b/src/index.html
@@ -31,6 +31,7 @@
 		<script type="text/javascript" src="battle.js"></script>
 		<script type="text/javascript" src="bootstrap.js"></script>
 		<script type="text/javascript" src="bgmusic.js"></script>
+		<script type="text/javascript" src="sound.js"></script>
 		<script type="text/javascript" src="fullscreen.js"></script>
 
 

diff --git a/src/resources.js b/src/resources.js
@@ -37,6 +37,7 @@ resources.harvest = function(callback) {
     var CHARASETS = "charaset/";
     var LEVELS = "levels/";
     var MUSIC = "audio/music/";
+    var AUDIO = "audio/";
 
     this.faceset = document.getElementById("faceset");
     this.charasetimg = document.getElementById("charasetimg");
@@ -46,6 +47,7 @@ resources.harvest = function(callback) {
     this.pictures = {};
     this.syspictures = {};
     this.music = {};
+    this.sound = {};
     this.syspictures.title = document.getElementById("titleimg");
     this.syspictures.keys1 = document.getElementById("keys1");
     this.syspictures.keys2 = document.getElementById("keys2");
@@ -398,27 +400,49 @@ resources.harvest = function(callback) {
                      DESCRIPTORS + resources.init["itemsFile"],
                     'json');
 
-
-        var MusicList = this.init['MusicList'];
-        for (var music in MusicList) {
-            var musicFile = MusicList[music];
-            //the if cases here assure only one type is loaded
-            //and that they will be supported if available.
-            if(this.audioSupport.ogg && 'ogg' in musicFile){
-              scheduleLoad(['music',music],
-                           MUSIC + musicFile.ogg,
-                           'ogg');
-            } else if(this.audioSupport.mp3 && 'mp3' in musicFile){
-              scheduleLoad(['music',music],
-                           MUSIC + musicFile.mp3,
-                           'mp3');
-            } else if(this.audioSupport.wav && 'wav' in musicFile){
-              scheduleLoad(['music',music],
-                           MUSIC + musicFile.wav,
-                           'wav');
-            }
+        if('MusicList' in this.init){
+          var MusicList = this.init['MusicList'];
+          for (var music in MusicList) {
+              var musicFile = MusicList[music];
+              //the if cases here assure only one type is loaded
+              //and that they will be supported if available.
+              if(this.audioSupport.ogg && 'ogg' in musicFile){
+                scheduleLoad(['music',music],
+                             MUSIC + musicFile.ogg,
+                             'ogg');
+              } else if(this.audioSupport.mp3 && 'mp3' in musicFile){
+                scheduleLoad(['music',music],
+                             MUSIC + musicFile.mp3,
+                             'mp3');
+              } else if(this.audioSupport.wav && 'wav' in musicFile){
+                scheduleLoad(['music',music],
+                             MUSIC + musicFile.wav,
+                             'wav');
+              }
+          }
         }
 
+        if('SoundList' in this.init){
+          var SoundList = this.init['SoundList'];
+          for (var sound in SoundList) {
+              var soundFile = SoundList[sound];
+              //the if cases here assure only one type is loaded
+              //and that they will be supported if available.
+              if(this.audioSupport.ogg && 'ogg' in soundFile){
+                scheduleLoad(['sound',sound],
+                             AUDIO + soundFile.ogg,
+                             'ogg');
+              } else if(this.audioSupport.mp3 && 'mp3' in soundFile){
+                scheduleLoad(['sound',sound],
+                             AUDIO + soundFile.mp3,
+                             'mp3');
+              } else if(this.audioSupport.wav && 'wav' in soundFile){
+                scheduleLoad(['sound',sound],
+                             AUDIO + soundFile.wav,
+                             'wav');
+              }
+          }
+        }
         loadFromSchedule();
 
     };

diff --git a/src/sound.js b/src/sound.js
@@ -0,0 +1,21 @@
+// sound.js
+
+sound = {
+  setup: function(){
+    this.playing = '';
+  },
+  play: function(s, volume) {
+    volume = (typeof volume === "undefined") ? 0.7 : volume;
+    if(!(s in resources.sound))
+      return
+
+    var playSound = (function(that,s, volume){
+        return function() {
+          resources.sound[s].volume = volume;
+          resources.sound[s].play();
+        }
+      })(this,s, volume);
+
+    setTimeout(playSound,50);
+    }
+}