Renamed various sound constants, moved some to SettingsMan temporarily for easy tweaking.

Author: garethyr

Managers/NetworkClient.cpp

@@ -678,7 +678,7 @@ namespace RTE
 				std::unordered_set<SoundContainer *> alreadyHandledSoundContainers;
 
 				for (unsigned short serverSoundChannelIndex : sndDataPtr->Channels) {
-					if (serverSoundChannelIndex < c_MaxAudioChannels && (sndDataPtr->State == AudioMan::SOUND_PLAY || m_ServerSounds.find(serverSoundChannelIndex) != m_ServerSounds.end())) {
+					if (serverSoundChannelIndex < c_MaxVirtualChannels && (sndDataPtr->State == AudioMan::SOUND_PLAY || m_ServerSounds.find(serverSoundChannelIndex) != m_ServerSounds.end())) {
 						SoundContainer *soundContainerToHandle = (m_ServerSounds.find(serverSoundChannelIndex) == m_ServerSounds.end()) ? NULL : m_ServerSounds.at(serverSoundChannelIndex);
 						if (alreadyHandledSoundContainers.find(soundContainerToHandle) == alreadyHandledSoundContainers.end()) {
 							switch (sndDataPtr->State) {

Managers/SettingsMan.cpp

@@ -56,7 +56,12 @@ void SettingsMan::Clear()
 	m_ForceNonOverlayedWindowGfxDriver = false;
 	m_AllowSavingToBase = false;
 	m_RecommendedMOIDCount = 240;
-    m_SoundPanningEffectStrength = 0.5;
+    m_SoundPanningEffectStrength = 0.6;
+    //////////////////////////////////////////////////
+    //TODO These need to be removed when our soundscape is sorted out. They're only here temporarily to allow for easier tweaking by pawnis.
+    m_ListenerZOffset = 0;
+    m_MinimumDistanceForPanning = 50;
+    //////////////////////////////////////////////////
 	m_NetworkServerName = "";
 	m_PlayerNetworkName = "";
 
@@ -236,6 +241,13 @@ int SettingsMan::ReadProperty(std::string propName, Reader &reader)
 		reader >> m_RecommendedMOIDCount;
     else if (propName == "SoundPanningEffectStrength")
         reader >> m_SoundPanningEffectStrength;
+    //////////////////////////////////////////////////
+    //TODO These need to be removed when our soundscape is sorted out. They're only here temporarily to allow for easier tweaking by pawnis.
+    else if (propName == "ListenerZOffset")
+        reader >> m_ListenerZOffset;
+    else if (propName == "MinimumDistanceForPanning")
+        reader >> m_MinimumDistanceForPanning;
+    //////////////////////////////////////////////////
 	else if (propName == "PlayerNetworkName")
 		reader >> m_PlayerNetworkName;
 	else if (propName == "NetworkServerName")
@@ -408,6 +420,15 @@ int SettingsMan::Save(Writer &writer) const
 	writer << m_RecommendedMOIDCount;
     writer.NewProperty("SoundPanningEffectStrength");
     writer << m_SoundPanningEffectStrength;
+
+    //////////////////////////////////////////////////
+    //TODO These need to be removed when our soundscape is sorted out. They're only here temporarily to allow for easier tweaking by pawnis.
+    writer.NewProperty("ListenerZOffset");
+    writer << m_ListenerZOffset;
+    writer.NewProperty("MinimumDistanceForPanning");
+    writer << m_MinimumDistanceForPanning;
+    //////////////////////////////////////////////////
+
 	writer.NewProperty("PlayerNetworkName");
 	if (m_PlayerNetworkName == "")
 		writer << "Dummy";

Managers/SettingsMan.h

@@ -415,6 +415,13 @@ class SettingsMan:
 	float SoundPanningEffectStrength() const { return m_SoundPanningEffectStrength; }
 
 
+	//////////////////////////////////////////////////
+	//TODO These need to be removed when our soundscape is sorted out. They're only here temporarily to allow for easier tweaking by pawnis.
+	float c_ListenerZOffset() const { return m_ListenerZOffset; }
+	float c_MinimumDistanceForPanning() const { return m_MinimumDistanceForPanning; }
+	//////////////////////////////////////////////////
+
+
 //////////////////////////////////////////////////////////////////////////////////////////
 // Method:			ForceSoftwareGfxDriver
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -603,6 +610,11 @@ class SettingsMan:
 	bool m_PrintDebugInfo;
 	// The strength of the sound panning effect, 0 (no panning) - 1 (full panning)
 	float m_SoundPanningEffectStrength;
+	//////////////////////////////////////////////////
+	//TODO These need to be removed when our soundscape is sorted out. They're only here temporarily to allow for easier tweaking by pawnis.
+	float m_ListenerZOffset;
+	float m_MinimumDistanceForPanning;
+	//////////////////////////////////////////////////
 	//Whether CC uses additional Draws during MO's PreTravel and PostTravel to 
 	//update MO layer this frame with more precision(true), or it just uses data from the last frame with less precision(false)
 	bool m_PreciseCollisions;

System/Constants.h

@@ -37,8 +37,12 @@ namespace RTE {
 	static constexpr unsigned short c_MaxSoftwareChannels = 128;
 	static constexpr unsigned short c_MaxVirtualChannels = 1024;
 	static constexpr unsigned short c_MaxPlayingSoundsPerContainer = 64;
-	static constexpr short c_ListenerZOffset = 0; //!< The Z offset for Audio listeners. Can be used to lessen harsh panning if panning effect strength is at max.
-	static constexpr short c_DefaultAttenuationStartDistance = 100; //!< The default start distance for attenuating sounds. Individual sounds can have different values for this.
+	/* TODO These have been temporarily replaced with variables in settingsman to allow for easy tweaking. This needs to be undone once our soundscape is sorted out.
+	static constexpr unsigned short c_ListenerZOffset = 50; //!< The Z offset for Audio listeners. Can be used to lessen harsh panning if panning effect strength is at max.
+	static constexpr unsigned short c_MinimumDistanceForPanning = 50; //!< The minimum distance before which sound panning should not occur. Not relevant for immobile sounds or in splitscreen.
+	*/
+	static constexpr unsigned short c_DefaultAttenuationStartDistance = 100; //!< The default start distance for attenuating sounds. Individual sounds can have different values for this.
+	static constexpr unsigned short c_SoundMaxAudibleDistance = 100000; //!< The maximum distance at which any sound can possibly be heard, after which point it will have 0 volume. Arbitrary default suggested by FMOD.
 #pragma endregion
 
 #pragma region Network Constants