Revision: 55854
http://sourceforge.net/p/brlcad/code/55854
Author: brlcad
Date: 2013-06-26 15:37:46 +0000 (Wed, 26 Jun 2013)
Log Message:
-----------
folks need to fix their editors to show your trailing whitespace turds... :)
Modified Paths:
--------------
brlcad/trunk/src/libbrep/libbrep_brep_tools.cpp
brlcad/trunk/src/libbrep/libbrep_brep_tools.h
brlcad/trunk/src/libbrep/opennurbs_ext.cpp
Modified: brlcad/trunk/src/libbrep/libbrep_brep_tools.cpp
===================================================================
--- brlcad/trunk/src/libbrep/libbrep_brep_tools.cpp 2013-06-26 15:00:29 UTC
(rev 55853)
+++ brlcad/trunk/src/libbrep/libbrep_brep_tools.cpp 2013-06-26 15:37:46 UTC
(rev 55854)
@@ -53,7 +53,7 @@
x_changed =(tanx1 != tanx2);
y_changed =(tany1 != tany2);
- if (x_changed && y_changed) return 3; //horz & vert
+ if (x_changed && y_changed) return 3; //horz & vert
if (x_changed) return 1;//need to get vertical tangent
if (y_changed) return 2;//need to find horizontal tangent
@@ -74,7 +74,7 @@
return 0;
}
-bool ON_Surface_IsFlat(ON_Plane *frames, double f_tol)
+bool ON_Surface_IsFlat(ON_Plane *frames, double f_tol)
{
double Ndot=1.0;
@@ -147,23 +147,23 @@
return true;
}
-bool ON_Surface_IsStraight(ON_Plane *frames, double s_tol)
+bool ON_Surface_IsStraight(ON_Plane *frames, double s_tol)
{
double Xdot=1.0;
for(int i=0; i<8; i++) {
- for( int j=i+1; j<9; j++) {
- if ((Xdot = Xdot * frames[0].xaxis * frames[1].xaxis) < s_tol) {
- return false;
- }
- }
+ for( int j=i+1; j<9; j++) {
+ if ((Xdot = Xdot * frames[0].xaxis * frames[1].xaxis) < s_tol) {
+ return false;
+ }
+ }
}
return true;
}
/**
- \brief Create surfaces and store their pointers in the t* arguments.
+ \brief Create surfaces and store their pointers in the t* arguments.
For any pre-existing surface passed as one of the t* args, this is a no-op.
@@ -292,7 +292,7 @@
return false;
}
- // Split the south pieces to get q0 and q1
+ // Split the south pieces to get q0 and q1
split_success = south->Split(0, upt, (*q0), (*q1));
if (!split_success || !(*q0) || !(*q1)) {
delete south;
@@ -302,7 +302,7 @@
return false;
}
- // Split the north pieces to get q2 and q3
+ // Split the north pieces to get q2 and q3
split_success = north->Split(0, upt, (*q3), (*q2));
if (!split_success || !(*q3) || !(*q2)) {
delete south;
Modified: brlcad/trunk/src/libbrep/libbrep_brep_tools.h
===================================================================
--- brlcad/trunk/src/libbrep/libbrep_brep_tools.h 2013-06-26 15:00:29 UTC
(rev 55853)
+++ brlcad/trunk/src/libbrep/libbrep_brep_tools.h 2013-06-26 15:37:46 UTC
(rev 55854)
@@ -63,7 +63,7 @@
@param val value to be tested
- @param epsilon distance from zero defining the interval to be treated as
"near" zero for the test
+ @param epsilon distance from zero defining the interval to be treated as
"near" zero for the test
@return @c true if the value is within the near-zero interval specified by
epsilon, @c false otherwise.
*/
@@ -98,7 +98,7 @@
| 5 7 |
| |
0-------------------1
- U
+ U
\endverbatim
*/
#endif
@@ -110,12 +110,12 @@
beneath our simple flatness constraints. The flatness constraint in
this case is a sampling of normals across the surface such that the
product of their combined dot products is close to 1.
-
- @f[ \prod_{i=1}^{7} n_i \dot n_{i+1} = 1 @f]
-
+
+ @f[ \prod_{i=1}^{7} n_i \dot n_{i+1} = 1 @f]
+
This code is using a slightly different placement of the interior normal
tests as compared to <a
href="http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.90.7500&rep=rep1&type=pdf";>Abert's</a>
approach:
-
+
\verbatim
+-------------------+
| |
@@ -126,17 +126,17 @@
| + + |
| |
+-------------------+
- U
+ U
\endverbatim
-
-
+
+
The "+" indicates the normal sample.
-
+
The frenet frames are stored in the frames arrays according
to the following index values:
-
+
\verbatim
- 3-------------------2
+ 3-------------------2
| |
| 6 8 |
| |
@@ -145,7 +145,7 @@
| 5 7 |
| |
0-------------------1
- U
+ U
\endverbatim
@param frames Array of 9 frenet frames
@@ -233,8 +233,8 @@
Create four NURBS surfaces that corresponds to subsets
of an input surface, as defined by UV intervals and a
- point within the U and V intervals.
-
+ point within the U and V intervals.
+
\verbatim
*---------------------*
| | |
@@ -245,19 +245,19 @@
| q0 | q1 |
| | |
*---------------------*
- U
+ U
+ is the point (upt, vpt) that defines the quads
* points represent the mins and maxes of the U and V domains
-
+
\endverbatim
-
+
@param srf parent ON_Surface
- @param u U interval of parent surface
- @param v V interval of parent surface
- @param upt U interval point for quad definition
- @param upt U interval point for quad definition
+ @param u U interval of parent surface
+ @param v V interval of parent surface
+ @param upt U interval point for quad definition
+ @param upt U interval point for quad definition
@param q0 surface calculated by split algorithm
@param q1 surface calculated by split algorithm
@param q2 surface calculated by split algorithm
Modified: brlcad/trunk/src/libbrep/opennurbs_ext.cpp
===================================================================
--- brlcad/trunk/src/libbrep/opennurbs_ext.cpp 2013-06-26 15:00:29 UTC (rev
55853)
+++ brlcad/trunk/src/libbrep/opennurbs_ext.cpp 2013-06-26 15:37:46 UTC (rev
55854)
@@ -994,7 +994,6 @@
}
-
///////////////////////////////////
if ((spanu_cnt > 1) && (spanv_cnt > 1)) {
@@ -1009,7 +1008,7 @@
ON_Surface *q1surf = NULL;
ON_Surface *q0surf = NULL;
- bool split = ON_Surface_Quad_Split(localsurf, u, v, usplit, vsplit,
&q0surf, &q1surf, &q2surf, &q3surf);
+ bool split = ON_Surface_Quad_Split(localsurf, u, v, usplit, vsplit,
&q0surf, &q1surf, &q2surf, &q3surf);
/* FIXME: this needs to be handled more gracefully */
if (!split) {
@@ -1583,7 +1582,7 @@
localsurf->FrameAt(u.Min(), v.Mid(), sharedframes[1]);
localsurf->FrameAt(u.Mid(), v.Max(), sharedframes[2]);
localsurf->FrameAt(u.Max(), v.Mid(), sharedframes[3]);
-
+
ON_Plane *newframes;
newframes = (ON_Plane *)bu_malloc(9*sizeof(ON_Plane), "new frames");
newframes[0] = frames[0];
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
