Tamito Kajiyama
2d25a12bbd
introduced by chaining operations. When two ViewEdges are concatenated by a chaining operator, the last vertex of one ViewEdge and the first vertex of the other reside in the same 3D position, so that the latter vertex is omitted. This caused a pair of SVertices unconnected by an FEdge. The present commit intends to fix this issue. The bug was reported by mato_sus304 with a .blend file reproducing the issue. Thanks!
149 lines
3.8 KiB
C++
Executable File
149 lines
3.8 KiB
C++
Executable File
|
|
//
|
|
// Copyright (C) : Please refer to the COPYRIGHT file distributed
|
|
// with this source distribution.
|
|
//
|
|
// This program is free software; you can redistribute it and/or
|
|
// modify it under the terms of the GNU General Public License
|
|
// as published by the Free Software Foundation; either version 2
|
|
// of the License, or (at your option) any later version.
|
|
//
|
|
// This program is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with this program; if not, write to the Free Software
|
|
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
//
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#include "Chain.h"
|
|
#include "../view_map/ViewMapIterators.h"
|
|
#include "../view_map/ViewMapAdvancedIterators.h"
|
|
|
|
void Chain::push_viewedge_back(ViewEdge *iViewEdge, bool orientation)
|
|
{
|
|
ViewEdge::vertex_iterator v;
|
|
ViewEdge::vertex_iterator vend;
|
|
ViewEdge::vertex_iterator vfirst;
|
|
Vec3r previous, current;
|
|
if(true == orientation)
|
|
{
|
|
v=iViewEdge->vertices_begin();
|
|
vfirst = v;
|
|
vend=iViewEdge->vertices_end();
|
|
}
|
|
else
|
|
{
|
|
v=iViewEdge->vertices_last();
|
|
vfirst = v;
|
|
vend=iViewEdge->vertices_end();
|
|
}
|
|
|
|
if(!_Vertices.empty())
|
|
{
|
|
previous = _Vertices.back()->point2d();
|
|
if(orientation)
|
|
++v;
|
|
else
|
|
--v;
|
|
// Ensure the continuity of underlying FEdges
|
|
CurvePoint *cp = _Vertices.back();
|
|
SVertex *sv_last = cp->B();
|
|
if (!sv_last) sv_last = cp->A();
|
|
SVertex *sv_curr = (*v);
|
|
FEdge *fe = (orientation) ? iViewEdge->fedgeA() : iViewEdge->fedgeB();
|
|
FEdge *fe2 = fe->duplicate();
|
|
fe2->setVertexA(sv_last);
|
|
fe2->setVertexB(sv_curr);
|
|
sv_last->AddFEdge(fe2);
|
|
sv_curr->AddFEdge(fe2);
|
|
}
|
|
else
|
|
previous = (*v)->point2d();
|
|
do{
|
|
current = (*v)->point2d();
|
|
Curve::push_vertex_back(*v);
|
|
//_Length += (current-previous).norm();
|
|
previous = current;
|
|
if(orientation)
|
|
++v;
|
|
else
|
|
--v;
|
|
}while((v!=vend) && (v!=vfirst));
|
|
|
|
if(v==vfirst)
|
|
{
|
|
//Add last one:
|
|
current = (*v)->point2d();
|
|
Curve::push_vertex_back(*v);
|
|
//_Length += (current-previous).norm();
|
|
}
|
|
}
|
|
|
|
void Chain::push_viewedge_front(ViewEdge *iViewEdge, bool orientation)
|
|
{
|
|
orientation = !orientation;
|
|
ViewEdge::vertex_iterator v;
|
|
ViewEdge::vertex_iterator vend;
|
|
ViewEdge::vertex_iterator vfirst;
|
|
Vec3r previous, current;
|
|
if(true == orientation)
|
|
{
|
|
v=iViewEdge->vertices_begin();
|
|
vfirst = v;
|
|
vend=iViewEdge->vertices_end();
|
|
}
|
|
else
|
|
{
|
|
v=iViewEdge->vertices_last();
|
|
vfirst = v;
|
|
vend=iViewEdge->vertices_end();
|
|
}
|
|
|
|
if(!_Vertices.empty())
|
|
{
|
|
previous = _Vertices.front()->point2d();
|
|
if(orientation)
|
|
++v;
|
|
else
|
|
--v;
|
|
// Ensure the continuity of underlying FEdges
|
|
CurvePoint *cp = _Vertices.front();
|
|
SVertex *sv_last = cp->A();
|
|
if (!sv_last) sv_last = cp->B();
|
|
SVertex *sv_curr = (*v);
|
|
FEdge *fe = (orientation) ? iViewEdge->fedgeA() : iViewEdge->fedgeB();
|
|
FEdge *fe2 = fe->duplicate();
|
|
fe2->setVertexA(sv_curr);
|
|
fe2->setVertexB(sv_last);
|
|
sv_last->AddFEdge(fe2);
|
|
sv_curr->AddFEdge(fe2);
|
|
}
|
|
else
|
|
previous = (*v)->point2d();
|
|
do{
|
|
current = (*v)->point2d();
|
|
Curve::push_vertex_front((*v));
|
|
//_Length += (current-previous).norm();
|
|
previous = current;
|
|
if(orientation)
|
|
++v;
|
|
else
|
|
--v;
|
|
}while((v!=vend) && (v!=vfirst));
|
|
|
|
if(v==vfirst)
|
|
{
|
|
//Add last one:
|
|
current = (*v)->point2d();
|
|
Curve::push_vertex_front(*v);
|
|
//_Length += (current-previous).norm();
|
|
}
|
|
}
|
|
|
|
|
|
|