From 93eaddd583e2f7fb7b5b559e6fb4822d70c346f2 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Wed, 13 Jun 2007 01:31:53 +0000
Subject: * Applying patches to sugilite too.

---
 OpenSim/OpenSim.Physics/OdePlugin/OdePlugin.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'OpenSim/OpenSim.Physics')

diff --git a/OpenSim/OpenSim.Physics/OdePlugin/OdePlugin.cs b/OpenSim/OpenSim.Physics/OdePlugin/OdePlugin.cs
index 84592ae..5233042 100644
--- a/OpenSim/OpenSim.Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/OpenSim.Physics/OdePlugin/OdePlugin.cs
@@ -105,7 +105,6 @@ namespace OpenSim.Physics.OdePlugin
         // This function blatantly ripped off from BoxStack.cs
         static private void near(IntPtr space, IntPtr g1, IntPtr g2)
         {
-            //Console.WriteLine("collision callback");
             IntPtr b1 = d.GeomGetBody(g1);
             IntPtr b2 = d.GeomGetBody(g2);
             if (b1 != IntPtr.Zero && b2 != IntPtr.Zero && d.AreConnectedExcluding(b1, b2, d.JointType.Contact))
@@ -183,7 +182,11 @@ namespace OpenSim.Physics.OdePlugin
         {
             for (int i = 0; i < 65536; i++)
             {
-                this._heightmap[i] = (double)heightMap[i];
+                // this._heightmap[i] = (double)heightMap[i];
+                // dbm (danx0r) -- heightmap x,y must be swapped for Ode (should fix ODE, but for now...)
+                int x = i & 0xff;
+                int y = i >> 8;
+                this._heightmap[i] = (double)heightMap[x * 256 + y];
             }
             IntPtr HeightmapData = d.GeomHeightfieldDataCreate();
             d.GeomHeightfieldDataBuildDouble(HeightmapData, _heightmap, 0, 256, 256, 256, 256, 1.0f, 0.0f, 2.0f, 0);
@@ -336,7 +339,7 @@ namespace OpenSim.Physics.OdePlugin
             d.Vector3 vec = d.BodyGetPosition(BoundingCapsule);
             this._position.X = vec.X;
             this._position.Y = vec.Y;
-            this._position.Z = vec.Z;
+            this._position.Z = vec.Z+1.0f;
         }
     }
 
-- 
cgit v1.1