Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

OpenSim/Region/Framework/Scenes/CollisionSounds.cs

@@ -40,7 +40,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         private const int MaxMaterials = 7;
         // part part
-        private static UUID snd_StoneStone = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
+        private static UUID  snd_StoneStone = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
         private static UUID  snd_StoneMetal = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
         private static UUID  snd_StoneGlass = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
         private static UUID  snd_StoneWood  = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
@@ -48,7 +48,6 @@ namespace OpenSim.Region.Framework.Scenes
         private static UUID  snd_StonePlastic = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
         private static UUID  snd_StoneRubber = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
 
-        private static UUID  snd_MetalStone = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
         private static UUID  snd_MetalMetal = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
         private static UUID  snd_MetalGlass = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
         private static UUID  snd_MetalWood  = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
@@ -56,44 +55,24 @@ namespace OpenSim.Region.Framework.Scenes
         private static UUID  snd_MetalPlastic = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
         private static UUID  snd_MetalRubber = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
 
-        private static UUID  snd_GlassStone = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
-        private static UUID  snd_GlassMetal = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
         private static UUID  snd_GlassGlass = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
         private static UUID  snd_GlassWood  = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
         private static UUID  snd_GlassFlesh = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
         private static UUID  snd_GlassPlastic = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
         private static UUID  snd_GlassRubber = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
 
-        private static UUID  snd_WoodStone = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
-        private static UUID  snd_WoodMetal = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
-        private static UUID  snd_WoodGlass = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
         private static UUID  snd_WoodWood  = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
         private static UUID  snd_WoodFlesh = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
         private static UUID  snd_WoodPlastic = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
         private static UUID  snd_WoodRubber = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
 
-        private static UUID  snd_FleshStone = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
-        private static UUID  snd_FleshMetal = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
-        private static UUID  snd_FleshGlass = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
-        private static UUID  snd_FleshWood  = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
         private static UUID  snd_FleshFlesh = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
         private static UUID  snd_FleshPlastic = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
         private static UUID  snd_FleshRubber = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
 
-        private static UUID  snd_PlasticStone = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
-        private static UUID  snd_PlasticMetal = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
-        private static UUID  snd_PlasticGlass = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
-        private static UUID  snd_PlasticWood  = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
-        private static UUID  snd_PlasticFlesh = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
         private static UUID  snd_PlasticPlastic = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
         private static UUID  snd_PlasticRubber = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
 
-        private static UUID snd_RubberStone = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
-        private static UUID snd_RubberMetal = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
-        private static UUID snd_RubberGlass = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
-        private static UUID snd_RubberWood = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
-        private static UUID snd_RubberFlesh = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
-        private static UUID snd_RubberPlastic = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
         private static UUID snd_RubberRubber = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a");
 
         // terrain part
@@ -117,16 +96,19 @@ namespace OpenSim.Region.Framework.Scenes
 
         public static UUID[] m_PartPart = {
             snd_StoneStone, snd_StoneMetal, snd_StoneGlass, snd_StoneWood, snd_StoneFlesh, snd_StonePlastic, snd_StoneRubber,
-            snd_MetalStone, snd_MetalMetal, snd_MetalGlass, snd_MetalWood, snd_MetalFlesh, snd_MetalPlastic, snd_MetalRubber,
+            snd_StoneMetal, snd_MetalMetal, snd_MetalGlass, snd_MetalWood, snd_MetalFlesh, snd_MetalPlastic, snd_MetalRubber,
-            snd_GlassStone, snd_GlassMetal, snd_GlassGlass, snd_GlassWood, snd_GlassFlesh, snd_GlassPlastic, snd_GlassRubber,
+            snd_StoneGlass, snd_MetalGlass, snd_GlassGlass, snd_GlassWood, snd_GlassFlesh, snd_GlassPlastic, snd_GlassRubber,
-            snd_WoodStone, snd_WoodMetal, snd_WoodGlass, snd_WoodWood, snd_WoodFlesh, snd_WoodPlastic, snd_WoodRubber,
+            snd_StoneWood, snd_MetalWood, snd_GlassWood, snd_WoodWood, snd_WoodFlesh, snd_WoodPlastic, snd_WoodRubber,
-            snd_FleshStone, snd_FleshMetal, snd_FleshGlass, snd_FleshWood, snd_FleshFlesh, snd_FleshPlastic, snd_FleshRubber,
+            snd_StoneFlesh, snd_MetalFlesh, snd_GlassFlesh, snd_WoodFlesh, snd_FleshFlesh, snd_FleshPlastic, snd_FleshRubber,
-            snd_PlasticStone, snd_PlasticMetal, snd_PlasticGlass, snd_PlasticWood, snd_PlasticFlesh, snd_PlasticPlastic, snd_PlasticRubber,
+            snd_StonePlastic, snd_MetalPlastic, snd_GlassPlastic, snd_WoodPlastic, snd_FleshPlastic, snd_PlasticPlastic, snd_PlasticRubber,
-            snd_RubberStone, snd_RubberMetal, snd_RubberGlass, snd_RubberWood, snd_RubberFlesh, snd_RubberPlastic, snd_RubberRubber
+            snd_StoneRubber, snd_MetalRubber, snd_GlassRubber, snd_WoodRubber, snd_FleshRubber, snd_PlasticRubber, snd_RubberRubber
             };
 
         public static void PartCollisionSound(SceneObjectPart part,List<uint> Colliders)
         {
+            // temporary mute sounds
+            return;
+
             if(Colliders.Count == 0 || part == null)
                 return;
 
@@ -214,6 +196,9 @@ namespace OpenSim.Region.Framework.Scenes
 
         public static void AvatarCollisionSound(ScenePresence av, List<uint> Colliders)
         {
+            // temporary mute sounds
+            return;
+
             if (Colliders.Count == 0 || av == null)
                 return;
 

OpenSim/Region/Physics/Manager/PhysicsActor.cs

@@ -59,12 +59,14 @@ namespace OpenSim.Region.Physics.Manager
         public Vector3 Position;
         public Vector3 SurfaceNormal;
         public float PenetrationDepth;
+        public float RelativeSpeed;
 
         public ContactPoint(Vector3 position, Vector3 surfaceNormal, float penetrationDepth)
         {
             Position = position;
             SurfaceNormal = surfaceNormal;
             PenetrationDepth = penetrationDepth;
+            RelativeSpeed = 0f; // for now let this one be set explicity
         }
     }
 

OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs

@@ -903,6 +903,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                         contact.SurfaceNormal.X = 0f;
                         contact.SurfaceNormal.Y = 0f;
                         contact.SurfaceNormal.Z = -1f;
+                        contact.RelativeSpeed = -vel.Z;
                         AddCollisionEvent(0, contact);
 
                         vec.Z *= 0.5f;

OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs

@@ -1064,7 +1064,7 @@ namespace OpenSim.Region.Physics.OdePlugin
             obj2LocalID = 0;
             bool p1events = p1.SubscribedEvents();
             bool p2events = p2.SubscribedEvents();
-
+           
             if (p1.IsVolumeDtc)
                 p2events = false;
             if (p2.IsVolumeDtc)
@@ -1073,6 +1073,15 @@ namespace OpenSim.Region.Physics.OdePlugin
             if (!(p2events || p1events))
                 return;
 
+            Vector3 vel = Vector3.Zero;
+            if (p2 != null && p2.IsPhysical)
+                vel = p2.Velocity;
+
+            if (p1 != null && p1.IsPhysical)
+                vel -= p1.Velocity;
+
+            contact.RelativeSpeed = Vector3.Dot(vel, contact.SurfaceNormal);
+             
             switch ((ActorTypes)p1.PhysicsActorType)
                 {
                 case ActorTypes.Agent: