ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 03:06:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Mantis#2656. Thank you kindly, Nlin for a patch that:

Browse Source 
Attached patch implements llCollisionSound. Thanks T. Sado.
This commit is contained in:
Charles Krinke
2008-11-19 18:30:16 +00:00
parent 778d83d9f0
commit 44c56a974c
6 changed files with 84 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -201,6 +201,10 @@ namespace OpenSim.Region.Environment.Scenes
private Vector3 m_cameraAtOffset = new Vector3(0.0f, 0.0f, 0.0f);
private bool m_forceMouselook = false;
// TODO: Collision sound should have default.
private UUID m_collisionSound = UUID.Zero;
private float m_collisionSoundVolume = 0.0f;
#endregion Fields
#region Constructors
@@ -952,6 +956,22 @@ if (m_shape != null) {
set { m_sitAnimation = value; }
}
public UUID CollisionSound
{
get { return m_collisionSound; }
set
{
m_collisionSound = value;
aggregateScriptEvents();
}
}
public float CollisionSoundVolume
{
get { return m_collisionSoundVolume; }
set { m_collisionSoundVolume = value; }
}
#endregion Public Properties with only Get
@@ -1607,6 +1627,12 @@ if (m_shape != null) {
if (m_parentGroup.IsDeleted)
return;
// play the sound.
if (startedColliders.Count > 0 && CollisionSound != UUID.Zero && CollisionSoundVolume > 0.0f)
{
SendSound(CollisionSound.ToString(), CollisionSoundVolume, true, (byte)0);
}
if ((m_parentGroup.RootPart.ScriptEvents & scriptEvents.collision_start) != 0)
{
// do event notification
@@ -3233,7 +3259,8 @@ if (m_shape != null) {
if (
((AggregateScriptEvents & scriptEvents.collision) != 0) ||
((AggregateScriptEvents & scriptEvents.collision_end) != 0) ||
((AggregateScriptEvents & scriptEvents.collision_start) != 0)
((AggregateScriptEvents & scriptEvents.collision_start) != 0) ||
(CollisionSound != null && CollisionSound != UUID.Zero)
)
{
// subscribe to physics updates.
@@ -3252,6 +3279,13 @@ if (m_shape != null) {
PhysActor.OnCollisionUpdate -= PhysicsCollision;
}
}
if (m_parentGroup == null)
{
ScheduleFullUpdate();
return;
}
if ((GetEffectiveObjectFlags() & (uint)PrimFlags.Scripted) != 0)
{
m_parentGroup.Scene.EventManager.OnScriptTimerEvent += handleTimerAccounting;
@@ -3363,3 +3397,4 @@ if (m_shape != null) {