This repository has been archived on 2023-10-09. You can view files and clone it. You cannot open issues or pull requests or push a commit.
Files
blender-archive/source/blender/freestyle/intern/stroke/ChainingIterators.cpp
Tamito Kajiyama a068212445 Made changes to the C++ API in order to allow for proper error
propagation up to the toplevel error handler in BPY_txt_do_python_Text().

Before these changes were made, the operator() methods of predicates
and functions, for example, returned a value of various types such as
bool, double and Vec2f.  These returned values were not capable to
represent an error state in many cases.

Now the operator() methods always return 0 on normal exit and -1 on
error.  The original returned values are stored in the "result" member
variables of the predicate/function classes.

This means that if we have a code fragment like below:

  UnaryPredicate1D& pred;
  Interface1D& inter;
  if (pred(inter)) {
    /* do something */
  }

then we have to rewrite it as follows:

  UnaryPredicate1D& pred;
  Interface1D& inter;
  if (pred(inter) < 0)
    return -1; /* an error in pred() is propagated */
  if (pred.result) {
    /* do something */
  }

Suppose that pred is a user-defined predicate in Python, i.e. the predicate
is likely error-prone (especially when debugging the predicate).  The first
code fragment shown above prevents the proper error propagation because
the boolean return value of UnaryPredicate1D::operator() cannot inform the
occurrence of an error to the caller; the second code fragment can.

In addition to the operator() methods of predicates and functions, similar
improvements have been made to all other C++ API functions and methods that
are involved in the execution of user-defined Python code snippets.  Changes
in the signatures of functions and methods are summarized as follows (note
that all subclasses of listed classes are also subject to the changes).

Old signatures:
virtual void Iterator::increment();
virtual void Iterator::decrement();
virtual void ChainingIterator::init();
virtual ViewEdge * ChainingIterator::traverse(const AdjacencyIterator &it);
static void Operators::select(UnaryPredicate1D& pred);
static void Operators::chain(ViewEdgeInternal::ViewEdgeIterator& it,
	    UnaryPredicate1D& pred, UnaryFunction1D_void& modifier);
static void Operators::chain(ViewEdgeInternal::ViewEdgeIterator& it,
	    UnaryPredicate1D& pred);  
static void Operators::bidirectionalChain(ChainingIterator& it,
	    UnaryPredicate1D& pred);
static void Operators::bidirectionalChain(ChainingIterator& it);
static void Operators::sequentialSplit(UnaryPredicate0D& startingPred,
	    UnaryPredicate0D& stoppingPred, float sampling = 0);
static void Operators::sequentialSplit(UnaryPredicate0D& pred, float sampling = 0);
static void Operators::recursiveSplit(UnaryFunction0D<double>& func,
	    UnaryPredicate1D& pred, float sampling = 0);
static void Operators::recursiveSplit(UnaryFunction0D<double>& func,
	    UnaryPredicate0D& pred0d, UnaryPredicate1D& pred, float sampling = 0);
static void Operators::sort(BinaryPredicate1D& pred);
static void Operators::create(UnaryPredicate1D& pred, vector<StrokeShader*> shaders);
virtual bool UnaryPredicate0D::operator()(Interface0DIterator& it);
virtual bool BinaryPredicate0D::operator()(Interface0D& inter1, Interface0D& inter2);
virtual bool UnaryPredicate1D::operator()(Interface1D& inter);
virtual bool BinaryPredicate1D::operator()(Interface1D& inter1, Interface1D& inter2);
virtual void StrokeShader::shade(Stroke& ioStroke) const;
virtual T UnaryFunction0D::operator()(Interface0DIterator& iter);
virtual T UnaryFunction1D::operator()(Interface1D& inter);

New signatures:
virtual int Iterator::increment();
virtual int Iterator::decrement();
virtual int ChainingIterator::init();
virtual int ChainingIterator::traverse(const AdjacencyIterator &it);
static int Operators::select(UnaryPredicate1D& pred);
static int Operators::chain(ViewEdgeInternal::ViewEdgeIterator& it,
	   UnaryPredicate1D& pred, UnaryFunction1D_void& modifier);
static int Operators::chain(ViewEdgeInternal::ViewEdgeIterator& it,
	   UnaryPredicate1D& pred);  
static int Operators::bidirectionalChain(ChainingIterator& it,
	   UnaryPredicate1D& pred);
static int Operators::bidirectionalChain(ChainingIterator& it);
static int Operators::sequentialSplit(UnaryPredicate0D& startingPred,
	   UnaryPredicate0D& stoppingPred, float sampling = 0);
static int Operators::sequentialSplit(UnaryPredicate0D& pred, float sampling = 0);
static int Operators::recursiveSplit(UnaryFunction0D<double>& func,
	   UnaryPredicate1D& pred, float sampling = 0);
static int Operators::recursiveSplit(UnaryFunction0D<double>& func,
	   UnaryPredicate0D& pred0d, UnaryPredicate1D& pred, float sampling = 0);
static int Operators::sort(BinaryPredicate1D& pred);
static int Operators::create(UnaryPredicate1D& pred, vector<StrokeShader*> shaders);
virtual int UnaryPredicate0D::operator()(Interface0DIterator& it);
virtual int BinaryPredicate0D::operator()(Interface0D& inter1, Interface0D& inter2);
virtual int UnaryPredicate1D::operator()(Interface1D& inter);
virtual int BinaryPredicate1D::operator()(Interface1D& inter1, Interface1D& inter2);
virtual int StrokeShader::shade(Stroke& ioStroke) const;
virtual int UnaryFunction0D::operator()(Interface0DIterator& iter);
virtual int UnaryFunction1D::operator()(Interface1D& inter);
2009-03-20 22:55:07 +00:00

171 lines
4.5 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 "ChainingIterators.h"
#include "../system/TimeStamp.h"
ViewEdge* AdjacencyIterator::operator*() {
return (*_internalIterator).first;
}
bool AdjacencyIterator::isIncoming() const{
return (*_internalIterator).second;
}
int AdjacencyIterator::increment(){
++_internalIterator;
while((!_internalIterator.isEnd()) && (!isValid((*_internalIterator).first)))
++_internalIterator;
return 0;
}
bool AdjacencyIterator::isValid(ViewEdge* edge){
if(_restrictToSelection)
if(edge->getTimeStamp() != TimeStamp::instance()->getTimeStamp())
return false;
if(_restrictToUnvisited)
if(edge->getChainingTimeStamp() > TimeStamp::instance()->getTimeStamp())
return false;
return true;
}
int ChainingIterator::increment() {
_increment = true;
ViewVertex * vertex = getVertex();
if(!vertex){
_edge = 0;
return 0;
}
AdjacencyIterator it = AdjacencyIterator(vertex, _restrictToSelection, _restrictToUnvisited);
if(it.isEnd()) {
_edge = 0;
return 0;
}
if (traverse(it) < 0)
return -1;
_edge = result;
if(_edge == 0)
return 0;
if(_edge->A() == vertex)
_orientation = true;
else
_orientation = false;
return 0;
}
int ChainingIterator::decrement() {
_increment = false;
ViewVertex * vertex = getVertex();
if(!vertex){
_edge = 0;
return 0;
}
AdjacencyIterator it = AdjacencyIterator(vertex, _restrictToSelection, _restrictToUnvisited);
if(it.isEnd()) {
_edge = 0;
return 0;
}
if (traverse(it) < 0)
return -1;
_edge = result;
if(_edge == 0)
return 0;
if(_edge->B() == vertex)
_orientation = true;
else
_orientation = false;
return 0;
}
//
// ChainSilhouetteIterators
//
///////////////////////////////////////////////////////////
int ChainSilhouetteIterator::traverse(const AdjacencyIterator& ait){
AdjacencyIterator it(ait);
ViewVertex* nextVertex = getVertex();
// we can't get a NULL nextVertex here, it was intercepted
// before
if(nextVertex->getNature() & Nature::T_VERTEX){
TVertex * tvertex = (TVertex*)nextVertex;
ViewEdge *mate = (tvertex)->mate(getCurrentEdge());
while(!it.isEnd()){
ViewEdge *ve = *it;
if(ve == mate) {
result = ve;
return 0;
}
++it;
}
result = 0;
return 0;
}
if(nextVertex->getNature() & Nature::NON_T_VERTEX){
//soc NonTVertex * nontvertex = (NonTVertex*)nextVertex;
ViewEdge * newEdge(0);
// we'll try to chain the edges by keeping the same nature...
// the preseance order is : SILHOUETTE, BORDER, CREASE, SUGGESTIVE, VALLEY, RIDGE
Nature::EdgeNature natures[6] = {Nature::SILHOUETTE, Nature::BORDER, Nature::CREASE, Nature::SUGGESTIVE_CONTOUR, Nature::VALLEY, Nature::RIDGE};
for(unsigned i=0; i<6; ++i){
if(getCurrentEdge()->getNature() & natures[i]){
int n = 0;
while(!it.isEnd()){
ViewEdge *ve = *it;
if(ve->getNature() & natures[i]){
++n;
newEdge = ve;
}
++it;
}
if(n == 1){
result = newEdge;
}else{
result = 0;
}
return 0;
}
}
}
result = 0;
return 0;
}
int ChainPredicateIterator::traverse(const AdjacencyIterator& ait){
AdjacencyIterator it(ait);
// Iterates over next edges to see if one of them
// respects the predicate:
while(!it.isEnd()) {
ViewEdge *ve = *it;
if (_unary_predicate->operator()(*ve) < 0)
return -1;
if (_unary_predicate->result) {
if (_binary_predicate->operator()(*(getCurrentEdge()), *(ve)) < 0)
return -1;
if (_binary_predicate->result) {
result = ve;
return 0;
}
}
++it;
}
result = 0;
return 0;
}