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! :) --- .../view_map/AverageAreaGridDensityProvider.cpp | 108 +++++++++++---------- 1 file changed, 58 insertions(+), 50 deletions(-) (limited to 'source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.cpp') diff --git a/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.cpp b/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.cpp index 8b4c60a7fea..4832d08f2bc 100644 --- a/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.cpp +++ b/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.cpp @@ -1,69 +1,75 @@ -// -// Filename : AverageAreaGridDensityProvider.cpp -// Author(s) : Alexander Beels -// Purpose : Class to define a cell grid surrounding -// the projected image of a scene -// Date of creation : 2011-2-9 -// -/////////////////////////////////////////////////////////////////////////////// - - -// -// 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. -// -/////////////////////////////////////////////////////////////////////////////// +/* + * ***** 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 ***** + */ + +/** \file blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.cpp + * \ingroup freestyle + * \brief Class to define a cell grid surrounding the projected image of a scene + * \author Alexander Beels + * \date 2011-2-9 + */ #include "AverageAreaGridDensityProvider.h" -AverageAreaGridDensityProvider::AverageAreaGridDensityProvider(OccluderSource& source, const real proscenium[4], real sizeFactor) - : GridDensityProvider(source) +AverageAreaGridDensityProvider::AverageAreaGridDensityProvider(OccluderSource& source, const real proscenium[4], + real sizeFactor) +: GridDensityProvider(source) { initialize (proscenium, sizeFactor); } -AverageAreaGridDensityProvider::AverageAreaGridDensityProvider(OccluderSource& source, const BBox& bbox, const GridHelpers::Transform& transform, real sizeFactor) - : GridDensityProvider(source) +AverageAreaGridDensityProvider::AverageAreaGridDensityProvider(OccluderSource& source, const BBox& bbox, + const GridHelpers::Transform& transform, real sizeFactor) +: GridDensityProvider(source) { real proscenium[4]; calculateQuickProscenium(transform, bbox, proscenium); - - initialize (proscenium, sizeFactor); + + initialize(proscenium, sizeFactor); } -AverageAreaGridDensityProvider::AverageAreaGridDensityProvider(OccluderSource& source, real sizeFactor) - : GridDensityProvider(source) +AverageAreaGridDensityProvider::AverageAreaGridDensityProvider(OccluderSource& source, real sizeFactor) +: GridDensityProvider(source) { real proscenium[4]; calculateOptimalProscenium(source, proscenium); - initialize (proscenium, sizeFactor); + initialize(proscenium, sizeFactor); } -AverageAreaGridDensityProvider::~AverageAreaGridDensityProvider () {} +AverageAreaGridDensityProvider::~AverageAreaGridDensityProvider() {} -void AverageAreaGridDensityProvider::initialize (const real proscenium[4], real sizeFactor) +void AverageAreaGridDensityProvider::initialize(const real proscenium[4], real sizeFactor) { float prosceniumWidth = (proscenium[1] - proscenium[0]); float prosceniumHeight = (proscenium[3] - proscenium[2]); real cellArea = 0.0; unsigned numFaces = 0; - for ( source.begin(); source.isValid(); source.next() ) { + for (source.begin(); source.isValid(); source.next()) { Polygon3r& poly(source.getGridSpacePolygon()); Vec3r min, max; poly.getBBox(min, max); @@ -82,11 +88,11 @@ void AverageAreaGridDensityProvider::initialize (const real proscenium[4], real cout << _cellsX << "x" << _cellsY << " cells of size " << _cellSize << " square." << endl; // Make sure the grid exceeds the proscenium by a small amount - float safetyZone = 0.1; - if ( _cellsX * _cellSize < prosceniumWidth * (1.0 + safetyZone) ) { + float safetyZone = 0.1f; + if (_cellsX * _cellSize < prosceniumWidth * (1.0 + safetyZone)) { _cellsX = prosceniumWidth * (1.0 + safetyZone) / _cellSize; } - if ( _cellsY * _cellSize < prosceniumHeight * (1.0 + safetyZone) ) { + if (_cellsY * _cellSize < prosceniumHeight * (1.0 + safetyZone)) { _cellsY = prosceniumHeight * (1.0 + safetyZone) / _cellSize; } cout << _cellsX << "x" << _cellsY << " cells of size " << _cellSize << " square." << endl; @@ -97,24 +103,26 @@ void AverageAreaGridDensityProvider::initialize (const real proscenium[4], real } AverageAreaGridDensityProviderFactory::AverageAreaGridDensityProviderFactory(real sizeFactor) - : sizeFactor(sizeFactor) +: sizeFactor(sizeFactor) { } -AverageAreaGridDensityProviderFactory::~AverageAreaGridDensityProviderFactory () {} +AverageAreaGridDensityProviderFactory::~AverageAreaGridDensityProviderFactory() {} -auto_ptr AverageAreaGridDensityProviderFactory::newGridDensityProvider(OccluderSource& source, const real proscenium[4]) +auto_ptr +AverageAreaGridDensityProviderFactory::newGridDensityProvider(OccluderSource& source, const real proscenium[4]) { return auto_ptr(new AverageAreaGridDensityProvider(source, proscenium, sizeFactor)); } -auto_ptr AverageAreaGridDensityProviderFactory::newGridDensityProvider(OccluderSource& source, const BBox& bbox, const GridHelpers::Transform& transform) +auto_ptr +AverageAreaGridDensityProviderFactory::newGridDensityProvider(OccluderSource& source, const BBox& bbox, + const GridHelpers::Transform& transform) { return auto_ptr(new AverageAreaGridDensityProvider(source, bbox, transform, sizeFactor)); } -auto_ptr AverageAreaGridDensityProviderFactory::newGridDensityProvider(OccluderSource& source) +auto_ptr AverageAreaGridDensityProviderFactory::newGridDensityProvider(OccluderSource& source) { return auto_ptr(new AverageAreaGridDensityProvider(source, sizeFactor)); } - -- cgit v1.2.3