Miko/libremetaverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Simian's Movement extension crashing when an avatar hits the border.

Browse Source 
git-svn-id: http://libopenmetaverse.googlecode.com/svn/trunk@2121 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
2008-08-19 21:55:29 +00:00
parent 29bc6cf3aa
commit 4e7d11dce7
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Programs/Simian/Extensions/Movement.cs
View File

@@ -89,6 +89,11 @@ namespace Simian.Extensions
int x = (int)agent.Avatar.Position.X;
int y = (int)agent.Avatar.Position.Y;
if (x > 255) x = 255;
else if (x < 0) x = 0;
if (y > 255) y = 255;
else if (y < 0) y = 0;
float center = Server.Heightmap[y * 256 + x];
float distX = agent.Avatar.Position.X - (int)agent.Avatar.Position.X;
float distY = agent.Avatar.Position.Y - (int)agent.Avatar.Position.Y;
@@ -96,10 +101,10 @@ namespace Simian.Extensions
float nearestX;
float nearestY;
if (distX > 0) nearestX = Server.Heightmap[y * 256 + x + (x < 256 ? 1 : 0)];
if (distX > 0) nearestX = Server.Heightmap[y * 256 + x + (x < 255 ? 1 : 0)];
else nearestX = Server.Heightmap[y * 256 + x - (x > 0 ? 1 : 0)];
if (distY > 0) nearestY = Server.Heightmap[(y + (y < 256 ? 1 : 0)) * 256 + x];
if (distY > 0) nearestY = Server.Heightmap[(y + (y < 255 ? 1 : 0)) * 256 + x];
else nearestY = Server.Heightmap[(y - (y > 0 ? 1 : 0)) * 256 + x];
float lerpX = Utils.Lerp(center, nearestX, Math.Abs(distX));