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-05-12 13:19:57 +02:00
parent 08b51a94ac 46095c963c
commit 67ee100f2f
2 changed files with 51 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
View File

@ -1006,9 +1006,9 @@ namespace OpenSim.Region.Physics.OdePlugin
}
}
if (velLengthSquared > 625.0f) // 25m/s apply breaks
if (velLengthSquared > 2500.0f) // 50m/s apply breaks
{
breakfactor = 0.31f * m_mass;
breakfactor = 0.16f * m_mass;
vec.X -= breakfactor * vel.X;
vec.Y -= breakfactor * vel.Y;
vec.Z -= breakfactor * vel.Z;

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

@ -537,7 +537,7 @@ namespace OpenSim.Region.Physics.OdePlugin
// Essentially Steps * m_physicsiterations
d.WorldSetQuickStepNumIterations(world, m_physicsiterations);
d.WorldSetContactMaxCorrectingVel(world, 50.0f);
d.WorldSetContactMaxCorrectingVel(world, 100.0f);
spacesPerMeter = 1 / metersInSpace;
spaceGridMaxX = (int)(WorldExtents.X * spacesPerMeter);
@ -754,14 +754,15 @@ namespace OpenSim.Region.Physics.OdePlugin
}
// big messy collision analises
Vector3 normoverride = Vector3.Zero; //damm c#
float mu = 0;
float bounce = 0;
float cfm = 0.0001f;
float erp = 0.1f;
float erpscale = 1.0f;
float dscale = 1.0f;
bool IgnoreNegSides = false;
ContactData contactdata1 = new ContactData(0, 0, false);
ContactData contactdata2 = new ContactData(0, 0, false);
@ -770,14 +771,30 @@ namespace OpenSim.Region.Physics.OdePlugin
bool dop1foot = false;
bool dop2foot = false;
bool ignore = false;
bool AvanormOverride = false;
switch (p1.PhysicsActorType)
{
case (int)ActorTypes.Agent:
{
bounce = 0;
mu = 0;
cfm = 0.0001f;
AvanormOverride = true;
Vector3 tmp = p2.Position - p1.Position;
normoverride = p2.Velocity - p1.Velocity;
mu = normoverride.LengthSquared();
if (mu > 1e-6)
{
mu = 1.0f / (float)Math.Sqrt(mu);
normoverride *= mu;
mu = Vector3.Dot(tmp, normoverride);
if (mu > 0)
normoverride *= -1;
}
else
{
tmp.Normalize();
normoverride = -tmp;
}
switch (p2.PhysicsActorType)
{
@ -824,6 +841,25 @@ namespace OpenSim.Region.Physics.OdePlugin
// p1.getContactData(ref contactdata1);
// p2.getContactData(ref contactdata2);
AvanormOverride = true;
Vector3 tmp = p2.Position - p1.Position;
normoverride = p2.Velocity - p1.Velocity;
mu = normoverride.LengthSquared();
if (mu > 1e-6)
{
mu = 1.0f / (float)Math.Sqrt(mu);
normoverride *= mu;
mu = Vector3.Dot(tmp, normoverride);
if (mu > 0)
normoverride *= -1;
}
else
{
tmp.Normalize();
normoverride = -tmp;
}
bounce = 0;
mu = 0;
cfm = 0.0001f;
@ -974,6 +1010,13 @@ namespace OpenSim.Region.Physics.OdePlugin
if (dop2foot && (p2.Position.Z - curContact.pos.Z) > (p2.Size.Z - avCapRadius) * 0.5f)
p2.IsColliding = true;
if (AvanormOverride && curContact.depth > 0.3f)
{
curContact.normal.X = normoverride.X;
curContact.normal.Y = normoverride.Y;
curContact.normal.Z = normoverride.Z;
}
Joint = CreateContacJoint(ref curContact, mu, bounce, cfm, erpscale, dscale);
d.JointAttach(Joint, b1, b2);