Revision: 56303
http://sourceforge.net/p/brlcad/code/56303
Author: phoenixyjll
Date: 2013-07-29 02:55:22 +0000 (Mon, 29 Jul 2013)
Log Message:
-----------
If we insert the inner points of overlap2d like this, the points may not be in
order. So we don't use these points. A better approach would be using a mapping
of m_a and m_b.
Modified Paths:
--------------
brlcad/trunk/src/libbrep/intersect.cpp
Modified: brlcad/trunk/src/libbrep/intersect.cpp
===================================================================
--- brlcad/trunk/src/libbrep/intersect.cpp 2013-07-29 02:34:04 UTC (rev
56302)
+++ brlcad/trunk/src/libbrep/intersect.cpp 2013-07-29 02:55:22 UTC (rev
56303)
@@ -1679,15 +1679,12 @@
// if the uv rectangle of them intersects, it's consider
overlap.
merged = true;
if (overlap[i].m_a[1] > pending[j].m_a[1]) {
- if (overlap2d)
- ptarrayB[j]->Append(ON_3dPoint(pending[j].m_b[2],
pending[j].m_b[3], 0.0));
pending[j].m_a[1] = overlap[i].m_a[1];
pending[j].m_b[2] = overlap[i].m_b[2];
pending[j].m_b[3] = overlap[i].m_b[3];
pending[j].m_A[1] = overlap[i].m_A[1];
pending[j].m_B[1] = overlap[i].m_B[1];
- } else if (overlap2d)
- ptarrayB[j]->Append(ON_3dPoint(overlap[i].m_b[2],
overlap[i].m_b[3], 0.0));
+ }
break;
}
}
@@ -2677,9 +2674,9 @@
// The i-th curve is close loop, we get a complete boundary of
// that overlap region.
ON_SSX_EVENT Event;
- Event.m_curve3d = overlaps[i]->m_curve3d;
- Event.m_curveA = overlaps[i]->m_curveA;
- Event.m_curveB = overlaps[i]->m_curveB;
+ Event.m_curve3d = curve_fitting(overlaps[i]->m_curve3d,
fitting_tolerance, true);
+ Event.m_curveA = curve_fitting(overlaps[i]->m_curveA,
fitting_tolerance_A, true);
+ Event.m_curveB = curve_fitting(overlaps[i]->m_curveB,
fitting_tolerance_B, true);
Event.m_type = ON_SSX_EVENT::ssx_overlap;
// Normalize the curves
Event.m_curve3d->SetDomain(ON_Interval(0.0, 1.0));
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
