Changeset 1905

Timestamp:

11/18/09 20:21:05 (3 months ago)

Author:

bostich1983

Message:

- small fix on Utility.Intersect

Location:

branches/ogre_1.7_update/Projects

Files:

• Axiom/Engine/Math/Utility.cs (modified) (4 diffs)
• Components/Terrain/Terrain.cs (modified) (1 diff)

branches/ogre_1.7_update/Projects/Axiom/Engine/Math/Utility.cs

@@ -1173 +1173 @@
         /// <param name="d2"></param>
         /// <returns></returns>
-        public static bool Intersects(Ray ray, AxisAlignedBox box, ref Real d1, ref Real d2)
+        public static Tuple<bool,Real,Real> Intersect(Ray ray, AxisAlignedBox box)
         {
             if (box.IsNull)
-                return false;
+                return new Tuple<bool, Real, Real>(false, Real.NaN, Real.NaN);
 
             if (box.IsInfinite)
             {
-                if (d1 != 0) d1 = 0;
-                if (d2 != 0) d2 = Real.PositiveInfinity;
-                return true;
+                return new Tuple<bool, Real, Real>(true, Real.NaN, Real.PositiveInfinity);
             }
 
@@ -1217 +1215 @@
 
             if (!CalcAxis(imax, rayDir, rayorig, min, max, ref end, ref start))
-                return false;
+                return new Tuple<bool, Real, Real>(false, Real.NaN, Real.NaN);
 
             if (absDir[imid] < Real.Epsilon)
@@ -1224 +1222 @@
                 if (rayorig[imid] < min[imid] || rayorig[imid] > max[imid] ||
                     rayorig[imin] < min[imin] || rayorig[imin] > max[imin])
-                    return false;
+                    return new Tuple<bool, Real, Real>(false, Real.NaN, Real.NaN);
             }
             else
             {
                 if (!CalcAxis(imid, rayDir, rayorig, min, max, ref end, ref start))
-                    return false;
+                    return new Tuple<bool, Real, Real>(false, Real.NaN, Real.NaN);
 
                 if (absDir[imin] < Real.Epsilon)
@@ -1235 +1233 @@
                     // Parallel with minimise axis, check bounds only
                     if (rayorig[imin] < min[imin] || rayorig[imin] > max[imin])
-                        return false;
+                        return new Tuple<bool, Real, Real>(false, Real.NaN, Real.NaN);
                 }
                 else
                 {
                     if (!CalcAxis(imin, rayDir, rayorig, min, max, ref end, ref start))
-                        return false;
-                }
-            }
-
-            if (d1 != 0) d1 = start;
-            if (d2 != 0) d2 = end;
-
-            return true;
-        }
-        static bool CalcAxis(int i, Vector3 raydir, Vector3 rayorig, Vector3 min, Vector3 max
+                        return new Tuple<bool, Real, Real>(false, Real.NaN, Real.NaN);
+                }
+            }
+            return new Tuple<bool, Real, Real>(true, start, end);
+        }
+        private static bool CalcAxis(int i, Vector3 raydir, Vector3 rayorig, Vector3 min, Vector3 max
             , ref Real end, ref Real start)
         {

branches/ogre_1.7_update/Projects/Components/Terrain/Terrain.cs

@@ -5295 +5295 @@
             localRay.Origin = localRay.GetPoint(-mWorldSize / mSize * 0.5f);
             IntersectResult res = new IntersectResult();
-            if (Utility.Intersects(localRay, AABB, ref dNear, ref dFar))
-            {
+            Tuple<bool, Real, Real> intersects = Utility.Intersect(localRay, AABB);
+            if (intersects.First)
+            {
+                dNear = intersects.Second;
+                dFar = intersects.Third;
                 // discard out of range
                 if (dFar <= 0 || (distanceLimit != 0 && dFar > distanceLimit))