diff options
| author | Justin Clark-Casey (justincc) | 2012-01-25 23:24:44 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-01-25 23:24:44 +0000 |
| commit | 8e5502fdc267dfc9fdce4f84f88efc4868dcc1b8 (patch) | |
| tree | ccd2f22a184fc1c0007e0f1089639fa70e482aa6 /OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |
| parent | refactor: decompose most of RezScript() into RezScriptFromAgentInventory(), R... (diff) | |
| parent | Update save oar and save iar help responses to reflect new -h|--home (diff) | |
| download | opensim-SC_OLD-8e5502fdc267dfc9fdce4f84f88efc4868dcc1b8.zip opensim-SC_OLD-8e5502fdc267dfc9fdce4f84f88efc4868dcc1b8.tar.gz opensim-SC_OLD-8e5502fdc267dfc9fdce4f84f88efc4868dcc1b8.tar.bz2 opensim-SC_OLD-8e5502fdc267dfc9fdce4f84f88efc4868dcc1b8.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs index a610c8d..d12bd7d 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |||
| @@ -122,6 +122,7 @@ public struct ConfigurationParameters | |||
| 122 | public float angularSleepingThreshold; | 122 | public float angularSleepingThreshold; |
| 123 | public float ccdMotionThreshold; | 123 | public float ccdMotionThreshold; |
| 124 | public float ccdSweptSphereRadius; | 124 | public float ccdSweptSphereRadius; |
| 125 | public float contactProcessingThreshold; | ||
| 125 | 126 | ||
| 126 | public float terrainFriction; | 127 | public float terrainFriction; |
| 127 | public float terrainHitFraction; | 128 | public float terrainHitFraction; |
| @@ -248,6 +249,9 @@ public static extern RaycastHit RayTest(uint worldID, uint id, Vector3 from, Vec | |||
| 248 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 249 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
| 249 | public static extern Vector3 RecoverFromPenetration(uint worldID, uint id); | 250 | public static extern Vector3 RecoverFromPenetration(uint worldID, uint id); |
| 250 | 251 | ||
| 252 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
| 253 | public static extern void DumpBulletStatistics(); | ||
| 254 | |||
| 251 | // Log a debug message | 255 | // Log a debug message |
| 252 | [UnmanagedFunctionPointer(CallingConvention.Cdecl)] | 256 | [UnmanagedFunctionPointer(CallingConvention.Cdecl)] |
| 253 | public delegate void DebugLogCallback([MarshalAs(UnmanagedType.LPStr)]string msg); | 257 | public delegate void DebugLogCallback([MarshalAs(UnmanagedType.LPStr)]string msg); |