Revision: 7746
http://playerstage.svn.sourceforge.net/playerstage/?rev=7746&view=rev
Author: hsujohnhsu
Date: 2009-05-30 05:43:06 +0000 (Sat, 30 May 2009)
Log Message:
-----------
do not over-ride user set friction.
Modified Paths:
--------------
code/gazebo/branches/threads/server/physics/Geom.cc
Modified: code/gazebo/branches/threads/server/physics/Geom.cc
===================================================================
--- code/gazebo/branches/threads/server/physics/Geom.cc 2009-05-30 01:18:13 UTC
(rev 7745)
+++ code/gazebo/branches/threads/server/physics/Geom.cc 2009-05-30 05:43:06 UTC
(rev 7746)
@@ -645,10 +645,11 @@
}
else
{
- this->contact->mu1 = dInfinity;
- this->contact->mu2 = dInfinity;
- this->contact->slip1 = 0.1;
- this->contact->slip2 = 0.1;
+ //leave to user set friction if SetFrictionMode is true
+ //this->contact->mu1 = dInfinity;
+ //this->contact->mu2 = dInfinity;
+ //this->contact->slip1 = 0.1;
+ //this->contact->slip2 = 0.1;
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT
is a gathering of tech-side developers & brand creativity professionals. Meet
the minds behind Google Creative Lab, Visual Complexity, Processing, &
iPhoneDevCamp as they present alongside digital heavyweights like Barbarian
Group, R/GA, & Big Spaceship. http://p.sf.net/sfu/creativitycat-com
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
