Revision: 55653
http://sourceforge.net/p/brlcad/code/55653
Author: phoenixyjll
Date: 2013-06-04 04:27:38 +0000 (Tue, 04 Jun 2013)
Log Message:
-----------
run ws.sh on src/libbrep
Modified Paths:
--------------
brlcad/trunk/src/libbrep/PullbackCurve.cpp
brlcad/trunk/src/libbrep/libbrep_brep_tools.cpp
brlcad/trunk/src/libbrep/libbrep_brep_tools.h
brlcad/trunk/src/libbrep/opennurbs_ext.cpp
brlcad/trunk/src/libbrep/opennurbs_fit.cpp
Modified: brlcad/trunk/src/libbrep/PullbackCurve.cpp
===================================================================
--- brlcad/trunk/src/libbrep/PullbackCurve.cpp 2013-06-04 04:21:32 UTC (rev
55652)
+++ brlcad/trunk/src/libbrep/PullbackCurve.cpp 2013-06-04 04:27:38 UTC (rev
55653)
@@ -927,7 +927,7 @@
}
if (surf->IsClosed(1) &&
- (NEAR_EQUAL(pt.y, vmin, PBC_TOL) || NEAR_EQUAL(pt.y, vmax, PBC_TOL)))
+ (NEAR_EQUAL(pt.y, vmin, PBC_TOL) || NEAR_EQUAL(pt.y, vmax, PBC_TOL)))
{
if (fabs(prev_pt.y - vmin) < fabs(prev_pt.y - vmax)) {
newpt.y = vmin;
Modified: brlcad/trunk/src/libbrep/libbrep_brep_tools.cpp
===================================================================
--- brlcad/trunk/src/libbrep/libbrep_brep_tools.cpp 2013-06-04 04:21:32 UTC
(rev 55652)
+++ brlcad/trunk/src/libbrep/libbrep_brep_tools.cpp 2013-06-04 04:27:38 UTC
(rev 55653)
@@ -29,38 +29,38 @@
// For any pre-existing surface passed as one of the t* args, this is a no-op
void ON_Surface_Create_Scratch_Surfaces(
- ON_Surface **t1,
- ON_Surface **t2,
- ON_Surface **t3,
- ON_Surface **t4)
+ ON_Surface **t1,
+ ON_Surface **t2,
+ ON_Surface **t3,
+ ON_Surface **t4)
{
if (!(*t1)) {
- ON_NurbsSurface *nt1 = ON_NurbsSurface::New();
- (*t1)= (ON_Surface *)(nt1);
+ ON_NurbsSurface *nt1 = ON_NurbsSurface::New();
+ (*t1)= (ON_Surface *)(nt1);
}
if (!(*t2)) {
- ON_NurbsSurface *nt2 = ON_NurbsSurface::New();
- (*t2)= (ON_Surface *)(nt2);
+ ON_NurbsSurface *nt2 = ON_NurbsSurface::New();
+ (*t2)= (ON_Surface *)(nt2);
}
if (!(*t3)) {
- ON_NurbsSurface *nt3 = ON_NurbsSurface::New();
- (*t3)= (ON_Surface *)(nt3);
+ ON_NurbsSurface *nt3 = ON_NurbsSurface::New();
+ (*t3)= (ON_Surface *)(nt3);
}
if (!(*t4)) {
- ON_NurbsSurface *nt4 = ON_NurbsSurface::New();
- (*t4)= (ON_Surface *)(nt4);
+ ON_NurbsSurface *nt4 = ON_NurbsSurface::New();
+ (*t4)= (ON_Surface *)(nt4);
}
}
bool ON_Surface_SubSurface(
- const ON_Surface *srf,
- ON_Interval *u_val,
- ON_Interval *v_val,
- ON_Surface **t1,
- ON_Surface **t2,
- ON_Surface **t3,
- ON_Surface **t4,
- ON_Surface **result
+ const ON_Surface *srf,
+ ON_Interval *u_val,
+ ON_Interval *v_val,
+ ON_Surface **t1,
+ ON_Surface **t2,
+ ON_Surface **t3,
+ ON_Surface **t4,
+ ON_Surface **result
)
{
bool split = true;
@@ -70,15 +70,15 @@
// Make sure we have intervals with non-zero lengths
if ((u_val->Length() <= ON_ZERO_TOLERANCE) || (v_val->Length() <=
ON_ZERO_TOLERANCE))
- return false;
+ return false;
// If we have the original surface domain, just return true
if ((fabs(u_val->Min() - srf->Domain(0).m_t[0]) <= ON_ZERO_TOLERANCE) &&
- (fabs(u_val->Max() - srf->Domain(0).m_t[1]) <= ON_ZERO_TOLERANCE) &&
- (fabs(v_val->Min() - srf->Domain(1).m_t[0]) <= ON_ZERO_TOLERANCE) &&
- (fabs(v_val->Max() - srf->Domain(1).m_t[1]) <= ON_ZERO_TOLERANCE)) {
- (*result) = (ON_Surface *)srf;
- return true;
+ (fabs(u_val->Max() - srf->Domain(0).m_t[1]) <= ON_ZERO_TOLERANCE) &&
+ (fabs(v_val->Min() - srf->Domain(1).m_t[0]) <= ON_ZERO_TOLERANCE) &&
+ (fabs(v_val->Max() - srf->Domain(1).m_t[1]) <= ON_ZERO_TOLERANCE)) {
+ (*result) = (ON_Surface *)srf;
+ return true;
}
if (fabs(u_val->Min() - srf->Domain(0).m_t[0]) > ON_ZERO_TOLERANCE)
last_split = 1;
if (fabs(u_val->Max() - srf->Domain(0).m_t[1]) > ON_ZERO_TOLERANCE)
last_split = 2;
@@ -90,22 +90,22 @@
ON_Surface *ssplit = (ON_Surface *)srf;
ON_Surface_Create_Scratch_Surfaces(t1, t2, t3, t4);
if (fabs(u_val->Min() - srf->Domain(0).m_t[0]) > ON_ZERO_TOLERANCE) {
- if (last_split == 1) {target = t4;} else {target = t2;}
- split = ssplit->Split(0, u_val->Min(), *t1, *target);
- ssplit = *target;
+ if (last_split == 1) {target = t4;} else {target = t2;}
+ split = ssplit->Split(0, u_val->Min(), *t1, *target);
+ ssplit = *target;
}
if ((fabs(u_val->Max() - srf->Domain(0).m_t[1]) > ON_ZERO_TOLERANCE) &&
split) {
- if (last_split == 2) {target = t4;} else {target = t1;}
- split = ssplit->Split(0, u_val->Max(), *target, *t3);
- ssplit = *target;
+ if (last_split == 2) {target = t4;} else {target = t1;}
+ split = ssplit->Split(0, u_val->Max(), *target, *t3);
+ ssplit = *target;
}
if ((fabs(v_val->Min() - srf->Domain(1).m_t[0]) > ON_ZERO_TOLERANCE) &&
split) {
- if (last_split == 3) {target = t4;} else {target = t3;}
- split = ssplit->Split(1, v_val->Min(), *t2, *target);
- ssplit = *target;
+ if (last_split == 3) {target = t4;} else {target = t3;}
+ split = ssplit->Split(1, v_val->Min(), *t2, *target);
+ ssplit = *target;
}
if ((fabs(v_val->Max() - srf->Domain(1).m_t[1]) > ON_ZERO_TOLERANCE) &&
split) {
- split = ssplit->Split(1, v_val->Max(), *t4, *t2);
+ split = ssplit->Split(1, v_val->Max(), *t4, *t2);
}
(*result) = *t4;
if (t1_del) delete *t1;
@@ -117,7 +117,6 @@
}
-
// Local Variables:
// tab-width: 8
// mode: C++
Modified: brlcad/trunk/src/libbrep/libbrep_brep_tools.h
===================================================================
--- brlcad/trunk/src/libbrep/libbrep_brep_tools.h 2013-06-04 04:21:32 UTC
(rev 55652)
+++ brlcad/trunk/src/libbrep/libbrep_brep_tools.h 2013-06-04 04:27:38 UTC
(rev 55653)
@@ -69,14 +69,14 @@
*/
NURBS_EXPORT
bool ON_Surface_SubSurface(
- const ON_Surface *srf,
- ON_Interval *u_val,
- ON_Interval *v_val,
- ON_Surface **t1,
- ON_Surface **t2,
- ON_Surface **t3,
- ON_Surface **t4,
- ON_Surface **result
+ const ON_Surface *srf,
+ ON_Interval *u_val,
+ ON_Interval *v_val,
+ ON_Surface **t1,
+ ON_Surface **t2,
+ ON_Surface **t3,
+ ON_Surface **t4,
+ ON_Surface **result
);
#endif /* __LIBBREP_BREP_TOOLS */
Modified: brlcad/trunk/src/libbrep/opennurbs_ext.cpp
===================================================================
--- brlcad/trunk/src/libbrep/opennurbs_ext.cpp 2013-06-04 04:21:32 UTC (rev
55652)
+++ brlcad/trunk/src/libbrep/opennurbs_ext.cpp 2013-06-04 04:27:38 UTC (rev
55653)
@@ -486,9 +486,9 @@
double midpoint = (t[1]+t[0])/2.0;
ON_Interval left(t[0], midpoint);
ON_Interval right(midpoint, t[1]);
- if (left.Length() > TOL)
+ if (left.Length() > TOL)
getHVTangents(curve, left, list);
- if (right.Length() > TOL)
+ if (right.Length() > TOL)
getHVTangents(curve, right, list);
return true;
} else if (tanx_changed) {//find horz
Modified: brlcad/trunk/src/libbrep/opennurbs_fit.cpp
===================================================================
--- brlcad/trunk/src/libbrep/opennurbs_fit.cpp 2013-06-04 04:21:32 UTC (rev
55652)
+++ brlcad/trunk/src/libbrep/opennurbs_fit.cpp 2013-06-04 04:27:38 UTC (rev
55653)
@@ -327,16 +327,16 @@
solver.compute(AtA);
if(solver.info()!=Eigen::Success) {
// decomposition failed
- std::cout << "decomposition failed\n";
+ std::cout << "decomposition failed\n";
}
(*x) = solver.solve(Atb);
if(solver.info()!=Eigen::Success) {
- std::cout << "solver failed: " << solver.info() << "\n";
+ std::cout << "solver failed: " << solver.info() << "\n";
return false;
} else {
- return true;
+ return true;
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
How ServiceNow helps IT people transform IT departments:
1. A cloud service to automate IT design, transition and operations
2. Dashboards that offer high-level views of enterprise services
3. A single system of record for all IT processes
http://p.sf.net/sfu/servicenow-d2d-j
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
