#include <algorithm>
#include <cmath>
+#include <stdexcept>
#include <msp/linal/vector.h>
#include "ray.h"
#include "shape.h"
template<typename T, unsigned D>
inline HyperBox<T, D>::HyperBox(const LinAl::Vector<T, D> &d):
dimensions(d)
-{ }
+{
+ for(unsigned i=0; i<D; ++i)
+ if(dimensions[i]<=T(0))
+ throw std::invalid_argument("HyperBox::HyperBox");
+}
template<typename T, unsigned D>
inline HyperBox<T, D> *HyperBox<T, D>::clone() const
template<typename T, unsigned D>
inline bool HyperBox<T, D>::contains(const LinAl::Vector<T, D> &point) const
{
+ using std::abs;
+
for(unsigned i=0; i<D; ++i)
- if(abs(point[i])>dimensions[i]/2)
+ if(abs(point[i])>dimensions[i]/T(2))
return false;
return true;
}
{
using std::abs;
+ if(size>2)
+ size = 2;
+
LinAl::Vector<T, D> half_dim = dimensions/T(2);
unsigned n = 0;
- for(unsigned i=0; i<D; ++i)
+ for(unsigned i=0; (n<size && i<D); ++i)
{
if(!ray.get_direction()[i])
continue;
- for(int j=-1; j<=1; j+=2)
+ for(int j=-1; (n<size && j<=1); j+=2)
{
T x = (T(j)*half_dim[i]-ray.get_start()[i])/ray.get_direction()[i];
- if(x<0)
+ if(!ray.check_limits(x))
continue;
LinAl::Vector<T, D> p = ray.get_start()+ray.get_direction()*x;
for(unsigned k=0; (inside && k<D); ++k)
inside = (k==i || abs(p[k])<=half_dim[k]);
- if(inside && n<size)
+ if(inside)
{
if(points)
{
}
++n;
- if(n==size || n==2)
- return n;
}
}
}