From 574b97d93d3118fb6f6bd0113711551fcc5712cb Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Sun, 24 Jul 2016 21:16:14 +0100
Subject: ubOde fix contact relative velocity sign

---
 OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs | 61 +++++++++++++------------
 1 file changed, 31 insertions(+), 30 deletions(-)

(limited to 'OpenSim/Region/PhysicsModules')

diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
index e0644e3..a49c44c 100644
--- a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
@@ -1079,44 +1079,45 @@ namespace OpenSim.Region.PhysicsModule.ubOde
             {
                 case ActorTypes.Agent:
                 case ActorTypes.Prim:
+                {
+                    switch ((ActorTypes)p2.PhysicsActorType)
                     {
-                        switch ((ActorTypes)p2.PhysicsActorType)
-                        {
-                            case ActorTypes.Agent:
-                            case ActorTypes.Prim:
-                                if (p2events)
-                                {
-                                    AddCollisionEventReporting(p2);
-                                    p2.AddCollisionEvent(p1.ParentActor.LocalID, contact);
-                                }
-                                obj2LocalID = p2.ParentActor.LocalID;
-                                break;
+                        case ActorTypes.Agent:
+                        case ActorTypes.Prim:
+                            if (p2events)
+                            {
+                                AddCollisionEventReporting(p2);
+                                p2.AddCollisionEvent(p1.ParentActor.LocalID, contact);
+                            }
+                            obj2LocalID = p2.ParentActor.LocalID;
+                            break;
 
-                            case ActorTypes.Ground:
-                            case ActorTypes.Unknown:
-                            default:
-                                obj2LocalID = 0;
-                                break;
-                        }
-                        if (p1events)
-                        {
-                            contact.SurfaceNormal = -contact.SurfaceNormal;
-                            AddCollisionEventReporting(p1);
-                            p1.AddCollisionEvent(obj2LocalID, contact);
-                        }
-                        break;
+                        case ActorTypes.Ground:
+                        case ActorTypes.Unknown:
+                        default:
+                            obj2LocalID = 0;
+                            break;
+                    }
+                    if (p1events)
+                    {
+                        contact.SurfaceNormal = -contact.SurfaceNormal;
+                        contact.RelativeSpeed = -contact.RelativeSpeed;
+                        AddCollisionEventReporting(p1);
+                        p1.AddCollisionEvent(obj2LocalID, contact);
                     }
+                    break;
+                }
                 case ActorTypes.Ground:
                 case ActorTypes.Unknown:
                 default:
+                {
+                    if (p2events && !p2.IsVolumeDtc)
                     {
-                        if (p2events && !p2.IsVolumeDtc)
-                        {
-                            AddCollisionEventReporting(p2);
-                            p2.AddCollisionEvent(0, contact);
-                        }
-                        break;
+                        AddCollisionEventReporting(p2);
+                        p2.AddCollisionEvent(0, contact);
                     }
+                    break;
+                }
             }
         }
 
-- 
cgit v1.1