s_init

Author: Technochips

jsdoom/d_main.js

@@ -261,4 +261,7 @@ function D_DoomMain()
 
 	console.log("I_Init: Setting up machine state.");
 	I_Init();
+
+	console.log("S_Init: Setting up sound.");
+	S_Init(snd_SfxVolume, snd_MusicVolume);
 }

jsdoom/i_sound.js

@@ -8,6 +8,10 @@ var audio_fd;
 
 var mixbuffer = [];
 
+var steptable = [];
+
+var vol_lookup = [];
+
 function getsfx(sfxname, lenarray, leni)
 {
 	let name = "ds" + sfxname;
@@ -31,6 +35,27 @@ function getsfx(sfxname, lenarray, leni)
 	return paddedsfx.buffer;
 }
 
+function I_SetChannels()
+{
+	for(let i = -128; i < 128; i++)
+		steptable[i+128] = (Math.pow(2, i/64)*65536)|0;
+	
+	for(let i = 0; i < 128; i++)
+		for(let j = 0; j < 256; j++)
+			vol_lookup[i*256+j] = ((i*(j-128)*256)/127)|0;
+}
+
+function I_SetSfxVolume(volume)
+{
+	snd_SfxVolume = volume;
+}
+
+function I_SetMusicVolume(volume)
+{
+	snd_MusicVolume = volume;
+	// TODO: actually make it change music?
+}
+
 function I_InitSound()
 {
 	if(!(typeof (window.AudioContext || window.webkitAudioContext) === "function"))

jsdoom/m_misc.js

@@ -24,7 +24,7 @@ var defaults =
 	new default_t("mouse_sensitivity", "mouseSensitivity", 5),
 	new default_t("sfx_volume", "snd_SfxVolume", 8),
 	new default_t("music_volume", "snd_MusicVolume", 8),
-	new default_t("show_messages", "snd_SfxVolume", true),
+	new default_t("show_messages", "showMessages", true),
 
 	new default_t("key_right", "key_right", KEY_RIGHTARROW),
 	new default_t("key_left", "key_left", KEY_LEFTARROW),

jsdoom/s_sound.js

@@ -1,4 +1,52 @@
+class channel_t
+{
+	sfxinfo = new sfxinfo_t();
+	origin = null;
+	handle = 0;
+}
+
+var channels;
+
 var snd_SfxVolume = 15;
 var snd_MusicVolume = 15;
 
-var numChannels;
+var mus_paused;
+
+var numChannels;
+
+function S_Init(sfxVolume, musicVolume)
+{
+	console.info("S_Init: default sfx volume " + sfxVolume);
+
+	I_SetChannels();
+
+	S_SetSfxVolume(sfxVolume);
+	S_SetMusicVolume(musicVolume);
+
+	channels = [];
+
+	mus_paused = false;
+
+	for(let i = 0; i < sfxenum_t.length; i++)
+		S_sfx[i].lumpnum = S_sfx[i].usefulness = -1;
+}
+
+function S_SetMusicVolume(volume)
+{
+	if(volume < 0 || volume > 127)
+	{
+		I_Error("Attempt to set music volume at " + volume);
+	}
+
+	I_SetMusicVolume(127);
+	I_SetMusicVolume(volume);
+	snd_MusicVolume = volume;
+}
+
+function S_SetSfxVolume(volume)
+{
+	if(volume < 0 || volume > 127)
+		I_Error("Attempt to set sfx volume at " + volume);
+	
+	snd_SfxVolume = volume;
+}

jsdoom/sounds.js

@@ -1,6 +1,15 @@
 
 class sfxinfo_t
 {
+	name = null;
+	singularity = 0;
+	priority = 0;
+	link = null;
+	pitch = 0;
+	volume = 0;
+	data = null;
+	usefulness = 0;
+	lumpnum = 0;
 	constructor(name, singularity, priority, link, pitch, volume, data, usefulness, lumpnum)
 	{
 		this.name = name;
@@ -17,6 +26,10 @@ class sfxinfo_t
 
 class musicinfo_t
 {
+	name = null;
+	lumpnum = 0;
+	data = null;
+	handle = 0;
 	constructor(name, lumpnum, data, handle)
 	{
 		this.name = name;