aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTORS.txt1
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODECharacter.cs12
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs18
3 files changed, 22 insertions, 9 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index ea32241..e214720 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -61,6 +61,7 @@ Patches
61* Kayne 61* Kayne
62* Kevin Cozens 62* Kevin Cozens
63* kinoc (Daxtron Labs) 63* kinoc (Daxtron Labs)
64* Kitto Flora
64* krtaylor (IBM) 65* krtaylor (IBM)
65* lulurun 66* lulurun
66* M.Igarashi 67* M.Igarashi
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 2cdc988..b2981fe 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -832,8 +832,18 @@ namespace OpenSim.Region.Physics.OdePlugin
832 if (flying) 832 if (flying)
833 { 833 {
834 vec.Z += ((-1 * _parent_scene.gravityz)*m_mass); 834 vec.Z += ((-1 * _parent_scene.gravityz)*m_mass);
835 }
836 835
836 //Added for auto fly height. Kitto Flora
837 d.Vector3 pos = d.BodyGetPosition(Body);
838 float ground_height = _parent_scene.GetTerrainHeightAtXY(pos.X, pos.Y);
839 float target_altitude = ground_height + 3.0f; // This is the min fly height
840 if(pos.Z < target_altitude)
841 {
842 vec.Z += (target_altitude - pos.Z) * PID_P * 5.0f;
843 }
844 // end add Kitto Flora
845
846 }
837 847
838 doForce(vec); 848 doForce(vec);
839 } 849 }
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index d7d471f..0f18be4 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -1,3 +1,4 @@
1
1/* 2/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 3 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 4 * See CONTRIBUTORS.TXT for a full list of copyright holders.
@@ -205,7 +206,7 @@ namespace OpenSim.Region.Physics.OdePlugin
205 private float[] _watermap; 206 private float[] _watermap;
206 private bool m_filterCollisions = true; 207 private bool m_filterCollisions = true;
207 208
208 // private float[] _origheightmap; 209 private float[] _origheightmap; // Used for Fly height. Kitto Flora
209 210
210 private d.NearCallback nearCallback; 211 private d.NearCallback nearCallback;
211 public d.TriCallback triCallback; 212 public d.TriCallback triCallback;
@@ -1284,12 +1285,13 @@ namespace OpenSim.Region.Physics.OdePlugin
1284 } 1285 }
1285 1286
1286 #endregion 1287 #endregion
1287 1288
1288// TODO: unused 1289// Recovered for use by fly height. Kitto Flora
1289// private float GetTerrainHeightAtXY(float x, float y) 1290 public float GetTerrainHeightAtXY(float x, float y)
1290// { 1291 {
1291// return (float)_origheightmap[(int)y * Constants.RegionSize + (int)x]; 1292 return (float)_origheightmap[(int)y * Constants.RegionSize + (int)x];
1292// } 1293 }
1294// End recovered. Kitto Flora
1293 1295
1294 public void addCollisionEventReporting(PhysicsActor obj) 1296 public void addCollisionEventReporting(PhysicsActor obj)
1295 { 1297 {
@@ -2958,7 +2960,7 @@ namespace OpenSim.Region.Physics.OdePlugin
2958 { 2960 {
2959 // this._heightmap[i] = (double)heightMap[i]; 2961 // this._heightmap[i] = (double)heightMap[i];
2960 // dbm (danx0r) -- creating a buffer zone of one extra sample all around 2962 // dbm (danx0r) -- creating a buffer zone of one extra sample all around
2961 // _origheightmap = heightMap; 2963 _origheightmap = heightMap; // Used for Fly height. Kitto Flora
2962 const uint heightmapWidth = m_regionWidth + 2; 2964 const uint heightmapWidth = m_regionWidth + 2;
2963 const uint heightmapHeight = m_regionHeight + 2; 2965 const uint heightmapHeight = m_regionHeight + 2;
2964 const uint heightmapWidthSamples = 2*m_regionWidth + 2; 2966 const uint heightmapWidthSamples = 2*m_regionWidth + 2;