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.h | 91 ++++++++++++---------- 1 file changed, 48 insertions(+), 43 deletions(-) (limited to 'source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.h') diff --git a/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.h b/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.h index 73d28f006a7..05d2ae1ed9d 100644 --- a/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.h +++ b/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.h @@ -1,67 +1,72 @@ -// -// Filename : AverageAreaGridDensityProvider.h -// Author(s) : Alexander Beels -// Purpose : Class to define a cell grid surrounding -// the projected image of a scene -// Date of creation : 2011-2-9 -// -/////////////////////////////////////////////////////////////////////////////// +/* + * ***** 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 ***** + */ +#ifndef __FREESTYLE_AVERAGE_AREA_GRID_DENSITY_PROVIDER_H__ +#define __FREESTYLE_AVERAGE_AREA_GRID_DENSITY_PROVIDER_H__ -// -// 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. -// -/////////////////////////////////////////////////////////////////////////////// - -#ifndef AVERAGEAREAGRIDDENSITYPROVIDER_H -#define AVERAGEAREAGRIDDENSITYPROVIDER_H +/** \file blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.h + * \ingroup freestyle + * \brief Class to define a cell grid surrounding the projected image of a scene + * \author Alexander Beels + * \date 2011-2-9 + */ #include "GridDensityProvider.h" -class AverageAreaGridDensityProvider : public GridDensityProvider { +class AverageAreaGridDensityProvider : public GridDensityProvider +{ // Disallow copying and assignment - AverageAreaGridDensityProvider (const AverageAreaGridDensityProvider& other); - AverageAreaGridDensityProvider& operator= (const AverageAreaGridDensityProvider& other); + AverageAreaGridDensityProvider(const AverageAreaGridDensityProvider& other); + AverageAreaGridDensityProvider& operator=(const AverageAreaGridDensityProvider& other); public: AverageAreaGridDensityProvider(OccluderSource& source, const real proscenium[4], real sizeFactor); - AverageAreaGridDensityProvider(OccluderSource& source, const BBox& bbox, const GridHelpers::Transform& transform, real sizeFactor); + AverageAreaGridDensityProvider(OccluderSource& source, const BBox& bbox, + const GridHelpers::Transform& transform, real sizeFactor); AverageAreaGridDensityProvider(OccluderSource& source, real sizeFactor); - virtual ~AverageAreaGridDensityProvider (); - -protected: + virtual ~AverageAreaGridDensityProvider(); private: - void initialize (const real proscenium[4], real sizeFactor); + void initialize (const real proscenium[4], real sizeFactor); }; -class AverageAreaGridDensityProviderFactory : public GridDensityProviderFactory { +class AverageAreaGridDensityProviderFactory : public GridDensityProviderFactory +{ public: AverageAreaGridDensityProviderFactory(real sizeFactor); - ~AverageAreaGridDensityProviderFactory (); + ~AverageAreaGridDensityProviderFactory(); auto_ptr newGridDensityProvider(OccluderSource& source, const real proscenium[4]); - auto_ptr newGridDensityProvider(OccluderSource& source, const BBox& bbox, const GridHelpers::Transform& transform); + auto_ptr newGridDensityProvider(OccluderSource& source, const BBox& bbox, + const GridHelpers::Transform& transform); auto_ptr newGridDensityProvider(OccluderSource& source); protected: real sizeFactor; }; -#endif // AVERAGEAREAGRIDDENSITYPROVIDER_H - +#endif // __FREESTYLE_AVERAGE_AREA_GRID_DENSITY_PROVIDER_H__ -- cgit v1.2.3