Revision: 55857
http://sourceforge.net/p/brlcad/code/55857
Author: brlcad
Date: 2013-06-26 16:01:37 +0000 (Wed, 26 Jun 2013)
Log Message:
-----------
style conformance
Modified Paths:
--------------
brlcad/trunk/src/libbrep/intersect.cpp
Modified: brlcad/trunk/src/libbrep/intersect.cpp
===================================================================
--- brlcad/trunk/src/libbrep/intersect.cpp 2013-06-26 15:58:30 UTC (rev
55856)
+++ brlcad/trunk/src/libbrep/intersect.cpp 2013-06-26 16:01:37 UTC (rev
55857)
@@ -98,13 +98,13 @@
}
bool IsPointIn(const ON_3dPoint &pt, double tolerance = 0.0)
{
- ON_3dVector vtol(tolerance,tolerance,tolerance);
+ ON_3dVector vtol(tolerance, tolerance, tolerance);
ON_BoundingBox new_bbox(m_node.m_min-vtol, m_node.m_max+vtol);
return new_bbox.IsPointIn(pt);
}
bool Intersect(const Subcurve& other, double tolerance = 0.0) const
{
- ON_3dVector vtol(tolerance,tolerance,tolerance);
+ ON_3dVector vtol(tolerance, tolerance, tolerance);
ON_BoundingBox new_bbox(m_node.m_min-vtol, m_node.m_max+vtol);
ON_BoundingBox intersection;
return intersection.Intersection(new_bbox, other.m_node);
@@ -497,6 +497,7 @@
return true;
}
+
void
newton_cci(double& t_a, double& t_b, const ON_Curve* curveA, const ON_Curve*
curveB)
{
@@ -553,6 +554,7 @@
}
}
+
int
ON_Intersect(const ON_Curve* curveA,
const ON_Curve* curveB,
@@ -963,18 +965,22 @@
if ((*i).second->m_children[0] == NULL)
ret2 = (*i).second->Split();
if (ret1) {
- if (ret2) { /* both splits failed */
+ if (ret2) {
+ /* both splits failed */
tmp_pairs.push_back(*i);
h = MAX_SSI_DEPTH;
- } else { /* the first failed */
+ } else {
+ /* the first failed */
for (int j = 0; j < 4; j++)
tmp_pairs.push_back(std::make_pair((*i).first,
(*i).second->m_children[j]));
}
} else {
- if (ret2) { /* the second failed */
+ if (ret2) {
+ /* the second failed */
for (int j = 0; j < 4; j++)
tmp_pairs.push_back(std::make_pair((*i).first->m_children[j], (*i).second));
- } else { /* both success */
+ } else {
+ /* both success */
for (int j = 0; j < 4; j++)
for (int k = 0; k < 4; k++)
tmp_pairs.push_back(std::make_pair((*i).first->m_children[j],
(*i).second->m_children[k]));
@@ -1294,6 +1300,7 @@
return x.Count();
}
+
// Local Variables:
// tab-width: 8
// mode: C++
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
