sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix for Operators.recursiveSplit() not able to split a chain within the last segment.

Browse Source
This commit is contained in:
Tamito Kajiyama 2011-12-11 11:17:41 +00:00
parent efc4341ee4
commit 8a182d41b1
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
source/blender/freestyle/intern/stroke/Operators.cpp
View File

@ -695,7 +695,7 @@ int __recursiveSplit(Chain *_curve, UnaryFunction0D<double>& func, UnaryPredicat
CurveInternal::CurvePointIterator vnext = vit; ++vnext;
for(; (vit!=vitend)&&(vnext!=vitend)&&(split._CurvilinearLength-vit._CurvilinearLength> 0.001); ++vit,++vnext){
for(; (vit!=vitend)&&(vnext!=vitend)&&(vnext._CurvilinearLength<split._CurvilinearLength); ++vit,++vnext){
new_curve_a->push_vertex_back(&(*vit));
}
if((vit==vitend) || (vnext == vitend)){
@ -707,15 +707,11 @@ int __recursiveSplit(Chain *_curve, UnaryFunction0D<double>& func, UnaryPredicat
}
// build the two resulting chains
if(fabs(vit._CurvilinearLength-split._CurvilinearLength) > 0.001){
new_curve_a->push_vertex_back(&(*split));
new_curve_b->push_vertex_back(&(*split));
}
else{
new_curve_a->push_vertex_back(&(*vit));
}
new_curve_a->push_vertex_back(&(*vit));
new_curve_a->push_vertex_back(&(*split));
new_curve_b->push_vertex_back(&(*split));
for(;vit!=vitend;++vit)
for(vit=vnext;vit!=vitend;++vit)
new_curve_b->push_vertex_back(&(*vit));
// let's check whether one or two of the two new curves
@ -864,7 +860,7 @@ int __recursiveSplit(Chain *_curve, UnaryFunction0D<double>& func, UnaryPredicat
CurveInternal::CurvePointIterator vnext = vit; ++vnext;
for(; (vit!=vitend)&&(vnext!=vitend)&&(split._CurvilinearLength-vit._CurvilinearLength> 0.001); ++vit,++vnext){
for(; (vit!=vitend)&&(vnext!=vitend)&&(vnext._CurvilinearLength<split._CurvilinearLength); ++vit,++vnext){
new_curve_a->push_vertex_back(&(*vit));
}
if((vit==vitend) || (vnext == vitend)){
@ -876,15 +872,11 @@ int __recursiveSplit(Chain *_curve, UnaryFunction0D<double>& func, UnaryPredicat
}
// build the two resulting chains
if(fabs(vit._CurvilinearLength-split._CurvilinearLength) > 0.001){
new_curve_a->push_vertex_back(&(*split));
new_curve_b->push_vertex_back(&(*split));
}
else{
new_curve_a->push_vertex_back(&(*vit));
}
new_curve_a->push_vertex_back(&(*vit));
new_curve_a->push_vertex_back(&(*split));
new_curve_b->push_vertex_back(&(*split));
for(;vit!=vitend;++vit)
for(vit=vnext;vit!=vitend;++vit)
new_curve_b->push_vertex_back(&(*vit));
// let's check whether one or two of the two new curves