diff options
| author | Robert Adams | 2012-12-21 13:35:44 -0800 |
|---|---|---|
| committer | Robert Adams | 2012-12-21 13:35:44 -0800 |
| commit | ae4d932e7f00e781db9c9cdd5c29efc51e2425fb (patch) | |
| tree | b03beb291cd35d4227fb82baf04ce14512b859eb /OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs | |
| parent | BulletSim: small fix to avatar movement motor use which keeps avatar from fly... (diff) | |
| download | opensim-SC_OLD-ae4d932e7f00e781db9c9cdd5c29efc51e2425fb.zip opensim-SC_OLD-ae4d932e7f00e781db9c9cdd5c29efc51e2425fb.tar.gz opensim-SC_OLD-ae4d932e7f00e781db9c9cdd5c29efc51e2425fb.tar.bz2 opensim-SC_OLD-ae4d932e7f00e781db9c9cdd5c29efc51e2425fb.tar.xz | |
BulletSim: Move all the parameter variables, tables and get and fetch logic to a separate, static class for easier addition and to remove all that bulk from the BSScene class.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs index 6dc0d92..061e232 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs | |||
| @@ -116,9 +116,9 @@ public sealed class BSTerrainMesh : BSTerrainPhys | |||
| 116 | } | 116 | } |
| 117 | 117 | ||
| 118 | // Set current terrain attributes | 118 | // Set current terrain attributes |
| 119 | BulletSimAPI.SetFriction2(m_terrainBody.ptr, PhysicsScene.Params.terrainFriction); | 119 | BulletSimAPI.SetFriction2(m_terrainBody.ptr, BSParam.TerrainFriction); |
| 120 | BulletSimAPI.SetHitFraction2(m_terrainBody.ptr, PhysicsScene.Params.terrainHitFraction); | 120 | BulletSimAPI.SetHitFraction2(m_terrainBody.ptr, BSParam.TerrainHitFraction); |
| 121 | BulletSimAPI.SetRestitution2(m_terrainBody.ptr, PhysicsScene.Params.terrainRestitution); | 121 | BulletSimAPI.SetRestitution2(m_terrainBody.ptr, BSParam.TerrainRestitution); |
| 122 | BulletSimAPI.SetCollisionFlags2(m_terrainBody.ptr, CollisionFlags.CF_STATIC_OBJECT); | 122 | BulletSimAPI.SetCollisionFlags2(m_terrainBody.ptr, CollisionFlags.CF_STATIC_OBJECT); |
| 123 | 123 | ||
| 124 | // Static objects are not very massive. | 124 | // Static objects are not very massive. |