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

fixed array range out of bounds exception and reference invalidation under load in POS

afrisby
Jeff Ames 2007-11-20 05:05:27 +00:00
parent c6619b6f7d
commit 3aa73ae1c7
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
OpenSim/Region/Physics/POSPlugin/POSPlugin.cs
View File

@ -156,21 +156,25 @@ namespace OpenSim.Region.Physics.POSPlugin
private bool check_all_prims(POSCharacter c) private bool check_all_prims(POSCharacter c)
{ {
foreach (POSPrim p in _prims) for (int i = 0; i < _prims.Count; ++i)
{ {
if (check_collision(c, p)) if (check_collision(c, _prims[i]))
return true; return true;
} }
return false; return false;
} }
public override void AddPhysicsActorTaint(PhysicsActor prim) public override void AddPhysicsActorTaint(PhysicsActor prim)
{ {
} }
public override void Simulate(float timeStep) public override void Simulate(float timeStep)
{ {
foreach (POSCharacter character in _characters) for (int i = 0; i < _characters.Count; ++i)
{ {
POSCharacter character = _characters[i];
float oldposX = character.Position.X; float oldposX = character.Position.X;
float oldposY = character.Position.Y; float oldposY = character.Position.Y;
float oldposZ = character.Position.Z; float oldposZ = character.Position.Z;
@ -183,6 +187,25 @@ namespace OpenSim.Region.Physics.POSPlugin
bool forcedZ = false; bool forcedZ = false;
character.Position.X = character.Position.X + (character._target_velocity.X * timeStep); character.Position.X = character.Position.X + (character._target_velocity.X * timeStep);
character.Position.Y = character.Position.Y + (character._target_velocity.Y * timeStep); character.Position.Y = character.Position.Y + (character._target_velocity.Y * timeStep);
if (character.Position.Y < 0)
{
character.Position.Y = 0.1F;
}
else if (character.Position.Y >= 256)
{
character.Position.Y = 255.9F;
}
if (character.Position.X < 0)
{
character.Position.X = 0.1F;
}
else if (character.Position.X >= 256)
{
character.Position.X = 255.9F;
}
float terrainheight = _heightMap[(int)character.Position.Y * 256 + (int)character.Position.X]; float terrainheight = _heightMap[(int)character.Position.Y * 256 + (int)character.Position.X];
if (character.Position.Z + (character._target_velocity.Z * timeStep) < terrainheight + 2) if (character.Position.Z + (character._target_velocity.Z * timeStep) < terrainheight + 2)
{ {
@ -221,24 +244,6 @@ namespace OpenSim.Region.Physics.POSPlugin
} }
} }
if (character.Position.Y < 0)
{
character.Position.Y = 0.1F;
}
else if (character.Position.Y >= 256)
{
character.Position.Y = 255.9F;
}
if (character.Position.X < 0)
{
character.Position.X = 0.1F;
}
else if (character.Position.X > 256)
{
character.Position.X = 255.9F;
}
character._velocity.X = (character.Position.X - oldposX) / timeStep; character._velocity.X = (character.Position.X - oldposX) / timeStep;
character._velocity.Y = (character.Position.Y - oldposY) / timeStep; character._velocity.Y = (character.Position.Y - oldposY) / timeStep;