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-21 13:37:34 +02:00
parent e6d228dc0d 85f5789993
commit 4bbd5fa800
4 changed files with 110 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -1604,7 +1604,10 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
else if (PhysActor == null) else if (PhysActor == null)
{
ApplyPhysics((uint)Flags, VolumeDetectActive, false); ApplyPhysics((uint)Flags, VolumeDetectActive, false);
UpdatePhysicsSubscribedEvents();
}
else else
{ {
PhysActor.PhysicsShapeType = m_physicsShapeType; PhysActor.PhysicsShapeType = m_physicsShapeType;
@ -4664,7 +4667,15 @@ namespace OpenSim.Region.Framework.Scenes
/// </remarks> /// </remarks>
public void RemoveFromPhysics() public void RemoveFromPhysics()
{ {
ParentGroup.Scene.PhysicsScene.RemovePrim(PhysActor); PhysicsActor pa = PhysActor;
if (pa != null)
{
pa.OnCollisionUpdate -= PhysicsCollision;
pa.OnRequestTerseUpdate -= PhysicsRequestingTerseUpdate;
pa.OnOutOfBounds -= PhysicsOutOfBounds;
ParentGroup.Scene.PhysicsScene.RemovePrim(pa);
}
PhysActor = null; PhysActor = null;
} }

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

@ -785,8 +785,6 @@ namespace OpenSim.Region.Physics.OdePlugin
// the Amotor still lets avatar rotation to drift during colisions // the Amotor still lets avatar rotation to drift during colisions
// so force it back to identity // so force it back to identity
d.Quaternion qtmp; d.Quaternion qtmp;
qtmp.W = 1; qtmp.W = 1;
qtmp.X = 0; qtmp.X = 0;
@ -1177,8 +1175,7 @@ namespace OpenSim.Region.Physics.OdePlugin
internal void AddCollisionFrameTime(int t) internal void AddCollisionFrameTime(int t)
{ {
// protect it from overflow crashing // protect it from overflow crashing
if (m_cureventsubscription + t >= int.MaxValue) if (m_cureventsubscription < 50000)
m_cureventsubscription = 0;
m_cureventsubscription += t; m_cureventsubscription += t;
} }

7
OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
View File

@ -987,11 +987,10 @@ namespace OpenSim.Region.Physics.OdePlugin
internal void AddCollisionFrameTime(int t) internal void AddCollisionFrameTime(int t)
{ {
// protect it from overflow crashing if (m_cureventsubscription < 50000)
if (m_cureventsubscription + t >= int.MaxValue)
m_cureventsubscription = 0;
m_cureventsubscription += t; m_cureventsubscription += t;
} }
public override bool SubscribedEvents() public override bool SubscribedEvents()
{ {
if (m_eventsubscription > 0) if (m_eventsubscription > 0)
@ -2563,10 +2562,10 @@ namespace OpenSim.Region.Physics.OdePlugin
{ {
d.Quaternion qtmp; d.Quaternion qtmp;
d.GeomCopyQuaternion(prim_geom, out qtmp); d.GeomCopyQuaternion(prim_geom, out qtmp);
_orientation.W = qtmp.W;
_orientation.X = qtmp.X; _orientation.X = qtmp.X;
_orientation.Y = qtmp.Y; _orientation.Y = qtmp.Y;
_orientation.Z = qtmp.Z; _orientation.Z = qtmp.Z;
_orientation.W = qtmp.W;
d.Vector3 lpos = d.GeomGetPosition(prim_geom); d.Vector3 lpos = d.GeomGetPosition(prim_geom);
_position.X = lpos.X; _position.X = lpos.X;

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

@ -190,6 +190,7 @@ namespace OpenSim.Region.Physics.OdePlugin
public float ODE_STEPSIZE = 0.020f; public float ODE_STEPSIZE = 0.020f;
public float HalfOdeStep = 0.01f; public float HalfOdeStep = 0.01f;
public int odetimestepMS = 20; // rounded
private float metersInSpace = 25.6f; private float metersInSpace = 25.6f;
private float m_timeDilation = 1.0f; private float m_timeDilation = 1.0f;
@ -490,6 +491,7 @@ namespace OpenSim.Region.Physics.OdePlugin
} }
HalfOdeStep = ODE_STEPSIZE * 0.5f; HalfOdeStep = ODE_STEPSIZE * 0.5f;
odetimestepMS = (int)(1000.0f * ODE_STEPSIZE +0.5f);
ContactgeomsArray = Marshal.AllocHGlobal(contactsPerCollision * d.ContactGeom.unmanagedSizeOf); ContactgeomsArray = Marshal.AllocHGlobal(contactsPerCollision * d.ContactGeom.unmanagedSizeOf);
GlobalContactsArray = GlobalContactsArray = Marshal.AllocHGlobal(maxContactsbeforedeath * d.Contact.unmanagedSizeOf); GlobalContactsArray = GlobalContactsArray = Marshal.AllocHGlobal(maxContactsbeforedeath * d.Contact.unmanagedSizeOf);
@ -1003,19 +1005,85 @@ namespace OpenSim.Region.Physics.OdePlugin
} }
else else
{
if (AvanormOverride)
{
if (curContact.depth > 0.3f)
{ {
if (dop1foot && (p1.Position.Z - curContact.pos.Z) > (p1.Size.Z - avCapRadius) * 0.5f) if (dop1foot && (p1.Position.Z - curContact.pos.Z) > (p1.Size.Z - avCapRadius) * 0.5f)
p1.IsColliding = true; p1.IsColliding = true;
if (dop2foot && (p2.Position.Z - curContact.pos.Z) > (p2.Size.Z - avCapRadius) * 0.5f) if (dop2foot && (p2.Position.Z - curContact.pos.Z) > (p2.Size.Z - avCapRadius) * 0.5f)
p2.IsColliding = true; p2.IsColliding = true;
if (AvanormOverride && curContact.depth > 0.3f)
{
curContact.normal.X = normoverride.X; curContact.normal.X = normoverride.X;
curContact.normal.Y = normoverride.Y; curContact.normal.Y = normoverride.Y;
curContact.normal.Z = normoverride.Z; curContact.normal.Z = normoverride.Z;
} }
else
{
if (dop1foot)
{
float sz = p1.Size.Z;
Vector3 vtmp = p1.Position;
float ppos = curContact.pos.Z - vtmp.Z + (sz - avCapRadius) * 0.5f;
if (ppos > 0f)
{
if (!p1.Flying)
{
d.AABB aabb;
d.GeomGetAABB(g2, out aabb);
float tmp = vtmp.Z - sz * .25f;
if (aabb.MaxZ < tmp)
{
vtmp.X = curContact.pos.X - vtmp.X;
vtmp.Y = curContact.pos.Y - vtmp.Y;
vtmp.Z = -0.2f;
vtmp.Normalize();
curContact.normal.X = vtmp.X;
curContact.normal.Y = vtmp.Y;
curContact.normal.Z = vtmp.Z;
}
}
}
else
p1.IsColliding = true;
}
if (dop2foot)
{
float sz = p2.Size.Z;
Vector3 vtmp = p2.Position;
float ppos = curContact.pos.Z - vtmp.Z + (sz - avCapRadius) * 0.5f;
if (ppos > 0f)
{
if (!p2.Flying)
{
d.AABB aabb;
d.GeomGetAABB(g1, out aabb);
float tmp = vtmp.Z - sz * .25f;
if (aabb.MaxZ < tmp)
{
vtmp.X = curContact.pos.X - vtmp.X;
vtmp.Y = curContact.pos.Y - vtmp.Y;
vtmp.Z = -0.2f;
vtmp.Normalize();
curContact.normal.X = vtmp.X;
curContact.normal.Y = vtmp.Y;
curContact.normal.Z = vtmp.Z;
}
}
}
else
p2.IsColliding = true;
}
}
}
Joint = CreateContacJoint(ref curContact, mu, bounce, cfm, erpscale, dscale); Joint = CreateContacJoint(ref curContact, mu, bounce, cfm, erpscale, dscale);
d.JointAttach(Joint, b1, b2); d.JointAttach(Joint, b1, b2);
@ -1827,7 +1895,6 @@ namespace OpenSim.Region.Physics.OdePlugin
{ {
int ttmpstart = Util.EnvironmentTickCount(); int ttmpstart = Util.EnvironmentTickCount();
int ttmp; int ttmp;
int ttmp2;
while(ChangesQueue.Dequeue(out item)) while(ChangesQueue.Dequeue(out item))
{ {
@ -1849,11 +1916,6 @@ namespace OpenSim.Region.Physics.OdePlugin
if (ttmp > 20) if (ttmp > 20)
break; break;
} }
ttmp2 = Util.EnvironmentTickCountSubtract(ttmpstart);
if (ttmp2 > 50)
ttmp2 = 0;
} }
// Move characters // Move characters
@ -1899,7 +1961,7 @@ namespace OpenSim.Region.Physics.OdePlugin
{ {
case ActorTypes.Agent: case ActorTypes.Agent:
OdeCharacter cobj = (OdeCharacter)obj; OdeCharacter cobj = (OdeCharacter)obj;
cobj.AddCollisionFrameTime((int)(ODE_STEPSIZE * 1000.0f)); cobj.AddCollisionFrameTime((int)(odetimestepMS));
cobj.SendCollisions(); cobj.SendCollisions();
break; break;
@ -1907,7 +1969,7 @@ namespace OpenSim.Region.Physics.OdePlugin
OdePrim pobj = (OdePrim)obj; OdePrim pobj = (OdePrim)obj;
if (pobj.Body == IntPtr.Zero || (d.BodyIsEnabled(pobj.Body) && !pobj.m_outbounds)) if (pobj.Body == IntPtr.Zero || (d.BodyIsEnabled(pobj.Body) && !pobj.m_outbounds))
{ {
pobj.AddCollisionFrameTime((int)(ODE_STEPSIZE * 1000.0f)); pobj.AddCollisionFrameTime((int)(odetimestepMS));
pobj.SendCollisions(); pobj.SendCollisions();
} }
break; break;