aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorRobert Adams2012-12-16 22:31:22 -0800
committerRobert Adams2012-12-16 22:31:22 -0800
commit021623a17d8371147eefe9290d780048e24812c6 (patch)
tree83414d7f3f16d94028469382bad2b1ac92fab8c4
parentBulletSim: add parameter to UpdateProperties call into the linkset so changes... (diff)
downloadopensim-SC_OLD-021623a17d8371147eefe9290d780048e24812c6.zip
opensim-SC_OLD-021623a17d8371147eefe9290d780048e24812c6.tar.gz
opensim-SC_OLD-021623a17d8371147eefe9290d780048e24812c6.tar.bz2
opensim-SC_OLD-021623a17d8371147eefe9290d780048e24812c6.tar.xz
BulletSim: fix vehicles being shot in the air at border crossings because of mis-application of correction to postion for below groundness.
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index 82e829e..ef68471 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -871,8 +871,11 @@ namespace OpenSim.Region.Physics.BulletSPlugin
871 if (VehiclePosition.Z < GetTerrainHeight(VehiclePosition)) 871 if (VehiclePosition.Z < GetTerrainHeight(VehiclePosition))
872 { 872 {
873 // TODO: correct position by applying force rather than forcing position. 873 // TODO: correct position by applying force rather than forcing position.
874 VehiclePosition += new Vector3(0f, 0f, GetTerrainHeight(VehiclePosition) + 2f); 874 Vector3 newPosition = VehiclePosition;
875 VDetailLog("{0}, MoveLinear,terrainHeight,terrainHeight={1},pos={2}", Prim.LocalID, GetTerrainHeight(VehiclePosition), VehiclePosition); 875 newPosition.Z = GetTerrainHeight(VehiclePosition) + 1f;
876 VehiclePosition = newPosition;
877 VDetailLog("{0}, MoveLinear,terrainHeight,terrainHeight={1},pos={2}",
878 Prim.LocalID, GetTerrainHeight(VehiclePosition), VehiclePosition);
876 } 879 }
877 return ret; 880 return ret;
878 } 881 }