diff options
| author | Robert Adams | 2012-09-13 13:51:42 -0700 |
|---|---|---|
| committer | Robert Adams | 2012-09-15 15:31:54 -0700 |
| commit | 6632eb7c051e2638ea1c58c2876e7d6825398556 (patch) | |
| tree | 15e19cbd50e4ab1934d7ae2290784cf54488641f /OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |
| parent | BulletSim: set all linkset objects center of mass to the whole linkset's cent... (diff) | |
| download | opensim-SC-6632eb7c051e2638ea1c58c2876e7d6825398556.zip opensim-SC-6632eb7c051e2638ea1c58c2876e7d6825398556.tar.gz opensim-SC-6632eb7c051e2638ea1c58c2876e7d6825398556.tar.bz2 opensim-SC-6632eb7c051e2638ea1c58c2876e7d6825398556.tar.xz | |
BulletSim: Remove calculation and passing of unused collied object type.
Fix collision code to properly sense mega-region children regions as terrain.
When setting an object physical, reset all the physical properties (friction, ...).
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs index 969c53e..3fe71e1 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |||
| @@ -41,7 +41,7 @@ public abstract class BSPhysObject : PhysicsActor | |||
| 41 | { | 41 | { |
| 42 | public abstract BSLinkset Linkset { get; set; } | 42 | public abstract BSLinkset Linkset { get; set; } |
| 43 | 43 | ||
| 44 | public abstract bool Collide(uint collidingWith, BSPhysObject collidee, ActorTypes type, | 44 | public abstract bool Collide(uint collidingWith, BSPhysObject collidee, |
| 45 | OMV.Vector3 contactPoint, OMV.Vector3 contactNormal, float pentrationDepth); | 45 | OMV.Vector3 contactPoint, OMV.Vector3 contactNormal, float pentrationDepth); |
| 46 | public abstract void SendCollisions(); | 46 | public abstract void SendCollisions(); |
| 47 | 47 | ||