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

minor changes

avinationmerge
UbitUmarov 2012-05-20 13:18:15 +01:00
parent 2767574d0f
commit 11f582b26d
3 changed files with 23 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -987,11 +987,10 @@ namespace OpenSim.Region.Physics.OdePlugin
internal void AddCollisionFrameTime(int t)
{
// protect it from overflow crashing
if (m_cureventsubscription + t >= int.MaxValue)
m_cureventsubscription = 0;
m_cureventsubscription += t;
if (m_cureventsubscription < 50000)
m_cureventsubscription += t;
}
public override bool SubscribedEvents()
{
if (m_eventsubscription > 0)

40
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 HalfOdeStep = 0.01f;
public int odetimestepMS = 20; // rounded
private float metersInSpace = 25.6f;
private float m_timeDilation = 1.0f;
@ -490,6 +491,7 @@ namespace OpenSim.Region.Physics.OdePlugin
}
HalfOdeStep = ODE_STEPSIZE * 0.5f;
odetimestepMS = (int)(1000.0f * ODE_STEPSIZE +0.5f);
ContactgeomsArray = Marshal.AllocHGlobal(contactsPerCollision * d.ContactGeom.unmanagedSizeOf);
GlobalContactsArray = GlobalContactsArray = Marshal.AllocHGlobal(maxContactsbeforedeath * d.Contact.unmanagedSizeOf);
@ -1827,7 +1829,6 @@ namespace OpenSim.Region.Physics.OdePlugin
{
int ttmpstart = Util.EnvironmentTickCount();
int ttmp;
int ttmp2;
while(ChangesQueue.Dequeue(out item))
{
@ -1849,11 +1850,6 @@ namespace OpenSim.Region.Physics.OdePlugin
if (ttmp > 20)
break;
}
ttmp2 = Util.EnvironmentTickCountSubtract(ttmpstart);
if (ttmp2 > 50)
ttmp2 = 0;
}
// Move characters
@ -1899,7 +1895,7 @@ namespace OpenSim.Region.Physics.OdePlugin
{
case ActorTypes.Agent:
OdeCharacter cobj = (OdeCharacter)obj;
cobj.AddCollisionFrameTime((int)(ODE_STEPSIZE * 1000.0f));
cobj.AddCollisionFrameTime((int)(odetimestepMS));
cobj.SendCollisions();
break;
@ -1907,7 +1903,7 @@ namespace OpenSim.Region.Physics.OdePlugin
OdePrim pobj = (OdePrim)obj;
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();
}
break;
@ -1924,21 +1920,21 @@ namespace OpenSim.Region.Physics.OdePlugin
d.JointGroupEmpty(contactgroup);
// update managed ideia of physical data and do updates to core
/*
lock (_characters)
{
foreach (OdeCharacter actor in _characters)
{
if (actor != null)
{
if (actor.bad)
m_log.WarnFormat("[PHYSICS]: BAD Actor {0} in _characters list was not removed?", actor.m_uuid);
/*
lock (_characters)
{
foreach (OdeCharacter actor in _characters)
{
if (actor != null)
{
if (actor.bad)
m_log.WarnFormat("[PHYSICS]: BAD Actor {0} in _characters list was not removed?", actor.m_uuid);
actor.UpdatePositionAndVelocity();
}
}
}
*/
actor.UpdatePositionAndVelocity();
}
}
}
*/
lock (_activegroups)
{