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/ArbitraryGridDensityProvider.h | |
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/ArbitraryGridDensityProvider.h')
-rw-r--r-- | source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.h | 88 |
1 files changed, 48 insertions, 40 deletions
diff --git a/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.h b/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.h index f863b2132a7..f8d43f19936 100644 --- a/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.h +++ b/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.h @@ -1,48 +1,54 @@ -// -// Filename : ArbitraryGridDensityProvider.h -// Author(s) : Alexander Beels -// Purpose : Class to define a cell grid surrounding -// the projected image of a scene -// Date of creation : 2011-2-5 -// -/////////////////////////////////////////////////////////////////////////////// +/* + * ***** 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_ARBITRARY_GRID_DENSITY_PROVIDER_H__ +#define __FREESTYLE_ARBITRARY_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 ARBITRARYGRIDDENSITYPROVIDER_H -#define ARBITRARYGRIDDENSITYPROVIDER_H +/** \file blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.h + * \ingroup freestyle + * \brief Class to define a cell grid surrounding the projected image of a scene + * \author Alexander Beels + * \date 2011-2-5 + */ #include "GridDensityProvider.h" -class ArbitraryGridDensityProvider : public GridDensityProvider { +class ArbitraryGridDensityProvider : public GridDensityProvider +{ // Disallow copying and assignment - ArbitraryGridDensityProvider (const ArbitraryGridDensityProvider& other); - ArbitraryGridDensityProvider& operator= (const ArbitraryGridDensityProvider& other); + ArbitraryGridDensityProvider(const ArbitraryGridDensityProvider& other); + ArbitraryGridDensityProvider& operator=(const ArbitraryGridDensityProvider& other); public: ArbitraryGridDensityProvider(OccluderSource& source, const real proscenium[4], unsigned numCells); - ArbitraryGridDensityProvider(OccluderSource& source, const BBox<Vec3r>& bbox, const GridHelpers::Transform& transform, unsigned numCells); + ArbitraryGridDensityProvider(OccluderSource& source, const BBox<Vec3r>& bbox, + const GridHelpers::Transform& transform, unsigned numCells); ArbitraryGridDensityProvider(OccluderSource& source, unsigned numCells); - virtual ~ArbitraryGridDensityProvider (); + virtual ~ArbitraryGridDensityProvider(); protected: unsigned numCells; @@ -51,17 +57,19 @@ private: void initialize (const real proscenium[4]); }; -class ArbitraryGridDensityProviderFactory : public GridDensityProviderFactory { +class ArbitraryGridDensityProviderFactory : public GridDensityProviderFactory +{ public: ArbitraryGridDensityProviderFactory(unsigned numCells); - ~ArbitraryGridDensityProviderFactory (); + ~ArbitraryGridDensityProviderFactory(); auto_ptr<GridDensityProvider> newGridDensityProvider(OccluderSource& source, const real proscenium[4]); - auto_ptr<GridDensityProvider> newGridDensityProvider(OccluderSource& source, const BBox<Vec3r>& bbox, const GridHelpers::Transform& transform); + auto_ptr<GridDensityProvider> newGridDensityProvider(OccluderSource& source, const BBox<Vec3r>& bbox, + const GridHelpers::Transform& transform); auto_ptr<GridDensityProvider> newGridDensityProvider(OccluderSource& source); + protected: unsigned numCells; }; -#endif // ARBITRARYGRIDDENSITYPROVIDER_H - +#endif // __FREESTYLE_ARBITRARY_GRID_DENSITY_PROVIDER_H__ |