Revision: 55855
http://sourceforge.net/p/brlcad/code/55855
Author: brlcad
Date: 2013-06-26 15:56:55 +0000 (Wed, 26 Jun 2013)
Log Message:
-----------
messy, reduce the ifdef to the actual isolated difference. remove dead code
for clarity.
Modified Paths:
--------------
brlcad/trunk/src/libbrep/PullbackCurve.cpp
Modified: brlcad/trunk/src/libbrep/PullbackCurve.cpp
===================================================================
--- brlcad/trunk/src/libbrep/PullbackCurve.cpp 2013-06-26 15:37:46 UTC (rev
55854)
+++ brlcad/trunk/src/libbrep/PullbackCurve.cpp 2013-06-26 15:56:55 UTC (rev
55855)
@@ -607,14 +607,15 @@
ON_Curve*
interpolateCurve(ON_2dPointArray &samples)
{
- if (samples.Count() == 2) {
+ ON_NurbsCurve* nurbs;
+
+ if (samples.Count() == 2)
// build a line
return new ON_LineCurve(samples[0], samples[1]);
+
#ifdef DEBUG_USE_BEZIER_CURVE_INTERPOLATION
- } else
- ON_BezierCurve *bezier = new ON_BezierCurve(
- samples);
ON_NurbsCurve nurbcurve;
+ ON_BezierCurve *bezier = new ON_BezierCurve(samples);
if (bezier->GetNurbForm(nurbcurve)) {
return ON_NurbsCurve::New(*bezier);
}
@@ -626,33 +627,14 @@
generateKnots(spline);
generateParameters(spline);
generateControlPoints(spline, samples);
- ON_NurbsCurve* nurbs = newNURBSCurve(spline);
- return nurbs;
+ nurbs = newNURBSCurve(spline);
#else
- }
- else
- {
- ON_TextLog dump;
- ON_NurbsCurve* nurbs;
- if (false) { //(samples.Count() < 1000) { //
- BSpline spline;
- spline.p = 3;
- spline.n = samples.Count() - 1;
- spline.m = spline.n + spline.p + 1;
- generateKnots(spline);
- generateParameters(spline);
- generateControlPoints(spline, samples);
- nurbs = newNURBSCurve(spline, 2);
- //nurbs->Dump(dump);
- } else {
- // local vs. global interpolation for large point sampled curves
- nurbs = interpolateLocalCubicCurve(samples);
- //nurbs->Dump(dump);
- }
- return nurbs;
- }
+ // local vs. global interpolation for large point sampled curves
+ nurbs = interpolateLocalCubicCurve(samples);
#endif
+
+ return nurbs;
}
@@ -901,9 +883,9 @@
// to the same side of the range as the previous point.
static ON_2dPoint
resolve_seam_point_from_prev(
- const ON_Surface *surf,
- const ON_2dPoint &pt,
- const ON_2dPoint &prev_pt)
+ const ON_Surface *surf,
+ const ON_2dPoint &pt,
+ const ON_2dPoint &prev_pt)
{
ON_2dPoint newpt = pt;
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
