OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

avinationmerge
ubit 2012-07-09 17:53:26 +02:00
parent e858c19a9a 0ac161c9a8
commit 6dab81aa7b
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
View File

@ -175,7 +175,7 @@ namespace OpenSim.Region.Physics.OdePlugin
const d.ContactFlags comumContactFlags = d.ContactFlags.SoftERP | d.ContactFlags.SoftCFM |d.ContactFlags.Approx1 | d.ContactFlags.Bounce;
const float MaxERP = 0.8f;
const float minERP = 0.1f;
const float minERP = 0.2f;
const float comumContactCFM = 0.0001f;
float frictionMovementMult = 0.8f;
@ -408,7 +408,7 @@ namespace OpenSim.Region.Physics.OdePlugin
// checkThread();
mesher = meshmerizer;
m_config = config;
/*
string ode_config = d.GetConfiguration("ODE");
if (ode_config != null && ode_config != "")
{
@ -419,7 +419,7 @@ namespace OpenSim.Region.Physics.OdePlugin
OdeUbitLib = true;
}
}
*/
/*
if (region != null)
{
@ -921,6 +921,8 @@ namespace OpenSim.Region.Physics.OdePlugin
cfm = 0.0001f / cfm;
if (cfm > 0.01f)
cfm = 0.01f;
else if (cfm < 0.0001f)
cfm = 0.0001f;
if ((Math.Abs(p2.Velocity.X - p1.Velocity.X) > 0.1f || Math.Abs(p2.Velocity.Y - p1.Velocity.Y) > 0.1f))
mu *= frictionMovementMult;
@ -947,6 +949,8 @@ namespace OpenSim.Region.Physics.OdePlugin
cfm = 0.0001f / cfm;
if (cfm > 0.01f)
cfm = 0.01f;
else if (cfm < 0.0001f)
cfm = 0.0001f;
if (d.GeomGetClass(g1) == d.GeomClassID.TriMeshClass)
{