diff options
author | Robert Adams | 2017-09-02 13:06:36 -0700 |
---|---|---|
committer | Robert Adams | 2017-09-02 13:06:36 -0700 |
commit | 0afa3a294ab36382cf720e9cceb9211a83fbf101 (patch) | |
tree | 5e5c1c62be9880052a2cab1a33055017d2d868bd /OpenSim/Region/PhysicsModules/BulletS/BSApiTemplate.cs | |
parent | fix cache.cs (used on parcels info) (diff) | |
download | opensim-SC_OLD-0afa3a294ab36382cf720e9cceb9211a83fbf101.zip opensim-SC_OLD-0afa3a294ab36382cf720e9cceb9211a83fbf101.tar.gz opensim-SC_OLD-0afa3a294ab36382cf720e9cceb9211a83fbf101.tar.bz2 opensim-SC_OLD-0afa3a294ab36382cf720e9cceb9211a83fbf101.tar.xz |
BulletSim: most of the plumbing for raycast. Needs new BulletSim.dll to
work.
Diffstat (limited to 'OpenSim/Region/PhysicsModules/BulletS/BSApiTemplate.cs')
-rw-r--r-- | OpenSim/Region/PhysicsModules/BulletS/BSApiTemplate.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSApiTemplate.cs b/OpenSim/Region/PhysicsModules/BulletS/BSApiTemplate.cs index 816189f..afb0ba2 100644 --- a/OpenSim/Region/PhysicsModules/BulletS/BSApiTemplate.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSApiTemplate.cs | |||
@@ -128,6 +128,7 @@ public struct RaycastHit | |||
128 | public UInt32 ID; | 128 | public UInt32 ID; |
129 | public float Fraction; | 129 | public float Fraction; |
130 | public Vector3 Normal; | 130 | public Vector3 Normal; |
131 | public Vector3 Point; | ||
131 | } | 132 | } |
132 | [StructLayout(LayoutKind.Sequential)] | 133 | [StructLayout(LayoutKind.Sequential)] |
133 | public struct CollisionDesc | 134 | public struct CollisionDesc |
@@ -742,6 +743,12 @@ public abstract void SetMargin(BulletShape shape, float val); | |||
742 | public abstract float GetMargin(BulletShape shape); | 743 | public abstract float GetMargin(BulletShape shape); |
743 | 744 | ||
744 | // ===================================================================================== | 745 | // ===================================================================================== |
746 | // Raycast | ||
747 | public abstract SweepHit ConvexSweepTest2(BulletWorld world, BulletBody obj, Vector3 from, Vector3 to, float margin); | ||
748 | |||
749 | public abstract RaycastHit RayTest2(BulletWorld world, Vector3 from, Vector3 to, uint filterGroup, uint filterMask); | ||
750 | |||
751 | // ===================================================================================== | ||
745 | // Debugging | 752 | // Debugging |
746 | public virtual void DumpRigidBody(BulletWorld sim, BulletBody collisionObject) { } | 753 | public virtual void DumpRigidBody(BulletWorld sim, BulletBody collisionObject) { } |
747 | 754 | ||