Revision: 56827
http://sourceforge.net/p/brlcad/code/56827
Author: phoenixyjll
Date: 2013-08-14 05:59:36 +0000 (Wed, 14 Aug 2013)
Log Message:
-----------
Call link_curves() outside split_trimmed_face().
Modified Paths:
--------------
brlcad/trunk/src/libbrep/boolean.cpp
Modified: brlcad/trunk/src/libbrep/boolean.cpp
===================================================================
--- brlcad/trunk/src/libbrep/boolean.cpp 2013-08-14 04:54:00 UTC (rev
56826)
+++ brlcad/trunk/src/libbrep/boolean.cpp 2013-08-14 05:59:36 UTC (rev
56827)
@@ -272,7 +272,7 @@
HIDDEN int
-split_trimmed_face(ON_SimpleArray<TrimmedFace*> &out, const TrimmedFace *in,
const ON_SimpleArray<ON_Curve*> &curves_in)
+split_trimmed_face(ON_SimpleArray<TrimmedFace*> &out, const TrimmedFace *in,
const ON_SimpleArray<ON_Curve*> &curves)
{
/* We followed the algorithms described in:
* S. Krishnan, A. Narkhede, and D. Manocha. BOOLE: A System to Compute
@@ -282,15 +282,12 @@
* Chains.
*/
- if (curves_in.Count() == 0) {
+ if (curves.Count() == 0) {
// No curve, no splitting
out.Append(in->Duplicate());
return 0;
}
- ON_SimpleArray<ON_Curve*> curves;
- link_curves(curves_in, curves);
-
ON_SimpleArray<IntersectPoint> intersect;
ON_SimpleArray<bool> have_intersect(curves.Count());
for (int i = 0; i < curves.Count(); i++)
@@ -689,7 +686,10 @@
first->innerloop.push_back(iloop);
}
- split_trimmed_face(trimmedfaces, first, curvesarray[i]);
+
+ ON_SimpleArray<ON_Curve*> linked_curves;
+ link_curves(curvesarray[i], linked_curves);
+ split_trimmed_face(trimmedfaces, first, linked_curves);
/* TODO: Perform inside-outside test to decide whether the trimmed face
* should be used in the final b-rep structure or not.
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
