Text archives Help
- From: thiago@sci.utah.edu
- To: manta@sci.utah.edu
- Subject: [Manta] r1841 - trunk/Model/Groups
- Date: Fri, 9 Nov 2007 10:56:03 -0700 (MST)
Author: thiago
Date: Fri Nov 9 10:56:03 2007
New Revision: 1841
Modified:
trunk/Model/Groups/KDTree.cc
Log:
Compiles when Real is set to double.
Modified: trunk/Model/Groups/KDTree.cc
==============================================================================
--- trunk/Model/Groups/KDTree.cc (original)
+++ trunk/Model/Groups/KDTree.cc Fri Nov 9 10:56:03 2007
@@ -808,13 +808,13 @@
if (t_in[ray] > t_plane[ray]) {
new_t_in[ray] = t_in[ray];
// might may have changed in prev isec step:
- new_t_out[ray] = std::min(t_out[ray],rays.getMinT(ray));
+ new_t_out[ray] =
SCIRun::Min(t_out[ray],static_cast<float>(rays.getMinT(ray)));
new_valid[ray] = (new_t_in[ray]<=new_t_out[ray]);
} else if (t_out[ray] < t_plane[ray]) {
new_valid[ray] = false;
} else {
new_t_in[ray] = t_plane[ray]; //t_in[ray];
- new_t_out[ray] = std::min(t_out[ray],rays.getMinT(ray));
+ new_t_out[ray] =
SCIRun::Min(t_out[ray],static_cast<float>(rays.getMinT(ray)));
new_valid[ray] = (new_t_in[ray]<=new_t_out[ray]);
}
back += new_valid[ray];
- [Manta] r1841 - trunk/Model/Groups, thiago, 11/09/2007
Archive powered by MHonArc 2.6.16.