Merge pull request #1704 from SCIInstitute/ospray-features

Ospray features

Author: dcwhite

src/Core/GeometryPrimitives/BBox.cc

@@ -6,7 +6,7 @@
    Copyright (c) 2015 Scientific Computing and Imaging Institute,
    University of Utah.
 
-   
+
    Permission is hereby granted, free of charge, to any person obtaining a
    copy of this software and associated documentation files (the "Software"),
    to deal in the Software without restriction, including without limitation
@@ -33,7 +33,7 @@
 using namespace SCIRun;
 using namespace SCIRun::Core::Geometry;
 
-void 
+void
 BBox::extend_disk(const Point& cen, const Vector& normal, double r)
 {
   if (normal.length2() < 1.e-12) { extend(cen); return; }
@@ -66,14 +66,14 @@ BBox::is_similar_to(const BBox &b, double diff) const
   return true;
 }
 
-void 
+void
 BBox::translate(const Vector &v)
 {
   cmin_+=v;
   cmax_+=v;
 }
 
-void 
+void
 BBox::scale(double s, const Vector&o)
 {
   cmin_-=o;
@@ -84,7 +84,7 @@ BBox::scale(double s, const Vector&o)
   cmax_+=o;
 }
 
-bool 
+bool
 BBox::overlaps(const BBox & bb) const
 {
   if( bb.cmin_.x() > cmax_.x() || bb.cmax_.x() < cmin_.x())
@@ -97,7 +97,7 @@ BBox::overlaps(const BBox & bb) const
   return true;
 }
 
-bool 
+bool
 BBox::overlaps_inside(const BBox & bb) const
 {
   if( bb.cmin_.x() >= cmax_.x() || bb.cmax_.x() <= cmin_.x())
@@ -110,7 +110,7 @@ BBox::overlaps_inside(const BBox & bb) const
   return true;
 }
 
-bool 
+bool
 BBox::intersect(const Point& origin, const Vector& dir, Point& hitPoint) const
 {
   Vector t1 = (cmin_ - origin) / dir;
@@ -123,36 +123,41 @@ BBox::intersect(const Point& origin, const Vector& dir, Point& hitPoint) const
   {
     hitPoint = origin + dir*tnear;
     return true;
-  } 
-  else 
+  }
+  else
   {
     return false;
   }
 }
 
-void Pio(Piostream &stream, BBox & box)
+void SCIRun::Core::Geometry::Pio(Piostream &stream, BBox & box)
 {
   stream.begin_cheap_delim();
-    
+
   // Store the valid flag as an int to be backwards compatible.
   int tmp = box.valid();
   Point min = box.get_min();
   Point max = box.get_max();
   Pio(stream, tmp);
-  if (tmp) 
+  if (tmp)
   {
     Pio(stream, min);
     Pio(stream, max);
   }
 
-  if(stream.reading()) 
+  if(stream.reading())
   {
     box.set_valid(tmp);
-    if (tmp) 
+    if (tmp)
     {
       box.extend(min);
       box.extend(max);
     }
   }
   stream.end_cheap_delim();
 }
+
+std::ostream& SCIRun::Core::Geometry::operator<<(std::ostream& out, const BBox& b)
+{
+  return out << b.get_min() << " : " << b.get_max();
+}

src/Core/GeometryPrimitives/BBox.h

@@ -6,7 +6,7 @@
    Copyright (c) 2015 Scientific Computing and Imaging Institute,
    University of Utah.
 
-   
+
    Permission is hereby granted, free of charge, to any person obtaining a
    copy of this software and associated documentation files (the "Software"),
    to deal in the Software without restriction, including without limitation
@@ -50,10 +50,10 @@ class BBox {
     enum { INSIDE, INTERSECT, OUTSIDE };
 
     BBox() : is_valid_(false) {}
-    
-    BBox(const BBox& copy) 
+
+    BBox(const BBox& copy)
     : cmin_(copy.cmin_), cmax_(copy.cmax_), is_valid_(copy.is_valid_) {}
-    
+
     BBox& operator=(const BBox& copy)
     {
       is_valid_ = copy.is_valid_;
@@ -63,35 +63,35 @@ class BBox {
     }
 
     BBox(const BBox& b1, const BBox& b2)
-      : cmin_(b1.cmin_), cmax_(b1.cmax_), is_valid_(true) 
+      : cmin_(b1.cmin_), cmax_(b1.cmax_), is_valid_(true)
     {
       extend(b2.cmin_);
       extend(b2.cmax_);
     }
 
-      
+
     BBox(const Point& p1, const Point& p2)
-      : cmin_(p1), cmax_(p1), is_valid_(true) 
+      : cmin_(p1), cmax_(p1), is_valid_(true)
     {
       extend(p2);
     }
 
     BBox(const Point& p1, const Point& p2, const Point& p3)
-      : cmin_(p1), cmax_(p1), is_valid_(true) 
+      : cmin_(p1), cmax_(p1), is_valid_(true)
     {
       extend(p2);
       extend(p3);
     }
-    
+
     explicit BBox(const std::vector<Point>& points) :
       is_valid_(false)
     {
       for (size_t j=0; j<points.size(); j++)
       {
         extend(points[j]);
       }
-    }  
-          
+    }
+
     inline bool valid() const { return is_valid_; }
     inline void set_valid(bool v) { is_valid_ = v; }
     inline void reset() { is_valid_ = false; }
@@ -103,8 +103,8 @@ class BBox {
       {
         cmin_=Min(p, cmin_);
         cmax_=Max(p, cmax_);
-      } 
-      else 
+      }
+      else
       {
         cmin_=p;
         cmax_=p;
@@ -120,12 +120,12 @@ class BBox {
     {
       if (is_valid_)
       {
-        cmin_.x(cmin_.x()-val); 
-        cmin_.y(cmin_.y()-val); 
-        cmin_.z(cmin_.z()-val); 
-        cmax_.x(cmax_.x()+val); 
-        cmax_.y(cmax_.y()+val); 
-        cmax_.z(cmax_.z()+val);     
+        cmin_.x(cmin_.x()-val);
+        cmin_.y(cmin_.y()-val);
+        cmin_.z(cmin_.z()-val);
+        cmax_.x(cmax_.x()+val);
+        cmax_.y(cmax_.y()+val);
+        cmax_.z(cmax_.z()+val);
       }
     }
 
@@ -138,8 +138,8 @@ class BBox {
       {
         cmin_=Min(p-r, cmin_);
         cmax_=Max(p+r, cmax_);
-      } 
-      else 
+      }
+      else
       {
         cmin_=p-r;
         cmax_=p+r;
@@ -156,18 +156,18 @@ class BBox {
         extend(b.get_max());
       }
     }
-    
+
     /// Expand the bounding box to include a disk centered at cen,
     /// with normal normal, and radius r.
     SCISHARE void extend_disk(const Point& cen, const Vector& normal, double r);
 
-    inline Point center() const  
+    inline Point center() const
     {
       /// @todo: C assert: assert(is_valid_);
       Vector d = diagonal();
       return cmin_ + (d * 0.5);
     }
-    
+
     inline double longest_edge() const
     {
       /// @todo: C assert: assert(is_valid_);
@@ -185,50 +185,50 @@ class BBox {
     /// Check whether two BBoxes are similar
     SCISHARE bool is_similar_to(const BBox &b, double diff=0.5) const;
 
-    /// Move the bounding box 
+    /// Move the bounding box
     SCISHARE void translate(const Vector &v);
 
     /// Scale the bounding box by s, centered around o
     SCISHARE void scale(double s, const Vector &o);
 
     inline Point get_min() const
       { return cmin_; }
-    
+
     inline Point get_max() const
       { return cmax_; }
 
     inline Vector diagonal() const
-    { 
+    {
       //TODO: needs invariant check, or refactoring.
-      ASSERT(is_valid_); 
-      return cmax_-cmin_; 
+      ASSERT(is_valid_);
+      return cmax_-cmin_;
     }
 
-    inline bool inside(const Point &p) const 
+    inline bool inside(const Point &p) const
     {
-      return (is_valid_ && p.x() >= cmin_.x() && 
-        p.y() >= cmin_.y() && p.z() >= cmin_.z() && 
-        p.x() <= cmax_.x() && p.y() <= cmax_.y() && 
+      return (is_valid_ && p.x() >= cmin_.x() &&
+        p.y() >= cmin_.y() && p.z() >= cmin_.z() &&
+        p.x() <= cmax_.x() && p.y() <= cmax_.y() &&
         p.z() <= cmax_.z());
     }
 
     inline int intersect(const BBox& b) const
     {
       if ((cmax_.x() < b.cmin_.x()) || (cmin_.x() > b.cmax_.x()) ||
           (cmax_.y() < b.cmin_.y()) || (cmin_.y() > b.cmax_.y()) ||
-          (cmax_.z() < b.cmin_.z()) || (cmin_.z() > b.cmax_.z())) 
+          (cmax_.z() < b.cmin_.z()) || (cmin_.z() > b.cmax_.z()))
       {
         return OUTSIDE;
       }
-      
+
       if ((cmin_.x() <= b.cmin_.x()) && (cmax_.x() >= b.cmax_.x()) &&
           (cmin_.y() <= b.cmin_.y()) && (cmax_.y() >= b.cmax_.y()) &&
-          (cmin_.z() <= b.cmin_.z()) && (cmax_.z() >= b.cmax_.z())) 
+          (cmin_.z() <= b.cmin_.z()) && (cmax_.z() >= b.cmax_.z()))
       {
         return INSIDE;
       }
-      
-      return INTERSECT;    
+
+      return INTERSECT;
     }
 
     inline double x_length() { return (cmax_.x() - cmin_.x()); }
@@ -244,14 +244,14 @@ class BBox {
     /// in hitNear
     SCISHARE bool intersect(const Point& e, const Vector& v, Point& hitNear) const;
 
-    friend std::ostream& operator<<(std::ostream& out, const BBox& b);
 
   private:
     Point cmin_;
     Point cmax_;
     bool is_valid_;
 };
 
+SCISHARE std::ostream& operator<<(std::ostream& out, const BBox& b);
 SCISHARE void Pio( Piostream &, BBox& );
 
 }}}