X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgeometry%2Fextrudedshape.h;h=78dfa4911463e57951eaa0ca4524c223ab9ce9b5;hb=65b26478a62b8d715ec415164fff25fafcb35fc1;hp=c00111a549a67fa0bbdd4682f859030acbad4a74;hpb=a6ba5f18950f8471c5f3c168a9d65e901a8a6f2a;p=libs%2Fmath.git

diff --git a/source/geometry/extrudedshape.h b/source/geometry/extrudedshape.h
index c00111a..78dfa49 100644
--- a/source/geometry/extrudedshape.h
+++ b/source/geometry/extrudedshape.h
@@ -41,7 +41,7 @@ template<typename T, unsigned D>
 inline ExtrudedShape<T, D>::ExtrudedShape(const Shape<T, D-1> &b, T l):
 	length(l)
 {
-	if(l<=0)
+	if(l<=T(0))
 		throw std::invalid_argument("ExtrudedShape::ExtrudedShape");
 
 	base = b.clone();
@@ -78,8 +78,8 @@ inline BoundingBox<T, D> ExtrudedShape<T, D>::get_axis_aligned_bounding_box() co
 {
 	BoundingBox<T, D-1> base_bbox = base->get_axis_aligned_bounding_box();
 	T half_length = length/T(2);
-	return BoundingBox<T, D>(LinAl::Vector<T, D>(base_bbox.get_minimum_point(), -half_length),
-		LinAl::Vector<T, D>(base_bbox.get_maximum_point(), half_length));
+	return BoundingBox<T, D>(compose(base_bbox.get_minimum_point(), -half_length),
+		compose(base_bbox.get_maximum_point(), half_length));
 }
 
 template<typename T, unsigned D>
@@ -90,7 +90,7 @@ inline bool ExtrudedShape<T, D>::contains(const LinAl::Vector<T, D> &point) cons
 	if(abs(point[D-1])>length/T(2))
 		return false;
 
-	return base->contains(LinAl::Vector<T, D-1>(point));
+	return base->contains(point.template slice<D-1>(0));
 }
 
 template<typename T, unsigned D>
@@ -108,7 +108,7 @@ inline unsigned ExtrudedShape<T, D>::get_intersections(const Ray<T, D> &ray, Sur
 	T half_length = length/T(2);
 	const LinAl::Vector<T, D> &ray_start = ray.get_start();
 	const LinAl::Vector<T, D> &ray_direction = ray.get_direction();
-	LinAl::Vector<T, D-1> base_dir(ray_direction);
+	LinAl::Vector<T, D-1> base_dir = ray_direction.template slice<D-1>(0);
 
 	/* If the ray does not degenerate to a point in the base space, it could
 	intersect the base shape. */
@@ -116,7 +116,7 @@ inline unsigned ExtrudedShape<T, D>::get_intersections(const Ray<T, D> &ray, Sur
 	{
 		T offset = T();
 		T limit = T();
-		if(ray.get_direction()[D-1]!=T(0))
+		if(ray_direction[D-1]!=T(0))
 		{
 			offset = (half_length-ray_start[D-1])/ray_direction[D-1];
 			limit = (-half_length-ray_start[D-1])/ray_direction[D-1];
@@ -129,13 +129,13 @@ inline unsigned ExtrudedShape<T, D>::get_intersections(const Ray<T, D> &ray, Sur
 		if(limit>=offset)
 		{
 			T distortion = base_dir.norm();
-			Ray<T, D-1> base_ray(LinAl::Vector<T, D-1>(ray_start+ray_direction*offset),
+			Ray<T, D-1> base_ray((ray_start+ray_direction*offset).template slice<D-1>(0),
 				base_dir, (limit-offset)*distortion);
 
 			SurfacePoint<T, D-1> *base_points = 0;
 			if(points)
-				/* Shamelessly reuse the provided storage.  Align to the end of the array
-				so processing can start from the first (nearest) point. */
+				/* Shamelessly reuse the provided storage.  Align to the end of the
+				array so processing can start from the first (nearest) point. */
 				base_points = reinterpret_cast<SurfacePoint<T, D-1> *>(points+size)-size;
 
 			unsigned count = base->get_intersections(base_ray, base_points, size);
@@ -145,8 +145,9 @@ inline unsigned ExtrudedShape<T, D>::get_intersections(const Ray<T, D> &ray, Sur
 				{
 					T x = offset+base_points[i].distance/distortion;
 					points[n].position = ray_start+ray_direction*x;
-					points[n].normal = LinAl::Vector<T, D>(base_points[i].normal, T(0));
+					points[n].normal = compose(base_points[i].normal, T(0));
 					points[n].distance = x;
+					points[n].entry = base_points[i].entry;
 				}
 
 				++n;
@@ -156,7 +157,7 @@ inline unsigned ExtrudedShape<T, D>::get_intersections(const Ray<T, D> &ray, Sur
 
 	/* If the ray is not parallel to the base space, it may pass through the
 	caps. */
-	if(n<size && ray_direction[D-1])
+	if(n<size && ray_direction[D-1]!=T(0))
 	{
 		for(int i=-1; (n<size && i<=1); i+=2)
 		{
@@ -165,7 +166,7 @@ inline unsigned ExtrudedShape<T, D>::get_intersections(const Ray<T, D> &ray, Sur
 				continue;
 
 			LinAl::Vector<T, D> p = ray_start+ray_direction*x;
-			if(base->contains(LinAl::Vector<T, D-1>(p)))
+			if(base->contains(p.template slice<D-1>(0)))
 			{
 				if(points)
 				{
@@ -173,6 +174,7 @@ inline unsigned ExtrudedShape<T, D>::get_intersections(const Ray<T, D> &ray, Sur
 					points[n].normal = LinAl::Vector<T, D>();
 					points[n].normal[D-1] = i;
 					points[n].distance = x;
+					points[n].entry = (T(i)*ray_direction[D-1]<T(0));
 				}
 
 				++n;