Changeset 2575 for GTP/trunk/Lib/Vis/Preprocessing/src/AxisAlignedBox3.cpp

Timestamp:

01/03/08 15:53:44 (17 years ago)

Author:

bittner

Message:

big merge: preparation for havran ray caster, check if everything works

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/AxisAlignedBox3.cpp (modified) (8 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/AxisAlignedBox3.cpp

@@ -1 +1 @@
 
-// GOLEM library
-#include <assert.h>
 #include <iostream>
 #include "AxisAlignedBox3.h"
@@ -10 +8 @@
 #include "Triangle3.h"
 #include "VssRay.h"
+
+
+
+#include <cassert>
 
 
@@ -210 +212 @@
 int
 AxisAlignedBox3::ComputeMinMaxT(const Ray &ray,
-                                                                float *tmin,
-                                                                float *tmax) const
+                                float *tmin,
+                                float *tmax) const
 {
   float minx, maxx, miny, maxy, minz, maxz;
@@ -302 +304 @@
 int
 AxisAlignedBox3::ComputeMinMaxT(const Ray &ray,
-                                                                float *tmin,
-                                                                float *tmax) const
+                                float *tmin,
+                                float *tmax) const
 {
   const float dirEps = 1e-8f;
@@ -398 +400 @@
 // the bounding box and 0 if it does not.
 int AxisAlignedBox3::ComputeMinMaxT(const Ray &ray, float *tmin, float *tmax,
-                                                                        EFaces &entryFace, EFaces &exitFace) const
+                                    EFaces &entryFace, EFaces &exitFace) const
 {
   float minx, maxx, miny, maxy, minz, maxz;
@@ -1840 +1842 @@
 int
 AxisAlignedBox3::ComputeMinMaxT(const Vector3 &origin,
-                                                                const Vector3 &direction,
-                                                                float *tmin,
-                                                                float *tmax) const
-{
-
+                                const Vector3 &direction,
+                                float *tmin,
+                                float *tmax) const
+{
   register float minx, maxx;
 
@@ -2235 +2236 @@
 
 
+void AxisAlignedBox3::EnlargeToMinSize()
+{
+  const float epsMin = 1e-7;
+  const float epsAdd = 1e-6;
+  const float epsMul = 1.000005;
+  float dir = mMax.x - mMin.x;
+  assert(dir >= 0.f);
+  if (dir < epsMin) {
+    if (mMax.x > 0) {
+      mMax.x *= epsMul;
+      mMax.x += epsAdd;
+    }
+    else {
+      mMin.x *= epsMul;
+      mMin.x -= epsAdd;
+    }
+    assert(mMin.x < mMax.x);
+  }
+  dir = mMax.y - mMin.y;
+  assert(dir >= 0.f);
+  if (dir < epsMin) {
+    if (mMax.y > 0) {
+      mMax.y *= epsMul;
+      mMax.y += epsAdd;
+    }
+    else {
+      mMin.y *= epsMul;
+      mMin.y -= epsAdd;
+    }
+    assert(mMin.y < mMax.y);
+  }
+  dir = mMax.z - mMin.z;
+  assert(dir >= 0.f);
+  if (dir < epsMin) {
+    if (mMax.z > 0) {
+      mMax.z *= epsMul;
+      mMax.z += epsAdd;
+    }
+    else {
+      mMin.z *= epsMul;
+      mMin.z -= epsAdd;
+    }
+    assert(mMin.z < mMax.z);
+  }
+}
+
 void AxisAlignedBox3::SetMin(const Vector3 &v) 
 {
-        mMin = v;
+  mMin = v;
 }
 
@@ -2243 +2290 @@
 void AxisAlignedBox3::SetMax(const Vector3 &v) 
 {
-        mMax = v;
+  mMax = v;
 }