Revision: 55137
http://brlcad.svn.sourceforge.net/brlcad/?rev=55137&view=rev
Author: brlcad
Date: 2013-04-12 04:17:39 +0000 (Fri, 12 Apr 2013)
Log Message:
-----------
ws indent cleanup
Modified Paths:
--------------
brlcad/trunk/src/librt/primitives/brep/brep.cpp
brlcad/trunk/src/librt/primitives/brep/brep_debug.cpp
Modified: brlcad/trunk/src/librt/primitives/brep/brep.cpp
===================================================================
--- brlcad/trunk/src/librt/primitives/brep/brep.cpp 2013-04-12 04:09:18 UTC
(rev 55136)
+++ brlcad/trunk/src/librt/primitives/brep/brep.cpp 2013-04-12 04:17:39 UTC
(rev 55137)
@@ -2574,11 +2574,11 @@
}
void getEdgePoints(const ON_BrepTrim &trim, fastf_t t1, ON_3dPoint &start_2d,
- ON_3dVector &start_tang, ON_3dPoint &start_3d, ON_3dVector &start_norm,
- fastf_t t2, ON_3dPoint &end_2d, ON_3dVector &end_tang,
- ON_3dPoint &end_3d, ON_3dVector &end_norm, fastf_t min_dist,
- fastf_t max_dist, fastf_t within_dist, fastf_t cos_within_ang,
- std::map<double, ON_3dPoint *> ¶m_points)
+ ON_3dVector &start_tang, ON_3dPoint &start_3d, ON_3dVector &start_norm,
+ fastf_t t2, ON_3dPoint &end_2d, ON_3dVector &end_tang,
+ ON_3dPoint &end_3d, ON_3dVector &end_norm, fastf_t min_dist,
+ fastf_t max_dist, fastf_t within_dist, fastf_t cos_within_ang,
+ std::map<double, ON_3dPoint *> ¶m_points)
{
const ON_Surface *s = trim.SurfaceOf();
ON_Interval range = trim.Domain();
@@ -2594,13 +2594,13 @@
double dist3d;
if ((line3d.Length() > max_dist)
- || ((dist3d = mid_3d.DistanceTo(line3d.ClosestPointTo(mid_3d)))
- > within_dist + ON_ZERO_TOLERANCE)
- || ((((start_tang * end_tang)
- < cos_within_ang - ON_ZERO_TOLERANCE)
- || ((start_norm * end_norm)
- < cos_within_ang - ON_ZERO_TOLERANCE))
- && (dist3d > min_dist + ON_ZERO_TOLERANCE))) {
+ || ((dist3d = mid_3d.DistanceTo(line3d.ClosestPointTo(mid_3d)))
+ > within_dist + ON_ZERO_TOLERANCE)
+ || ((((start_tang * end_tang)
+ < cos_within_ang - ON_ZERO_TOLERANCE)
+ || ((start_norm * end_norm)
+ < cos_within_ang - ON_ZERO_TOLERANCE))
+ && (dist3d > min_dist + ON_ZERO_TOLERANCE))) {
getEdgePoints(trim, t1, start_2d, start_tang, start_3d, start_norm,
t, mid_2d, mid_tang, mid_3d, mid_norm, min_dist, max_dist,
within_dist, cos_within_ang, param_points);
@@ -2614,8 +2614,8 @@
}
std::map<double, ON_3dPoint *> *getEdgePoints(ON_BrepTrim &trim,
- fastf_t max_dist, const struct rt_tess_tol *ttol,
- const struct bn_tol *tol, const struct rt_view_info *UNUSED(info))
+ fastf_t max_dist, const struct rt_tess_tol *ttol,
+ const struct bn_tol *tol, const struct rt_view_info *UNUSED(info))
{
std::map<double, ON_3dPoint *> *param_points = NULL;
fastf_t min_dist, within_dist, cos_within_ang;
@@ -2675,22 +2675,22 @@
&& s->EvNormal(start_2d.x, start_2d.y, start_3d, start_norm)
&& s->EvNormal(end_2d.x, end_2d.y, end_3d, end_norm)) {
(*param_points)[0.0] = new ON_3dPoint(
- s->PointAt(trim.PointAt(range.m_t[0]).x,
- trim.PointAt(range.m_t[0]).y));
+ s->PointAt(trim.PointAt(range.m_t[0]).x,
+ trim.PointAt(range.m_t[0]).y));
getEdgePoints(trim, range.m_t[0], start_2d, start_tang,
- start_3d, start_norm, mid_range, mid_2d, mid_tang,
- mid_3d, mid_norm, min_dist, max_dist, within_dist,
- cos_within_ang, *param_points);
+ start_3d, start_norm, mid_range, mid_2d, mid_tang,
+ mid_3d, mid_norm, min_dist, max_dist, within_dist,
+ cos_within_ang, *param_points);
(*param_points)[0.5] = new ON_3dPoint(
- s->PointAt(trim.PointAt(mid_range).x,
- trim.PointAt(mid_range).y));
+ s->PointAt(trim.PointAt(mid_range).x,
+ trim.PointAt(mid_range).y));
getEdgePoints(trim, mid_range, mid_2d, mid_tang, mid_3d,
- mid_norm, range.m_t[1], end_2d, end_tang, end_3d,
- end_norm, min_dist, max_dist, within_dist,
- cos_within_ang, *param_points);
+ mid_norm, range.m_t[1], end_2d, end_tang, end_3d,
+ end_norm, min_dist, max_dist, within_dist,
+ cos_within_ang, *param_points);
(*param_points)[1.0] = new ON_3dPoint(
- s->PointAt(trim.PointAt(range.m_t[1]).x,
- trim.PointAt(range.m_t[1]).y));
+ s->PointAt(trim.PointAt(range.m_t[1]).x,
+ trim.PointAt(range.m_t[1]).y));
}
} else {
ON_3dPoint start_2d, start_3d;
@@ -2703,9 +2703,9 @@
&& s->EvNormal(end_2d.x, end_2d.y, end_3d, end_norm)) {
(*param_points)[0.0] = new ON_3dPoint(start_3d);
getEdgePoints(trim, range.m_t[0], start_2d, start_tang,
- start_3d, start_norm, range.m_t[1], end_2d, end_tang,
- end_3d, end_norm, min_dist, max_dist, within_dist,
- cos_within_ang, *param_points);
+ start_3d, start_norm, range.m_t[1], end_2d, end_tang,
+ end_3d, end_norm, min_dist, max_dist, within_dist,
+ cos_within_ang, *param_points);
(*param_points)[1.0] = new ON_3dPoint(end_3d);
}
}
@@ -2717,9 +2717,9 @@
}
void getSurfacePoints(const ON_Surface *s, fastf_t u1, fastf_t u2, fastf_t v1,
- fastf_t v2, fastf_t min_dist, fastf_t within_dist,
- fastf_t cos_within_ang, ON_2dPointArray &on_surf_points, bool left,
- bool below)
+ fastf_t v2, fastf_t min_dist, fastf_t within_dist,
+ fastf_t cos_within_ang, ON_2dPointArray &on_surf_points, bool left,
+ bool below)
{
double ldfactor = 2.0;
ON_2dPoint p2d;
@@ -2751,15 +2751,15 @@
}
if (i == 1) {
getSurfacePoints(s, u1, u1 + step, v1, v2, min_dist,
- within_dist, cos_within_ang, on_surf_points, left,
- below);
+ within_dist, cos_within_ang, on_surf_points, left,
+ below);
} else if (i == isteps) {
getSurfacePoints(s, u2 - step, u2, v1, v2, min_dist,
- within_dist, cos_within_ang, on_surf_points, left,
- below);
+ within_dist, cos_within_ang, on_surf_points, left,
+ below);
} else {
getSurfacePoints(s, step_u - step, step_u, v1, v2, min_dist,
within_dist,
- cos_within_ang, on_surf_points, left, below);
+ cos_within_ang, on_surf_points, left, below);
}
left = false;
@@ -2783,15 +2783,15 @@
if (i == 1) {
getSurfacePoints(s, u1, u2, v1, v1 + step, min_dist,
- within_dist, cos_within_ang, on_surf_points, left,
- below);
+ within_dist, cos_within_ang, on_surf_points, left,
+ below);
} else if (i == isteps) {
getSurfacePoints(s, u1, u2, v2 - step, v2, min_dist,
- within_dist, cos_within_ang, on_surf_points, left,
- below);
+ within_dist, cos_within_ang, on_surf_points, left,
+ below);
} else {
getSurfacePoints(s, u1, u2, step_v - step, step_v, min_dist,
within_dist,
- cos_within_ang, on_surf_points, left, below);
+ cos_within_ang, on_surf_points, left, below);
}
below = false;
@@ -2829,7 +2829,7 @@
vdot = norm[0] * norm[3];
}
if ((udot < cos_within_ang - ON_ZERO_TOLERANCE)
- && (vdot < cos_within_ang - ON_ZERO_TOLERANCE)) {
+ && (vdot < cos_within_ang - ON_ZERO_TOLERANCE)) {
if (left) {
p2d.Set(u1, v);
on_surf_points.Append(p2d);
@@ -2902,21 +2902,21 @@
on_surf_points.Append(p2d);
getSurfacePoints(s, u1, u, v1, v, min_dist, within_dist,
- cos_within_ang, on_surf_points, left, below);
+ cos_within_ang, on_surf_points, left, below);
getSurfacePoints(s, u1, u, v, v2, min_dist, within_dist,
- cos_within_ang, on_surf_points, left, false);
+ cos_within_ang, on_surf_points, left, false);
getSurfacePoints(s, u, u2, v1, v, min_dist, within_dist,
- cos_within_ang, on_surf_points, false, below);
+ cos_within_ang, on_surf_points, false, below);
getSurfacePoints(s, u, u2, v, v2, min_dist, within_dist,
- cos_within_ang, on_surf_points, false, false);
+ cos_within_ang, on_surf_points, false, false);
}
}
}
}
void getSurfacePoints(ON_BrepFace &face, const struct rt_tess_tol *ttol,
- const struct bn_tol *tol, const struct rt_view_info *UNUSED(info),
- ON_2dPointArray &on_surf_points)
+ const struct bn_tol *tol, const struct rt_view_info *UNUSED(info),
+ ON_2dPointArray &on_surf_points)
{
double surface_width, surface_height;
const ON_Surface *s = face.SurfaceOf();
@@ -2961,10 +2961,10 @@
// min_dist = within_dist;
//}
} else if ((ttol->abs > 0.0 + ON_ZERO_TOLERANCE)
- && (ttol->norm < 0.0 + ON_ZERO_TOLERANCE)) {
+ && (ttol->norm < 0.0 + ON_ZERO_TOLERANCE)) {
within_dist = min_dist;
} else if ((ttol->abs > 0.0 + ON_ZERO_TOLERANCE)
- || (ttol->norm > 0.0 + ON_ZERO_TOLERANCE)) {
+ || (ttol->norm > 0.0 + ON_ZERO_TOLERANCE)) {
within_dist = dist;
} else {
within_dist = 0.01 * dist; // default to 1% minimum surface distance
@@ -3120,9 +3120,9 @@
}
void poly2tri_CDT(struct bu_list *vhead, ON_BrepFace &face,
- const struct rt_tess_tol *ttol, const struct bn_tol *tol,
- const struct rt_view_info *info, bool watertight = false, int plottype
=
- 0, int num_points = -1.0)
+ const struct rt_tess_tol *ttol, const struct bn_tol *tol,
+ const struct rt_view_info *info, bool watertight = false, int plottype =
+ 0, int num_points = -1.0)
{
ON_RTree rt_trims, rt_points;
ON_2dPointArray on_surf_points;
@@ -3138,8 +3138,8 @@
return;
}
max_dist = sqrt(
- surface_width * surface_width + surface_height * surface_height)
- / 10.0;
+ surface_width * surface_width + surface_height * surface_height)
+ / 10.0;
}
std::map<p2t::Point *, ON_3dPoint *> *pointmap = new std::map<p2t::Point
*, ON_3dPoint *>();
@@ -3158,7 +3158,7 @@
ON_BrepVertex& v1 = face.Brep()->m_V[trim->m_vi[0]];
ON_3dPoint *p3d = new ON_3dPoint(v1.Point());
p2t::Point *p = new p2t::Point(trim->PointAtStart().x,
- trim->PointAtStart().y);
+ trim->PointAtStart().y);
polyline.push_back(p);
on_loop_points.Append(trim->PointAtStart());
(*pointmap)[p] = p3d;
@@ -3173,7 +3173,7 @@
}
if (trim->m_trim_user.p) {
std::map<double, ON_3dPoint *> *param_points3d = (std::map<
- double, ON_3dPoint *> *) trim->m_trim_user.p;
+ double, ON_3dPoint *> *) trim->m_trim_user.p;
ON_3dPoint boxmin;
ON_3dPoint boxmax;
@@ -3433,7 +3433,7 @@
if (trim->m_trim_user.p) {
std::map<double, ON_3dPoint *> *points = (std::map<double,
- ON_3dPoint *> *) trim->m_trim_user.p;
+ ON_3dPoint *> *) trim->m_trim_user.p;
std::map<double, ON_3dPoint *>::iterator i;
for (i = points->begin(); i != points->end(); i++) {
ON_3dPoint *p = (*i).second;
Modified: brlcad/trunk/src/librt/primitives/brep/brep_debug.cpp
===================================================================
--- brlcad/trunk/src/librt/primitives/brep/brep_debug.cpp 2013-04-12
04:09:18 UTC (rev 55136)
+++ brlcad/trunk/src/librt/primitives/brep/brep_debug.cpp 2013-04-12
04:17:39 UTC (rev 55137)
@@ -829,7 +829,7 @@
ON_TextLog info_output(wonstr);
ON_Brep *brep = bs->brep;
if (brep == NULL) {
- return -1;
+ return -1;
}
if (!brep->IsValid(&info_output)) {
bu_log("brep is NOT valid");
@@ -873,7 +873,7 @@
ON_TextLog info_output(wonstr);
ON_Brep *brep = bs->brep;
if (brep == NULL) {
- return -1;
+ return -1;
}
if (!brep->IsValid(&info_output)) {
bu_log("brep is NOT valid");
@@ -940,7 +940,7 @@
ON_TextLog dump(s);
ON_Brep *brep = bs->brep;
if (brep == NULL) {
- return -1;
+ return -1;
}
if (!brep->IsValid(&dump)) {
bu_log("brep is NOT valid");
@@ -1084,7 +1084,7 @@
ON_wString wstr;
ON_TextLog dump(wstr);
if (brep == NULL) {
- return -1;
+ return -1;
}
if (!brep->IsValid(&dump)) {
bu_log("brep is NOT valid");
@@ -1185,7 +1185,7 @@
ON_wString wstr;
ON_TextLog dump(wstr);
if (brep == NULL) {
- return -1;
+ return -1;
}
if (!brep->IsValid(&dump)) {
bu_log("brep is NOT valid");
@@ -1229,7 +1229,7 @@
ON_wString wstr;
ON_TextLog dump(wstr);
if (brep == NULL) {
- return -1;
+ return -1;
}
if (!brep->IsValid(&dump)) {
bu_log("brep is NOT valid");
@@ -1268,9 +1268,9 @@
}
int brep_facecdt_plot(struct bu_vls *vls, const char *solid_name,
- const struct rt_tess_tol *ttol, const struct bn_tol *tol,
- struct brep_specific* bs, struct rt_brep_internal*UNUSED(bi),
- struct bn_vlblock *vbp, int index, int plottype, int num_points = -1)
+ const struct rt_tess_tol *ttol, const struct bn_tol *tol,
+ struct brep_specific* bs, struct rt_brep_internal*UNUSED(bi),
+ struct bn_vlblock *vbp, int index, int plottype, int num_points = -1)
{
register struct bu_list *vhead = rt_vlblock_find(vbp, YELLOW);
bool watertight = true;
@@ -1334,7 +1334,7 @@
ON_Brep* brep = bs->brep;
if (brep == NULL) {
- return -1;
+ return -1;
}
if (!brep->IsValid(&tl)) {
bu_log("brep is NOT valid");
@@ -1371,7 +1371,7 @@
ON_Brep* brep = bs->brep;
if (brep == NULL) {
- return -1;
+ return -1;
}
if (!brep->IsValid(&tl)) {
bu_log("brep is NOT valid");
@@ -1404,7 +1404,7 @@
ON_Brep* brep = bs->brep;
if (brep == NULL) {
- return -1;
+ return -1;
}
if (!brep->IsValid(&tl)) {
bu_log("brep is NOT valid");
@@ -1435,7 +1435,7 @@
ON_Brep* brep = bs->brep;
if (brep == NULL) {
- return -1;
+ return -1;
}
if (!brep->IsValid(&tl)) {
bu_log("brep is NOT valid");
@@ -1467,7 +1467,7 @@
ON_Brep* brep = bs->brep;
if (brep == NULL) {
- return -1;
+ return -1;
}
if (!brep->IsValid(&tl)) {
bu_log("brep is NOT valid");
@@ -1497,7 +1497,7 @@
ON_Brep* brep = bs->brep;
if (brep == NULL) {
- return -1;
+ return -1;
}
if (!brep->IsValid(&tl)) {
bu_log("brep is NOT valid");
@@ -1528,7 +1528,7 @@
ON_Brep* brep = bs->brep;
if (brep == NULL) {
- return -1;
+ return -1;
}
if (!brep->IsValid(&tl)) {
bu_log("brep is NOT valid");
@@ -1558,7 +1558,7 @@
ON_Brep* brep = bs->brep;
if (brep == NULL) {
- return -1;
+ return -1;
}
if (!brep->IsValid(&tl)) {
bu_log("brep is NOT valid");
@@ -2152,7 +2152,7 @@
ON_Brep* brep = bs->brep;
if (brep == NULL) {
- return -1;
+ return -1;
}
if (!brep->IsValid(&tl)) {
bu_log("brep is NOT valid");
@@ -2197,7 +2197,7 @@
ON_Brep* brep = bs->brep;
if (brep == NULL) {
- return -1;
+ return -1;
}
if (!brep->IsValid(&tl)) {
bu_log("brep is NOT valid");
@@ -2231,7 +2231,7 @@
ON_Brep* brep = bs->brep;
if (brep == NULL) {
- return -1;
+ return -1;
}
if (!brep->IsValid(&tl)) {
bu_log("brep is NOT valid");
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Precog is a next-generation analytics platform capable of advanced
analytics on semi-structured data. The platform includes APIs for building
apps and a phenomenal toolset for data science. Developers can use
our toolset for easy data analysis & visualization. Get a free account!
http://www2.precog.com/precogplatform/slashdotnewsletter
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
