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/winged_edge/WFillGrid.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/winged_edge/WFillGrid.h')
-rw-r--r-- | source/blender/freestyle/intern/winged_edge/WFillGrid.h | 132 |
1 files changed, 70 insertions, 62 deletions
diff --git a/source/blender/freestyle/intern/winged_edge/WFillGrid.h b/source/blender/freestyle/intern/winged_edge/WFillGrid.h index 2ebbc2f359a..223c5a786d8 100644 --- a/source/blender/freestyle/intern/winged_edge/WFillGrid.h +++ b/source/blender/freestyle/intern/winged_edge/WFillGrid.h @@ -1,80 +1,88 @@ -// -// Filename : WFillGrid.h -// Author(s) : Stephane Grabli -// Emmanuel Turquin -// Purpose : Class to fill in a grid from a SceneGraph -// (uses only the WingedEdge structures) -// Date of creation : 03/05/2003 -// -/////////////////////////////////////////////////////////////////////////////// +/* + * ***** 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_W_FILL_GRID_H__ +#define __FREESTYLE_W_FILL_GRID_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. -// -/////////////////////////////////////////////////////////////////////////////// +/** \file blender/freestyle/intern/winged_edge/WFillGrid.h + * \ingroup freestyle + * \brief Class to fill in a grid from a SceneGraph (uses only the WingedEdge structures) + * \author Emmanuel Turquin + * \author Stephane Grabli + * \date 03/05/2003 + */ -#ifndef W_FILL_GRID_H -# define W_FILL_GRID_H +#include "WEdge.h" -# include "../geometry/Grid.h" -# include "../geometry/Polygon.h" -# include "WEdge.h" +#include "../geometry/Grid.h" +#include "../geometry/Polygon.h" class LIB_WINGED_EDGE_EXPORT WFillGrid { public: + inline WFillGrid(Grid *grid = NULL, WingedEdge *winged_edge = NULL) + { + _winged_edge = winged_edge; + _grid = grid; + _polygon_id = 0; + } - inline WFillGrid(Grid* grid = 0, WingedEdge* winged_edge = 0) { - _winged_edge = winged_edge; - _grid = grid; - _polygon_id = 0; - } + virtual ~WFillGrid() {} - virtual ~WFillGrid() {} + void fillGrid(); - void fillGrid(); + /*! Accessors */ + WingedEdge *getWingedEdge() + { + return _winged_edge; + } - /*! Accessors */ - WingedEdge* getWingedEdge() { - return _winged_edge; - } + Grid *getGrid() + { + return _grid; + } - Grid* getGrid() { - return _grid; - } + /*! Modifiers */ + void setWingedEdge(WingedEdge *winged_edge) + { + if (winged_edge) + _winged_edge = winged_edge; + } - /*! Modifiers */ - void setWingedEdge(WingedEdge* winged_edge) { - if (winged_edge) - _winged_edge = winged_edge; - } - - void setGrid(Grid* grid) { - if (grid) - _grid = grid; - } + void setGrid(Grid *grid) + { + if (grid) + _grid = grid; + } private: - - Grid* _grid; - WingedEdge* _winged_edge; - unsigned _polygon_id; + Grid *_grid; + WingedEdge *_winged_edge; + unsigned _polygon_id; }; -#endif // WS_FILL_GRID_H +#endif // __FREESTYLE_W_FILL_GRID_H__
\ No newline at end of file |