Text archives Help
- From: abe@sci.utah.edu
- To: manta@sci.utah.edu
- Subject: [MANTA] r337 - in branches/itanium2: Interface Model/Intersections Model/Primitives
- Date: Mon, 23 May 2005 18:02:51 -0600 (MDT)
Author: abe
Date: Mon May 23 18:02:47 2005
New Revision: 337
Modified:
branches/itanium2/Interface/RayPacket.h
branches/itanium2/Model/Intersections/AxisAlignedBox.h
branches/itanium2/Model/Primitives/Cube.cc
Log:
Removed _'s from names
Modified: branches/itanium2/Interface/RayPacket.h
==============================================================================
--- branches/itanium2/Interface/RayPacket.h (original)
+++ branches/itanium2/Interface/RayPacket.h Mon May 23 18:02:47 2005
@@ -84,7 +84,7 @@
int shadowBegin, shadowEnd;
int whichEye;
- int sign_mask[3]; // This is set at the same time as inverse direction.
+ int signMask[3]; // This is set at the same time as inverse direction.
};
const Element& get(int which) const {
@@ -148,9 +148,9 @@
1./data[i].ray.direction().z());
// Set the sign mask at the same time.
- data[i].sign_mask[0] = (data[i].inverseDirection[0] < 0.0);
- data[i].sign_mask[1] = (data[i].inverseDirection[1] < 0.0);
- data[i].sign_mask[2] = (data[i].inverseDirection[2] < 0.0);
+ data[i].signMask[0] = (data[i].inverseDirection[0] < 0.0);
+ data[i].signMask[1] = (data[i].inverseDirection[1] < 0.0);
+ data[i].signMask[2] = (data[i].inverseDirection[2] < 0.0);
}
flags |= HaveInverseDirections;
}
Modified: branches/itanium2/Model/Intersections/AxisAlignedBox.h
==============================================================================
--- branches/itanium2/Model/Intersections/AxisAlignedBox.h (original)
+++ branches/itanium2/Model/Intersections/AxisAlignedBox.h Mon May 23
18:02:47 2005
@@ -21,7 +21,7 @@
// This is the single ray version.
template< typename BOX, typename Scalar >
- inline bool intersect_box(const BOX &bounds, // Object implementing
[]
+ inline bool intersectAaBox(const BOX &bounds, // Object implementing
[]
Scalar &tmin, // Output min t.
Scalar &tmax, // Output max t.
Modified: branches/itanium2/Model/Primitives/Cube.cc
==============================================================================
--- branches/itanium2/Model/Primitives/Cube.cc (original)
+++ branches/itanium2/Model/Primitives/Cube.cc Mon May 23 18:02:47 2005
@@ -49,11 +49,11 @@
Real tmin, tmax;
// Check for an intersection.
- if (Intersection::intersect_box( bbox,
+ if (Intersection::intersectAaBox( bbox,
tmin,
tmax,
e.ray,
- e.sign_mask,
+ e.signMask,
e.inverseDirection/*,
e.hitInfo.minT()*/)) {
- [MANTA] r337 - in branches/itanium2: Interface Model/Intersections Model/Primitives, abe, 05/23/2005
Archive powered by MHonArc 2.6.16.