aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/UbitOdePlugin
diff options
context:
space:
mode:
authorUbitUmarov2013-05-29 04:47:59 +0100
committerUbitUmarov2013-05-29 04:47:59 +0100
commit1cf24b70925f206f334fadb0baf20779aa9793f6 (patch)
tree7c8c6e055f59cd76e2079191fef40349c698378a /OpenSim/Region/Physics/UbitOdePlugin
parentmissing file (diff)
downloadopensim-SC-1cf24b70925f206f334fadb0baf20779aa9793f6.zip
opensim-SC-1cf24b70925f206f334fadb0baf20779aa9793f6.tar.gz
opensim-SC-1cf24b70925f206f334fadb0baf20779aa9793f6.tar.bz2
opensim-SC-1cf24b70925f206f334fadb0baf20779aa9793f6.tar.xz
make sure friction slip parameters are zero ( or other value ) and not
default cmf
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin')
-rw-r--r--OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
index 49dc03c..8abf6cf 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
@@ -175,10 +175,10 @@ namespace OpenSim.Region.Physics.OdePlugin
175 175
176// const d.ContactFlags comumContactFlags = d.ContactFlags.SoftERP | d.ContactFlags.SoftCFM |d.ContactFlags.Approx1 | d.ContactFlags.Bounce; 176// const d.ContactFlags comumContactFlags = d.ContactFlags.SoftERP | d.ContactFlags.SoftCFM |d.ContactFlags.Approx1 | d.ContactFlags.Bounce;
177 177
178 const d.ContactFlags comumContactFlags = d.ContactFlags.Bounce | d.ContactFlags.Approx1; 178 const d.ContactFlags comumContactFlags = d.ContactFlags.Bounce | d.ContactFlags.Approx1 | d.ContactFlags.Slip1 | d.ContactFlags.Slip2;
179 const float comumContactERP = 0.7f; 179 const float comumContactERP = 0.7f;
180 const float comumContactCFM = 0.0001f; 180 const float comumContactCFM = 0.0001f;
181 const float comumContactSLIP = 0.000001f; 181 const float comumContactSLIP = 0f;
182 182
183 float frictionMovementMult = 0.8f; 183 float frictionMovementMult = 0.8f;
184 184
@@ -411,7 +411,7 @@ namespace OpenSim.Region.Physics.OdePlugin
411 d.GeomSetCategoryBits(GroundSpace, (uint)(CollisionCategories.Land)); 411 d.GeomSetCategoryBits(GroundSpace, (uint)(CollisionCategories.Land));
412 d.GeomSetCollideBits(GroundSpace, 0); 412 d.GeomSetCollideBits(GroundSpace, 0);
413 413
414 contactgroup = d.JointGroupCreate(0); 414 contactgroup = d.JointGroupCreate(maxContactsbeforedeath + 1);
415 //contactgroup 415 //contactgroup
416 416
417 d.WorldSetAutoDisableFlag(world, false); 417 d.WorldSetAutoDisableFlag(world, false);