diff options
| author | Melanie | 2012-12-21 22:13:41 +0000 |
|---|---|---|
| committer | Melanie | 2012-12-21 22:13:41 +0000 |
| commit | 569f39e1242044a46693926c31d86fff6b4b228c (patch) | |
| tree | 69fb5c2b0ce512336680b48bbf89bb42bb8f5b88 /OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | BulletSim: small fix to avatar movement motor use which keeps avatar from fly... (diff) | |
| download | opensim-SC-569f39e1242044a46693926c31d86fff6b4b228c.zip opensim-SC-569f39e1242044a46693926c31d86fff6b4b228c.tar.gz opensim-SC-569f39e1242044a46693926c31d86fff6b4b228c.tar.bz2 opensim-SC-569f39e1242044a46693926c31d86fff6b4b228c.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs index 069cb0d..2ca4912 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |||
| @@ -96,6 +96,16 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters | |||
| 96 | public long SimulationStep { get { return m_simulationStep; } } | 96 | public long SimulationStep { get { return m_simulationStep; } } |
| 97 | private int m_taintsToProcessPerStep; | 97 | private int m_taintsToProcessPerStep; |
| 98 | 98 | ||
| 99 | // Avatar parameters | ||
| 100 | public float ParamAvatarFriction { get; private set; } | ||
| 101 | public float ParamAvatarStandingFriction { get; private set; } | ||
| 102 | public float ParamAvatarDensity { get; private set; } | ||
| 103 | public float ParamAvatarRestitution { get; private set; } | ||
| 104 | public float ParamAvatarCapsuleWidth { get; private set; } | ||
| 105 | public float ParamAvatarCapsuleDepth { get; private set; } | ||
| 106 | public float ParamAvatarCapsuleHeight { get; private set; } | ||
| 107 | public float ParamAvatarContactProcessingThreshold { get; private set; } | ||
| 108 | |||
| 99 | public delegate void PreStepAction(float timeStep); | 109 | public delegate void PreStepAction(float timeStep); |
| 100 | public event PreStepAction BeforeStep; | 110 | public event PreStepAction BeforeStep; |
| 101 | 111 | ||