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! :) --- .../intern/view_map/CulledOccluderSource.h | 82 ++++++++++++---------- 1 file changed, 44 insertions(+), 38 deletions(-) (limited to 'source/blender/freestyle/intern/view_map/CulledOccluderSource.h') diff --git a/source/blender/freestyle/intern/view_map/CulledOccluderSource.h b/source/blender/freestyle/intern/view_map/CulledOccluderSource.h index 3c00d5e34ad..a9c5484ca9c 100644 --- a/source/blender/freestyle/intern/view_map/CulledOccluderSource.h +++ b/source/blender/freestyle/intern/view_map/CulledOccluderSource.h @@ -1,46 +1,52 @@ -// -// Filename : CulledOccluderSource.h -// Author(s) : Alexander Beels -// Purpose : Class to define a cell grid surrounding -// the projected image of a scene -// Date of creation : 2010-12-21 -// -/////////////////////////////////////////////////////////////////////////////// - - -// -// 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 CULLEDOCCLUDERSOURCE_H -#define CULLEDOCCLUDERSOURCE_H +/* + * ***** 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_CULLED_OCCLUDER_SOURCE_H__ +#define __FREESTYLE_CULLED_OCCLUDER_SOURCE_H__ + +/** \file blender/freestyle/intern/view_map/CulledOccluderSource.h + * \ingroup freestyle + * \brief Class to define a cell grid surrounding the projected image of a scene + * \author Alexander Beels + * \date 2010-12-21 + */ #include "OccluderSource.h" #include "ViewMap.h" -class CulledOccluderSource : public OccluderSource { +class CulledOccluderSource : public OccluderSource +{ // Disallow copying and assignment - CulledOccluderSource (const CulledOccluderSource& other); - CulledOccluderSource& operator= (const CulledOccluderSource& other); + CulledOccluderSource(const CulledOccluderSource& other); + CulledOccluderSource& operator=(const CulledOccluderSource& other); public: - CulledOccluderSource (const GridHelpers::Transform& transform, WingedEdge& we, ViewMap& viewMap, bool extensiveFEdgeSearch = true); + CulledOccluderSource(const GridHelpers::Transform& transform, WingedEdge& we, ViewMap& viewMap, + bool extensiveFEdgeSearch = true); virtual ~CulledOccluderSource(); void cullViewEdges(ViewMap& viewMap, bool extensiveFEdgeSearch); @@ -51,7 +57,7 @@ public: private: bool testCurrent(); - void expandGridSpaceOccluderProscenium(FEdge* fe); + void expandGridSpaceOccluderProscenium(FEdge *fe); real occluderProscenium[4]; real gridSpaceOccluderProscenium[4]; @@ -60,4 +66,4 @@ private: bool gridSpaceOccluderProsceniumInitialized; }; -#endif // CULLEDOCCLUDERSOURCE_H +#endif // __FREESTYLE_CULLED_OCCLUDER_SOURCE_H__ -- cgit v1.2.3