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

Rename new collision stats to 'contacts' - there are/can be multiple contacts per collision and this is what is actually being measured.

0.7.3-extended
Justin Clark-Casey (justincc) 2012-06-01 01:15:27 +01:00
parent 5e4b09fc22
commit f23b7ae3e9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/Physics/OdePlugin/OdeScene.cs
View File

@ -150,12 +150,12 @@ namespace OpenSim.Region.Physics.OdePlugin
/// <summary> /// <summary>
/// Stat name for the number of avatar collisions with another entity. /// Stat name for the number of avatar collisions with another entity.
/// </summary> /// </summary>
public const string ODEAvatarCollisionsStatName = "ODEAvatarCollisions"; public const string ODEAvatarContactsStatsName = "ODEAvatarContacts";
/// <summary> /// <summary>
/// Stat name for the number of prim collisions with another entity. /// Stat name for the number of prim collisions with another entity.
/// </summary> /// </summary>
public const string ODEPrimCollisionsStatName = "ODEPrimCollisions"; public const string ODEPrimContactsStatName = "ODEPrimContacts";
/// <summary> /// <summary>
/// Used to hold tick numbers for stat collection purposes. /// Used to hold tick numbers for stat collection purposes.
@ -1707,7 +1707,7 @@ namespace OpenSim.Region.Physics.OdePlugin
if (CollectStats) if (CollectStats)
{ {
m_tempAvatarCollisionsThisFrame = _perloopContact.Count; m_tempAvatarCollisionsThisFrame = _perloopContact.Count;
m_stats[ODEAvatarCollisionsStatName] += m_tempAvatarCollisionsThisFrame; m_stats[ODEAvatarContactsStatsName] += m_tempAvatarCollisionsThisFrame;
} }
List<OdePrim> removeprims = null; List<OdePrim> removeprims = null;
@ -1743,7 +1743,7 @@ namespace OpenSim.Region.Physics.OdePlugin
} }
if (CollectStats) if (CollectStats)
m_stats[ODEPrimCollisionsStatName] += _perloopContact.Count - m_tempAvatarCollisionsThisFrame; m_stats[ODEPrimContactsStatName] += _perloopContact.Count - m_tempAvatarCollisionsThisFrame;
if (removeprims != null) if (removeprims != null)
{ {
@ -4089,8 +4089,8 @@ namespace OpenSim.Region.Physics.OdePlugin
private void InitializeExtraStats() private void InitializeExtraStats()
{ {
m_stats[ODENativeCollisionFrameMsStatName] = 0; m_stats[ODENativeCollisionFrameMsStatName] = 0;
m_stats[ODEAvatarCollisionsStatName] = 0; m_stats[ODEAvatarContactsStatsName] = 0;
m_stats[ODEPrimCollisionsStatName] = 0; m_stats[ODEPrimContactsStatName] = 0;
} }
} }
} }