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/winged_edge/WSFillGrid.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/winged_edge/WSFillGrid.cpp')
-rw-r--r-- | source/blender/freestyle/intern/winged_edge/WSFillGrid.cpp | 117 |
1 files changed, 62 insertions, 55 deletions
diff --git a/source/blender/freestyle/intern/winged_edge/WSFillGrid.cpp b/source/blender/freestyle/intern/winged_edge/WSFillGrid.cpp index 55fa418d4f5..3504a8ab179 100644 --- a/source/blender/freestyle/intern/winged_edge/WSFillGrid.cpp +++ b/source/blender/freestyle/intern/winged_edge/WSFillGrid.cpp @@ -1,60 +1,67 @@ +/* + * ***** 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/winged_edge/WSFillGrid.cpp + * \ingroup freestyle + * \brief Class to fill in a grid from a SceneGraph (uses only the WingedEdge structures) + * \author Stephane Grabli + * \date 03/05/2003 + */ #include "WEdge.h" #include "WSFillGrid.h" -void WSFillGrid::fillGrid() { - if (!_winged_edge || !_grid) - return; - - vector<WShape*> wshapes = _winged_edge->getWShapes(); - vector<WVertex*> fvertices; - vector<Vec3r> vectors; - vector<WFace*> faces; - - for (vector<WShape*>::const_iterator it = wshapes.begin(); - it != wshapes.end(); - it++) { - faces = (*it)->GetFaceList(); - - for (vector<WFace*>::const_iterator f = faces.begin(); - f != faces.end(); - f++) { - (*f)->RetrieveVertexList(fvertices); - - for (vector<WVertex*>::const_iterator wv = fvertices.begin(); - wv != fvertices.end(); - wv++) - vectors.push_back(Vec3r((*wv)->GetVertex())); - - // occluder will be deleted by the grid - Polygon3r *occluder = - new Polygon3r(vectors, (*f)->GetNormal()); - occluder->setId(_polygon_id++); - occluder->userdata = (void*)(*f); - _grid->insertOccluder(occluder); - vectors.clear(); - fvertices.clear(); - } - faces.clear(); - } -} +void WSFillGrid::fillGrid() +{ + if (!_winged_edge || !_grid) + return; + + vector<WShape *> wshapes = _winged_edge->getWShapes(); + vector<WVertex *> fvertices; + vector<Vec3r> vectors; + vector<WFace *> faces; + + for (vector<WShape *>::const_iterator it = wshapes.begin(); it != wshapes.end(); ++it) { + faces = (*it)->GetFaceList(); + + for (vector<WFace *>::const_iterator f = faces.begin(); f != faces.end(); ++f) { + (*f)->RetrieveVertexList(fvertices); + + for (vector<WVertex*>::const_iterator wv = fvertices.begin(); wv != fvertices.end(); ++wv) + vectors.push_back(Vec3r((*wv)->GetVertex())); + + // occluder will be deleted by the grid + Polygon3r *occluder = new Polygon3r(vectors, (*f)->GetNormal()); + occluder->setId(_polygon_id++); + occluder->userdata = (void *)(*f); + _grid->insertOccluder(occluder); + vectors.clear(); + fvertices.clear(); + } + faces.clear(); + } +}
\ No newline at end of file |