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

Instead of generating a new list for bad characters on every physics pass, keep reusing the same list.

0.7.2-post-fixes
Justin Clark-Casey (justincc) 2011-11-21 17:04:54 +00:00
parent f3b45be9c0
commit c253539c04
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -188,10 +188,19 @@ namespace OpenSim.Region.Physics.OdePlugin
private d.NearCallback nearCallback; private d.NearCallback nearCallback;
public d.TriCallback triCallback; public d.TriCallback triCallback;
public d.TriArrayCallback triArrayCallback; public d.TriArrayCallback triArrayCallback;
private readonly HashSet<OdeCharacter> _characters = new HashSet<OdeCharacter>(); private readonly HashSet<OdeCharacter> _characters = new HashSet<OdeCharacter>();
private readonly HashSet<OdePrim> _prims = new HashSet<OdePrim>(); private readonly HashSet<OdePrim> _prims = new HashSet<OdePrim>();
private readonly HashSet<OdePrim> _activeprims = new HashSet<OdePrim>(); private readonly HashSet<OdePrim> _activeprims = new HashSet<OdePrim>();
/// <summary>
/// Defects list to remove characters that no longer have finite positions due to some other bug.
/// </summary>
/// <remarks>
/// Used repeatedly in Simulate() but initialized once here.
/// </remarks>
private readonly List<OdeCharacter> defects = new List<OdeCharacter>();
/// <summary> /// <summary>
/// Used to lock on manipulation of _taintedPrimL and _taintedPrimH /// Used to lock on manipulation of _taintedPrimL and _taintedPrimH
/// </summary> /// </summary>
@ -2757,18 +2766,18 @@ Console.WriteLine("AddPhysicsActorTaint to " + taintedprim.Name);
// Move characters // Move characters
lock (_characters) lock (_characters)
{ {
List<OdeCharacter> defects = new List<OdeCharacter>();
foreach (OdeCharacter actor in _characters) foreach (OdeCharacter actor in _characters)
{ {
if (actor != null) if (actor != null)
actor.Move(defects); actor.Move(defects);
} }
if (0 != defects.Count) if (0 != defects.Count)
{ {
foreach (OdeCharacter defect in defects) foreach (OdeCharacter defect in defects)
{
RemoveCharacter(defect); RemoveCharacter(defect);
}
defects.Clear();
} }
} }