Text archives Help
- From:
- To:
- Subject: [Manta] r2387 - in trunk/Model: Intersections MiscObjects Primitives
- Date: Tue, 17 Mar 2009 10:57:28 -0600 (MDT)
Author: abe
Date: Tue Mar 17 10:57:26 2009
New Revision: 2387
Modified:
trunk/Model/Intersections/AxisAlignedBox.h
trunk/Model/Intersections/Plane.h
trunk/Model/Intersections/Sphere.h
trunk/Model/Intersections/TriangleEdge.h
trunk/Model/MiscObjects/CuttingPlane.cc
trunk/Model/Primitives/Cube.cc
Log:
Removed the "Intersection::" namespace, apparently on a newer compiler
version this caused a name conflict with the "Intersection" (as in
CSG) class name.
M MiscObjects/CuttingPlane.cc
M Intersections/TriangleEdge.h
M Intersections/Plane.h
M Intersections/AxisAlignedBox.h
M Intersections/Sphere.h
M Primitives/Cube.cc
Modified: trunk/Model/Intersections/AxisAlignedBox.h
==============================================================================
--- trunk/Model/Intersections/AxisAlignedBox.h (original)
+++ trunk/Model/Intersections/AxisAlignedBox.h Tue Mar 17 10:57:26 2009
@@ -10,7 +10,6 @@
#include <limits>
namespace Manta {
- namespace Intersection {
// This intersection method uses the Amy Williams ray/box intersection
// technique.
@@ -59,7 +58,6 @@
return tmin < t1 && tmax > t0;
}
- }
}
#endif
Modified: trunk/Model/Intersections/Plane.h
==============================================================================
--- trunk/Model/Intersections/Plane.h (original)
+++ trunk/Model/Intersections/Plane.h Tue Mar 17 10:57:26 2009
@@ -4,7 +4,6 @@
#define Manta_Model_Intersections_Plane__H
namespace Manta {
- namespace Intersection {
template< typename Scalar >
inline bool intersectPlane( const Vector& point,
@@ -22,7 +21,6 @@
}
- } // end namespace Intersection
}; // end namespace Manta
#endif
Modified: trunk/Model/Intersections/Sphere.h
==============================================================================
--- trunk/Model/Intersections/Sphere.h (original)
+++ trunk/Model/Intersections/Sphere.h Tue Mar 17 10:57:26 2009
@@ -2,7 +2,6 @@
#define Manta_Model_Intersections_Sphere__H
namespace Manta {
- namespace Intersection {
// This is the single ray version.
inline bool intersectSphere(const Vector ¢er,//sphere center
@@ -31,7 +30,6 @@
}
return false;
}
- }
}
#endif
Modified: trunk/Model/Intersections/TriangleEdge.h
==============================================================================
--- trunk/Model/Intersections/TriangleEdge.h (original)
+++ trunk/Model/Intersections/TriangleEdge.h Tue Mar 17 10:57:26 2009
@@ -37,7 +37,6 @@
namespace Manta {
- namespace Intersection {
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
@@ -187,7 +186,7 @@
return true;
}
- }
+
};
#endif
Modified: trunk/Model/MiscObjects/CuttingPlane.cc
==============================================================================
--- trunk/Model/MiscObjects/CuttingPlane.cc (original)
+++ trunk/Model/MiscObjects/CuttingPlane.cc Tue Mar 17 10:57:26 2009
@@ -68,12 +68,12 @@
Ray ray = rays.getRay(i);
// Check to see if the ray intersects the bounding box.
- if (Intersection::intersectAaBox( bounds, box_min, box_max,
+ if (intersectAaBox( bounds, box_min, box_max,
ray, rays.getSigns(i),
rays.getInverseDirection(i) )) {
// Intersect the ray with the plane.
- Intersection::intersectPlane( plane_point, plane_normal,
plane_t[new_i],
+ intersectPlane( plane_point, plane_normal, plane_t[new_i],
ray );
// Record which original ray this new ray maps to.
Modified: trunk/Model/Primitives/Cube.cc
==============================================================================
--- trunk/Model/Primitives/Cube.cc (original)
+++ trunk/Model/Primitives/Cube.cc Tue Mar 17 10:57:26 2009
@@ -49,7 +49,7 @@
Real tmin, tmax;
// Check for an intersection.
- if (Intersection::intersectAaBox( bbox,
+ if (intersectAaBox( bbox,
tmin,
tmax,
rays.getRay(i),
- [Manta] r2387 - in trunk/Model: Intersections MiscObjects Primitives, abe, 03/17/2009
Archive powered by MHonArc 2.6.16.