diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-02 05:55:30 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-02 05:55:30 +0400 |
commit | 699da2fb0d9012cef5e45cc1b547a01fd92dbc1c (patch) | |
tree | eb6e3de1f90387af1a2628bbc79d51327e3ac248 /source/blender/freestyle/intern/view_map/Functions1D.cpp | |
parent | 520ab93465d8056bf6d4a4115743daaee4c2fd66 (diff) |
Yet another big style clean-up patch by Bastien Montagne, thanks a lot!
Now the code style is acceptable for the merge now, according to Bastien.
Thanks again Bastien for having this done! :)
Diffstat (limited to 'source/blender/freestyle/intern/view_map/Functions1D.cpp')
-rw-r--r-- | source/blender/freestyle/intern/view_map/Functions1D.cpp | 444 |
1 files changed, 242 insertions, 202 deletions
diff --git a/source/blender/freestyle/intern/view_map/Functions1D.cpp b/source/blender/freestyle/intern/view_map/Functions1D.cpp index 8545c660084..f17a568ffee 100644 --- a/source/blender/freestyle/intern/view_map/Functions1D.cpp +++ b/source/blender/freestyle/intern/view_map/Functions1D.cpp @@ -1,231 +1,271 @@ +/* + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * The Original Code is Copyright (C) 2010 Blender Foundation. + * All rights reserved. + * + * The Original Code is: all of this file. + * + * Contributor(s): none yet. + * + * ***** END GPL LICENSE BLOCK ***** + */ -// -// 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. -// -/////////////////////////////////////////////////////////////////////////////// +/** \file blender/freestyle/intern/view_map/Functions1D.cpp + * \ingroup freestyle + * \brief Functions taking 1D input + * \author Stephane Grabli + * \author Emmanuel Turquin + * \date 01/07/2003 + */ # include "Functions1D.h" + using namespace std; namespace Functions1D { - int GetXF1D::operator()(Interface1D& inter) { - result = integrate(_func, inter.verticesBegin(), inter.verticesEnd(), _integration); +int GetXF1D::operator()(Interface1D& inter) +{ + result = integrate(_func, inter.verticesBegin(), inter.verticesEnd(), _integration); return 0; - } +} - int GetYF1D::operator()(Interface1D& inter) { - result = integrate(_func, inter.verticesBegin(), inter.verticesEnd(), _integration); +int GetYF1D::operator()(Interface1D& inter) +{ + result = integrate(_func, inter.verticesBegin(), inter.verticesEnd(), _integration); return 0; - } +} - int GetZF1D::operator()(Interface1D& inter) { - result = integrate(_func, inter.verticesBegin(), inter.verticesEnd(), _integration); +int GetZF1D::operator()(Interface1D& inter) +{ + result = integrate(_func, inter.verticesBegin(), inter.verticesEnd(), _integration); return 0; - } +} - int GetProjectedXF1D::operator()(Interface1D& inter) { - result = integrate(_func, inter.verticesBegin(), inter.verticesEnd(), _integration); +int GetProjectedXF1D::operator()(Interface1D& inter) +{ + result = integrate(_func, inter.verticesBegin(), inter.verticesEnd(), _integration); return 0; - } +} - int GetProjectedYF1D::operator()(Interface1D& inter) { - result = integrate(_func, inter.verticesBegin(), inter.verticesEnd(), _integration); +int GetProjectedYF1D::operator()(Interface1D& inter) +{ + result = integrate(_func, inter.verticesBegin(), inter.verticesEnd(), _integration); return 0; - } +} - int GetProjectedZF1D::operator()(Interface1D& inter) { - result = integrate(_func, inter.verticesBegin(), inter.verticesEnd(), _integration); +int GetProjectedZF1D::operator()(Interface1D& inter) +{ + result = integrate(_func, inter.verticesBegin(), inter.verticesEnd(), _integration); return 0; - } +} - int Orientation2DF1D::operator()(Interface1D& inter) { - FEdge * fe = dynamic_cast<FEdge*>(&inter); - if(fe){ - Vec3r res = fe->orientation2d(); - result = Vec2f(res[0], res[1]); - } else { - result = integrate(_func, inter.verticesBegin(), inter.verticesEnd(), _integration); +int Orientation2DF1D::operator()(Interface1D& inter) +{ + FEdge *fe = dynamic_cast<FEdge*>(&inter); + if (fe) { + Vec3r res = fe->orientation2d(); + result = Vec2f(res[0], res[1]); + } + else { + result = integrate(_func, inter.verticesBegin(), inter.verticesEnd(), _integration); } return 0; - } +} - int Orientation3DF1D::operator()(Interface1D& inter) { - result = integrate(_func, inter.verticesBegin(), inter.verticesEnd(), _integration); +int Orientation3DF1D::operator()(Interface1D& inter) +{ + result = integrate(_func, inter.verticesBegin(), inter.verticesEnd(), _integration); return 0; - } +} - int ZDiscontinuityF1D::operator()(Interface1D& inter) { - result = integrate(_func, inter.verticesBegin(), inter.verticesEnd(), _integration); +int ZDiscontinuityF1D::operator()(Interface1D& inter) +{ + result = integrate(_func, inter.verticesBegin(), inter.verticesEnd(), _integration); return 0; - } - - int QuantitativeInvisibilityF1D::operator()(Interface1D& inter) { - ViewEdge* ve = dynamic_cast<ViewEdge*>(&inter); +} + +int QuantitativeInvisibilityF1D::operator()(Interface1D& inter) +{ + ViewEdge *ve = dynamic_cast<ViewEdge*>(&inter); if (ve) { - result = ve->qi(); - return 0; + result = ve->qi(); + return 0; } - FEdge *fe = dynamic_cast<FEdge*>(&inter); + FEdge *fe = dynamic_cast<FEdge*>(&inter); if (fe) { - result = ve->qi(); - return 0; - } - result = integrate(_func, inter.verticesBegin(), inter.verticesEnd(), _integration); - return 0; - } - - int CurveNatureF1D::operator()(Interface1D& inter) { - ViewEdge* ve = dynamic_cast<ViewEdge*>(&inter); - if (ve) - result = ve->getNature(); - else{ - // we return a nature that contains every - // natures of the viewedges spanned by the chain. - Nature::EdgeNature nat = Nature::NO_FEATURE; - Interface0DIterator it = inter.verticesBegin(); - while(!it.isEnd()){ - nat |= _func(it); - ++it; - } - result = nat; - } - return 0; - } - - int TimeStampF1D::operator()(Interface1D& inter) { - TimeStamp *timestamp = TimeStamp::instance(); - inter.setTimeStamp(timestamp->getTimeStamp()); - return 0; - } - - int ChainingTimeStampF1D::operator()(Interface1D& inter) { - TimeStamp *timestamp = TimeStamp::instance(); - ViewEdge *ve = dynamic_cast<ViewEdge*>(&inter); - if(ve) - ve->setChainingTimeStamp(timestamp->getTimeStamp()); - return 0; - } - - int IncrementChainingTimeStampF1D::operator()(Interface1D& inter) { - ViewEdge *ve = dynamic_cast<ViewEdge*>(&inter); - if(ve) - ve->setChainingTimeStamp(ve->getChainingTimeStamp()+1); - return 0; - } - - int GetShapeF1D::operator()(Interface1D& inter) { - vector<ViewShape*> shapesVector; - set<ViewShape*> shapesSet; - ViewEdge* ve = dynamic_cast<ViewEdge*>(&inter); - if (ve){ - shapesVector.push_back(ve->viewShape()); - }else{ - Interface0DIterator it=inter.verticesBegin(), itend=inter.verticesEnd(); - for(;it!=itend;++it) - shapesSet.insert(Functions0D::getShapeF0D(it)); - shapesVector.insert<set<ViewShape*>::iterator>(shapesVector.begin(), shapesSet.begin(), shapesSet.end()); - } - result = shapesVector; - return 0; - } - - int GetOccludersF1D::operator()(Interface1D& inter) { - vector<ViewShape*> shapesVector; - set<ViewShape*> shapesSet; - ViewEdge* ve = dynamic_cast<ViewEdge*>(&inter); - if (ve){ - result = ve->occluders(); - }else{ - Interface0DIterator it=inter.verticesBegin(), itend=inter.verticesEnd(); - for(;it!=itend;++it){ - Functions0D::getOccludersF0D(it, shapesSet); - } - shapesVector.insert(shapesVector.begin(), shapesSet.begin(), shapesSet.end()); - result = shapesVector; - } - return 0; - } - - int GetOccludeeF1D::operator()(Interface1D& inter) { - vector<ViewShape*> shapesVector; - set<ViewShape*> shapesSet; - ViewEdge* ve = dynamic_cast<ViewEdge*>(&inter); - if (ve){ - ViewShape * aShape = ve->aShape(); - shapesVector.push_back(aShape); - }else{ - Interface0DIterator it=inter.verticesBegin(), itend=inter.verticesEnd(); - for(;it!=itend;++it){ - shapesSet.insert(Functions0D::getOccludeeF0D(it)); - } - shapesVector.insert<set<ViewShape*>::iterator>(shapesVector.begin(), shapesSet.begin(), shapesSet.end()); - } - result = shapesVector; - return 0; - } - // Internal - //////////// - - void getOccludeeF1D(Interface1D& inter, set<ViewShape*>& oShapes){ - ViewEdge* ve = dynamic_cast<ViewEdge*>(&inter); - if (ve){ - ViewShape * aShape = ve->aShape(); - if(aShape == 0){ - oShapes.insert(0); - return; - } - oShapes.insert(aShape); - } - else{ - Interface0DIterator it=inter.verticesBegin(), itend=inter.verticesEnd(); - for(;it!=itend;++it) - oShapes.insert(Functions0D::getOccludeeF0D(it)); - } - } - - void getOccludersF1D(Interface1D& inter, set<ViewShape*>& oShapes){ - ViewEdge* ve = dynamic_cast<ViewEdge*>(&inter); - if (ve){ - vector<ViewShape*>& occluders = ve->occluders(); - oShapes.insert<vector<ViewShape*>::iterator>(occluders.begin(), occluders.end()); - } - else{ - Interface0DIterator it=inter.verticesBegin(), itend=inter.verticesEnd(); - for(;it!=itend;++it){ - set<ViewShape*> shapes; - Functions0D::getOccludersF0D(it, shapes); - for(set<ViewShape*>::iterator s=shapes.begin(), send=shapes.end(); - s!=send; - ++s) - oShapes.insert(*s); - } - } - } - - void getShapeF1D(Interface1D& inter, set<ViewShape*>& oShapes){ - ViewEdge* ve = dynamic_cast<ViewEdge*>(&inter); - if (ve){ - oShapes.insert(ve->viewShape()); - }else{ - Interface0DIterator it=inter.verticesBegin(), itend=inter.verticesEnd(); - for(;it!=itend;++it) - oShapes.insert(Functions0D::getShapeF0D(it)); - } - } + result = ve->qi(); + return 0; + } + result = integrate(_func, inter.verticesBegin(), inter.verticesEnd(), _integration); + return 0; +} + +int CurveNatureF1D::operator()(Interface1D& inter) +{ + ViewEdge *ve = dynamic_cast<ViewEdge*>(&inter); + if (ve) { + result = ve->getNature(); + } + else { + // we return a nature that contains every natures of the viewedges spanned by the chain. + Nature::EdgeNature nat = Nature::NO_FEATURE; + Interface0DIterator it = inter.verticesBegin(); + while (!it.isEnd()) { + nat |= _func(it); + ++it; + } + result = nat; + } + return 0; +} + +int TimeStampF1D::operator()(Interface1D& inter) +{ + TimeStamp *timestamp = TimeStamp::instance(); + inter.setTimeStamp(timestamp->getTimeStamp()); + return 0; +} + +int ChainingTimeStampF1D::operator()(Interface1D& inter) +{ + TimeStamp *timestamp = TimeStamp::instance(); + ViewEdge *ve = dynamic_cast<ViewEdge*>(&inter); + if (ve) + ve->setChainingTimeStamp(timestamp->getTimeStamp()); + return 0; +} + +int IncrementChainingTimeStampF1D::operator()(Interface1D& inter) +{ + ViewEdge *ve = dynamic_cast<ViewEdge*>(&inter); + if (ve) + ve->setChainingTimeStamp(ve->getChainingTimeStamp()+1); + return 0; +} + +int GetShapeF1D::operator()(Interface1D& inter) +{ + vector<ViewShape*> shapesVector; + set<ViewShape*> shapesSet; + ViewEdge *ve = dynamic_cast<ViewEdge*>(&inter); + if (ve) { + shapesVector.push_back(ve->viewShape()); + } + else { + Interface0DIterator it = inter.verticesBegin(), itend = inter.verticesEnd(); + for (; it != itend; ++it) + shapesSet.insert(Functions0D::getShapeF0D(it)); + shapesVector.insert<set<ViewShape*>::iterator>(shapesVector.begin(), shapesSet.begin(), shapesSet.end()); + } + result = shapesVector; + return 0; +} + +int GetOccludersF1D::operator()(Interface1D& inter) +{ + vector<ViewShape*> shapesVector; + set<ViewShape*> shapesSet; + ViewEdge *ve = dynamic_cast<ViewEdge*>(&inter); + if (ve) { + result = ve->occluders(); + } + else { + Interface0DIterator it = inter.verticesBegin(), itend = inter.verticesEnd(); + for (; it != itend; ++it) { + Functions0D::getOccludersF0D(it, shapesSet); + } + shapesVector.insert(shapesVector.begin(), shapesSet.begin(), shapesSet.end()); + result = shapesVector; + } + return 0; +} + +int GetOccludeeF1D::operator()(Interface1D& inter) +{ + vector<ViewShape*> shapesVector; + set<ViewShape*> shapesSet; + ViewEdge *ve = dynamic_cast<ViewEdge*>(&inter); + if (ve) { + ViewShape *aShape = ve->aShape(); + shapesVector.push_back(aShape); + } + else { + Interface0DIterator it = inter.verticesBegin(), itend = inter.verticesEnd(); + for (; it != itend; ++it) { + shapesSet.insert(Functions0D::getOccludeeF0D(it)); + } + shapesVector.insert<set<ViewShape*>::iterator>(shapesVector.begin(), shapesSet.begin(), shapesSet.end()); + } + result = shapesVector; + return 0; +} + +// Internal +//////////// + +void getOccludeeF1D(Interface1D& inter, set<ViewShape*>& oShapes) +{ + ViewEdge *ve = dynamic_cast<ViewEdge*>(&inter); + if (ve) { + ViewShape *aShape = ve->aShape(); + if (aShape == 0) { + oShapes.insert(0); + return; + } + oShapes.insert(aShape); + } + else { + Interface0DIterator it = inter.verticesBegin(), itend = inter.verticesEnd(); + for (; it != itend; ++it) + oShapes.insert(Functions0D::getOccludeeF0D(it)); + } +} + +void getOccludersF1D(Interface1D& inter, set<ViewShape*>& oShapes) +{ + ViewEdge *ve = dynamic_cast<ViewEdge*>(&inter); + if (ve) { + vector<ViewShape*>& occluders = ve->occluders(); + oShapes.insert<vector<ViewShape*>::iterator>(occluders.begin(), occluders.end()); + } + else { + Interface0DIterator it = inter.verticesBegin(), itend = inter.verticesEnd(); + for (; it != itend; ++it) { + set<ViewShape*> shapes; + Functions0D::getOccludersF0D(it, shapes); + for (set<ViewShape*>::iterator s = shapes.begin(), send = shapes.end(); s != send; ++s) + oShapes.insert(*s); + } + } +} + +void getShapeF1D(Interface1D& inter, set<ViewShape*>& oShapes) +{ + ViewEdge *ve = dynamic_cast<ViewEdge*>(&inter); + if (ve) { + oShapes.insert(ve->viewShape()); + } + else { + Interface0DIterator it = inter.verticesBegin(), itend = inter.verticesEnd(); + for (; it != itend; ++it) + oShapes.insert(Functions0D::getShapeF0D(it)); + } +} + } // end of namespace Functions1D |