diff options
author | Robert Adams | 2012-09-07 15:46:14 -0700 |
---|---|---|
committer | Robert Adams | 2012-09-07 16:05:28 -0700 |
commit | 126eae71009001c5455e4896cf12317422bbac51 (patch) | |
tree | 7ceb0c01d5fb352707de447227a308bfe8715c39 /OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs | |
parent | BulletSim: Add some comments (gasp) and log messages. (diff) | |
download | opensim-SC-126eae71009001c5455e4896cf12317422bbac51.zip opensim-SC-126eae71009001c5455e4896cf12317422bbac51.tar.gz opensim-SC-126eae71009001c5455e4896cf12317422bbac51.tar.bz2 opensim-SC-126eae71009001c5455e4896cf12317422bbac51.tar.xz |
BulletSim: Add Bullet body and shape to BSPhysObject and rename
'Body' to 'BSBody' for disambiguation when reading code.
Complete the API2 interface so nearly all methods on bullet
classes are available to the managed code. The efficient
single call simulation step is kept in place while all
other creation/destruction/parameterization can be done
in the managed code.
Diffstat (limited to '')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs index 4285073..47d7199 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs | |||
@@ -403,8 +403,8 @@ public class BSTerrainManager | |||
403 | { | 403 | { |
404 | float regionX = tX - offsetX; | 404 | float regionX = tX - offsetX; |
405 | float regionY = tY - offsetY; | 405 | float regionY = tY - offsetY; |
406 | if (regionX > mapInfo.sizeX) regionX = 0; | 406 | if (regionX >= mapInfo.sizeX || regionX < 0f) regionX = 0; |
407 | if (regionY > mapInfo.sizeY) regionY = 0; | 407 | if (regionY >= mapInfo.sizeY || regionY < 0f) regionY = 0; |
408 | int mapIndex = (int)regionY * (int)mapInfo.sizeY + (int)regionX; | 408 | int mapIndex = (int)regionY * (int)mapInfo.sizeY + (int)regionX; |
409 | ret = mapInfo.heightMap[mapIndex]; | 409 | ret = mapInfo.heightMap[mapIndex]; |
410 | m_terrainModified = false; | 410 | m_terrainModified = false; |