diff options
| author | UbitUmarov | 2016-07-25 01:07:19 +0100 |
|---|---|---|
| committer | UbitUmarov | 2016-07-25 01:07:19 +0100 |
| commit | e60dc305a41443c25e842624595b89cf4dffcd85 (patch) | |
| tree | c09cf54129c0d3fc625e4e083d481538514065ee | |
| parent | change avatar Health, from bad penetration depth to relative velocity (diff) | |
| download | opensim-SC-e60dc305a41443c25e842624595b89cf4dffcd85.zip opensim-SC-e60dc305a41443c25e842624595b89cf4dffcd85.tar.gz opensim-SC-e60dc305a41443c25e842624595b89cf4dffcd85.tar.bz2 opensim-SC-e60dc305a41443c25e842624595b89cf4dffcd85.tar.xz | |
change bullet relative velocity sign to match ubOde
| -rwxr-xr-x | OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs b/OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs index a70d1b8..bb21f0c 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs | |||
| @@ -508,7 +508,7 @@ public abstract class BSPhysObject : PhysicsActor | |||
| 508 | relvel = RawVelocity; | 508 | relvel = RawVelocity; |
| 509 | if (collidee != null && collidee.IsPhysical) | 509 | if (collidee != null && collidee.IsPhysical) |
| 510 | relvel -= collidee.RawVelocity; | 510 | relvel -= collidee.RawVelocity; |
| 511 | newContact.RelativeSpeed = OMV.Vector3.Dot(relvel, contactNormal); | 511 | newContact.RelativeSpeed = -OMV.Vector3.Dot(relvel, contactNormal); |
| 512 | // DetailLog("{0},{1}.Collision.AddCollider,vel={2},contee.vel={3},relvel={4},relspeed={5}", | 512 | // DetailLog("{0},{1}.Collision.AddCollider,vel={2},contee.vel={3},relvel={4},relspeed={5}", |
| 513 | // LocalID, TypeName, RawVelocity, (collidee == null ? OMV.Vector3.Zero : collidee.RawVelocity), relvel, newContact.RelativeSpeed); | 513 | // LocalID, TypeName, RawVelocity, (collidee == null ? OMV.Vector3.Zero : collidee.RawVelocity), relvel, newContact.RelativeSpeed); |
| 514 | 514 | ||