From c40cfb01aa359471d1c81775fedee95814a14fbc Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Sun, 18 Nov 2007 18:20:02 +0000
Subject: flying in POS should be a bit smoother

---
 OpenSim/Region/Physics/POSPlugin/POSPlugin.cs | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/Physics')

diff --git a/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs b/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs
index 8e74b5f..2e0f2e3 100644
--- a/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs
+++ b/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs
@@ -173,14 +173,14 @@ namespace OpenSim.Region.Physics.POSPlugin
                     character._target_velocity.Z += gravity * timeStep;
                 }
 
+                bool forcedZ = false;
                 character.Position.X = character.Position.X + (character._target_velocity.X * timeStep);
                 character.Position.Y = character.Position.Y + (character._target_velocity.Y * timeStep);
                 float terrainheight = _heightMap[(int)character.Position.Y * 256 + (int)character.Position.X];
                 if (character.Position.Z + (character._target_velocity.Z * timeStep) < terrainheight + 2)
                 {
                     character.Position.Z = terrainheight + 1.0f;
-                    character._target_velocity.Z = 0;
-                    character._velocity.Z = 0;
+                    forcedZ = true;
                 }
                 else
                 {
@@ -205,12 +205,12 @@ namespace OpenSim.Region.Physics.POSPlugin
                         }
                         else
                         {
-                            character._target_velocity.Z = 0;
+                            forcedZ = true;
                         }
                     }
                     else
                     {
-                        character._target_velocity.Z = 0;
+                        forcedZ = true;
                     }
                 }            
 
@@ -234,6 +234,17 @@ namespace OpenSim.Region.Physics.POSPlugin
 
                 character._velocity.X = (character.Position.X - oldposX) / timeStep;
                 character._velocity.Y = (character.Position.Y - oldposY) / timeStep;
+
+                if (forcedZ)
+                {
+                    character._velocity.Z = 0;
+                    character._target_velocity.Z = 0;
+                    character.RequestPhysicsterseUpdate();
+                }
+                else
+                {
+                    character._velocity.Z = (character.Position.Z - oldposZ) / timeStep;
+                }
             }
         }
 
-- 
cgit v1.1