From 699da2fb0d9012cef5e45cc1b547a01fd92dbc1c Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Wed, 2 Jan 2013 01:55:30 +0000 Subject: 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! :) --- .../HeuristicGridDensityProviderFactory.cpp | 92 ++++++++++++---------- 1 file changed, 51 insertions(+), 41 deletions(-) (limited to 'source/blender/freestyle/intern/view_map/HeuristicGridDensityProviderFactory.cpp') diff --git a/source/blender/freestyle/intern/view_map/HeuristicGridDensityProviderFactory.cpp b/source/blender/freestyle/intern/view_map/HeuristicGridDensityProviderFactory.cpp index 05b70af90b3..5e17c85808b 100644 --- a/source/blender/freestyle/intern/view_map/HeuristicGridDensityProviderFactory.cpp +++ b/source/blender/freestyle/intern/view_map/HeuristicGridDensityProviderFactory.cpp @@ -1,74 +1,84 @@ -// -// Filename : HeuristicGridDensityProviderFactory.cpp -// Author(s) : Alexander Beels -// Purpose : Class to define a cell grid surrounding -// the projected image of a scene -// Date of creation : 2011-2-8 -// -/////////////////////////////////////////////////////////////////////////////// +/* + * ***** 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/HeuristicGridDensityProviderFactory.cpp + * \ingroup freestyle + * \brief Class to define a cell grid surrounding the projected image of a scene + * \author Alexander Beels + * \date 2011-2-8 + */ #include "HeuristicGridDensityProviderFactory.h" HeuristicGridDensityProviderFactory::HeuristicGridDensityProviderFactory(real sizeFactor, unsigned numFaces) - : sizeFactor(sizeFactor), numFaces(numFaces) +: sizeFactor(sizeFactor), numFaces(numFaces) { } -HeuristicGridDensityProviderFactory::~HeuristicGridDensityProviderFactory () {} +HeuristicGridDensityProviderFactory::~HeuristicGridDensityProviderFactory() {} -auto_ptr HeuristicGridDensityProviderFactory::newGridDensityProvider(OccluderSource& source, const real proscenium[4]) +auto_ptr +HeuristicGridDensityProviderFactory::newGridDensityProvider(OccluderSource& source, const real proscenium[4]) { auto_ptr avg(new AverageAreaGridDensityProvider(source, proscenium, sizeFactor)); auto_ptr p23(new Pow23GridDensityProvider(source, proscenium, numFaces)); - if ( avg->cellSize() > p23->cellSize() ) { + if (avg->cellSize() > p23->cellSize()) { return (auto_ptr) p23; - } else { + } + else { return (auto_ptr) avg; } } -auto_ptr HeuristicGridDensityProviderFactory::newGridDensityProvider(OccluderSource& source, const BBox& bbox, const GridHelpers::Transform& transform) +auto_ptr +HeuristicGridDensityProviderFactory::newGridDensityProvider(OccluderSource& source, const BBox& bbox, + const GridHelpers::Transform& transform) { - auto_ptr avg(new AverageAreaGridDensityProvider(source, bbox, transform, sizeFactor)); + auto_ptr avg(new AverageAreaGridDensityProvider(source, bbox, + transform, sizeFactor)); auto_ptr p23(new Pow23GridDensityProvider(source, bbox, transform, numFaces)); - if ( avg->cellSize() > p23->cellSize() ) { + if (avg->cellSize() > p23->cellSize()) { return (auto_ptr) p23; - } else { + } + else { return (auto_ptr) avg; } } -auto_ptr HeuristicGridDensityProviderFactory::newGridDensityProvider(OccluderSource& source) +auto_ptr HeuristicGridDensityProviderFactory::newGridDensityProvider(OccluderSource& source) { real proscenium[4]; GridDensityProvider::calculateOptimalProscenium(source, proscenium); auto_ptr avg(new AverageAreaGridDensityProvider(source, proscenium, sizeFactor)); auto_ptr p23(new Pow23GridDensityProvider(source, proscenium, numFaces)); - if ( avg->cellSize() > p23->cellSize() ) { + if (avg->cellSize() > p23->cellSize()) { return (auto_ptr) p23; - } else { + } + else { return (auto_ptr) avg; } } - -- cgit v1.2.3