OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

making the max distance for sounds to be heard from their origin a configurable option exposed via a public field on ISoundModule (with private setter in the implementation)

integration
SignpostMarv 2012-10-05 14:01:29 +01:00 committed by Justin Clark-Casey (justincc)
parent ed162a10be
commit 375fb66589
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/CoreModules/World/Sound/SoundModuleNonShared.cs
View File

@ -48,13 +48,19 @@ namespace OpenSim.Region.CoreModules.World.Sound
public bool Enabled { get; private set; } public bool Enabled { get; private set; }
public float MaxDistance { get; private set; }
#region INonSharedRegionModule #region INonSharedRegionModule
public void Initialise(IConfigSource configSource) public void Initialise(IConfigSource configSource)
{ {
IConfig config = configSource.Configs["Sounds"]; IConfig config = configSource.Configs["Sounds"];
Enabled = (config != null && config.GetString("Module", "SoundModuleNonShared") == "SoundModuleNonShared"); if (config == null)
return;
Enabled = config.GetString("Module", "SoundModuleNonShared") == "SoundModuleNonShared";
MaxDistance = config.GetFloat("MaxDistance", 100.0f);
} }
public void AddRegion(Scene scene) { } public void AddRegion(Scene scene) { }
@ -109,7 +115,7 @@ namespace OpenSim.Region.CoreModules.World.Sound
m_scene.ForEachRootScenePresence(delegate(ScenePresence sp) m_scene.ForEachRootScenePresence(delegate(ScenePresence sp)
{ {
double dis = Util.GetDistanceTo(sp.AbsolutePosition, position); double dis = Util.GetDistanceTo(sp.AbsolutePosition, position);
if (dis > 100.0) // Max audio distance if (dis > MaxDistance) // Max audio distance
return; return;
if (grp.IsAttachment) if (grp.IsAttachment)
@ -158,7 +164,7 @@ namespace OpenSim.Region.CoreModules.World.Sound
{ {
double dis = Util.GetDistanceTo(sp.AbsolutePosition, position); double dis = Util.GetDistanceTo(sp.AbsolutePosition, position);
if (dis > 100.0) // Max audio distance if (dis > MaxDistance) // Max audio distance
return; return;
float thisSpGain; float thisSpGain;

2
OpenSim/Region/Framework/Interfaces/ISoundModule.cs
View File

@ -32,6 +32,8 @@ namespace OpenSim.Region.Framework.Interfaces
{ {
public interface ISoundModule public interface ISoundModule
{ {
float MaxDistance { get; }
void PlayAttachedSound(UUID soundID, UUID ownerID, UUID objectID, double gain, Vector3 position, byte flags, float radius); void PlayAttachedSound(UUID soundID, UUID ownerID, UUID objectID, double gain, Vector3 position, byte flags, float radius);
void TriggerSound( void TriggerSound(