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

collision sounds: simplify send code a bit and limit sending rate to 5 per sec per part ???

avinationmerge
UbitUmarov 2012-05-16 23:36:37 +01:00
parent ea47b03625
commit 0de7219485
1 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -188,6 +188,7 @@ namespace OpenSim.Region.Framework.Scenes
public double SoundRadius;
public uint TimeStampFull;
public uint TimeStampLastActivity; // Will be used for AutoReturn
@ -332,6 +333,8 @@ namespace OpenSim.Region.Framework.Scenes
private UUID m_collisionSound;
private float m_collisionSoundVolume;
private DateTime LastColSoundSentTime;
private SOPVehicle m_vehicle = null;
@ -371,6 +374,7 @@ namespace OpenSim.Region.Framework.Scenes
// this appears to have the same UUID (!) as the prim. If this isn't the case, one can't drag items from
// the prim into an agent inventory (Linden client reports that the "Object not found for drop" in its log
m_inventory = new SceneObjectPartInventory(this);
LastColSoundSentTime = DateTime.UtcNow;
}
/// <summary>
@ -2660,7 +2664,7 @@ namespace OpenSim.Region.Framework.Scenes
if (IsNotVolumeDtc && startedColliders.Count > 0 && CollisionSoundVolume > 0.0f && CollisionSound != invalidCollisionSoundUUID)
{
if(CollisionSound != UUID.Zero)
SendSound(CollisionSound.ToString(), CollisionSoundVolume, true, (byte)0, 0, false, false);
SendCollisionSound(CollisionSound, CollisionSoundVolume);
else
{
// default sounds
@ -3199,6 +3203,37 @@ namespace OpenSim.Region.Framework.Scenes
}
}
public void SendCollisionSound(UUID soundID, double volume)
{
if (soundID == UUID.Zero)
return;
ISoundModule soundModule = ParentGroup.Scene.RequestModuleInterface<ISoundModule>();
if (soundModule == null)
return;
if (volume > 1)
volume = 1;
if (volume < 0)
volume = 0;
DateTime now = DateTime.UtcNow;
if((now - LastColSoundSentTime).Milliseconds < 200) // reduce rate to 5 per sec per part ??
return;
LastColSoundSentTime = now;
UUID ownerID = OwnerID;
UUID objectID = ParentGroup.RootPart.UUID;
UUID parentID = ParentGroup.UUID;
Vector3 position = AbsolutePosition; // region local
ulong regionHandle = ParentGroup.Scene.RegionInfo.RegionHandle;
soundModule.TriggerSound(soundID, ownerID, objectID, parentID, volume, position, regionHandle, 0);
}
/// <summary>
/// Send a terse update to all clients
/// </summary>