Ambient music.

tapio · Nov 30, 2012 · e8539e6 · e8539e6
1 parent b1a0daa
commit e8539e6
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 1 deletion.
diff --git a/assets/music/dark-ambiance-01.ogg b/assets/music/dark-ambiance-01.ogg
diff --git a/assets/music/readme.txt b/assets/music/readme.txt
@@ -0,0 +1,5 @@
+dark-ambiance-01.ogg
+	By Philippe Groarke (Socapex)
+	http://opengameart.org/content/dark-ambiance
+	CC-BY-SA-3.0
+
diff --git a/js/config.js b/js/config.js
@@ -24,6 +24,7 @@ var CONFIG = {
 	resolution: 1.0,
 	physicsFPS: 60,
 	sounds: true,
+	music: true,
 	postprocessing: true,
 	particles: true,
 	maxLights: 4,

diff --git a/js/main.js b/js/main.js
@@ -153,6 +153,8 @@ function resetLevel(levelName) {
 	soundManager = new SoundManager();
 	aiManager = new AIManager();
 	dungeon = new Dungeon(scene, pl, levelName);
+
+	if (CONFIG.music) soundManager.playMusic("dark-ambiance-01");
 }
 
 function savePlayerState(levelName) {

diff --git a/js/sound.js b/js/sound.js
@@ -1,6 +1,7 @@
 
 function SoundManager() {
 	var sounds = {};
+	var music;
 	for (var s in assets.sounds)
 		sounds[s] = new Sound(assets.sounds[s], 5);
 
@@ -14,6 +15,17 @@ function SoundManager() {
 		if (distance < radius)
 			sounds[name].play(1 - distance / radius);
 	};
+
+	this.playMusic = function(name) {
+		this.stopMusic();
+		music = new Audio("assets/music/" + name + ".ogg");
+		music.loop = true;
+		music.play();
+	};
+
+	this.stopMusic = function() {
+		if (music) music.pause();
+	};
 }
 
 function Sound(samples, minPlayers) {

diff --git a/js/ui.js b/js/ui.js
@@ -65,9 +65,15 @@ function initUI() {
 	gui.add(CONFIG, "resolution", 0.1, 1.0).step(0.1).onChange(function() { updateConfig(); onWindowResize(); });
 	gui.add(CONFIG, "physicsFPS", 30, 100).step(10).onChange(updateConfig);
 	gui.add(CONFIG, "showStats").onChange(updateConfig);
-	gui.add(CONFIG, "sounds").onChange(updateConfig);
 	gui.add(controls, "mouseFallback");
 	gui.add(window, "editLevel");
+	var guiAudio = gui.addFolder("Audio");
+	guiAudio.add(CONFIG, "sounds").onChange(updateConfig);
+	guiAudio.add(CONFIG, "music").onChange(function() {
+		if (CONFIG.music) soundManager.playMusic("dark-ambiance-01");
+		else soundManager.stopMusic();
+		updateConfig();
+	});
 	var guiRenderer = gui.addFolder("Renderer options (reload required)");
 	guiRenderer.add(CONFIG, "antialias").onChange(updateConfig);
 	guiRenderer.add(CONFIG, "physicalShading").onChange(updateConfig);