diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-22 22:25:01 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-22 22:25:01 +0400 |
commit | fa0211df269a3398dd70467982f9e129c79e501b (patch) | |
tree | 404ee267890602b49470cb640986b50d2c2055c1 /source/blender/freestyle/intern/geometry/Bezier.h | |
parent | 8b57a67f3eb57366c2b3abcb8f3b04403d339e1a (diff) |
Another "insanely" big code clean-up patch by Bastien Montagne, many thanks!
Diffstat (limited to 'source/blender/freestyle/intern/geometry/Bezier.h')
-rw-r--r-- | source/blender/freestyle/intern/geometry/Bezier.h | 125 |
1 files changed, 74 insertions, 51 deletions
diff --git a/source/blender/freestyle/intern/geometry/Bezier.h b/source/blender/freestyle/intern/geometry/Bezier.h index acae71bbb2c..51f32e9e0b3 100644 --- a/source/blender/freestyle/intern/geometry/Bezier.h +++ b/source/blender/freestyle/intern/geometry/Bezier.h @@ -1,73 +1,96 @@ -// -// Filename : Bezier.h -// Author(s) : Stephane Grabli -// Purpose : Class to define a Bezier curve of order 4. -// Date of creation : 04/06/2003 -// -/////////////////////////////////////////////////////////////////////////////// - - -// -// 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 BEZIER_H -# define BEZIER_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 __BEZIER_H__ +#define __BEZIER_H__ + +/** \file blender/freestyle/intern/geometry/Bezier.h + * \ingroup freestyle + * \brief Class to define a Bezier curve of order 4. + * \author Stephane Grabli + * \date 04/06/2003 + */ #include <vector> -#include "../system/FreestyleConfig.h" + #include "Geom.h" +#include "../system/FreestyleConfig.h" + using namespace Geometry; -class LIB_GEOMETRY_EXPORT BezierCurveSegment +class LIB_GEOMETRY_EXPORT BezierCurveSegment { private: - std::vector<Vec2d> _ControlPolygon; - std::vector<Vec2d> _Vertices; + std::vector<Vec2d> _ControlPolygon; + std::vector<Vec2d> _Vertices; public: - BezierCurveSegment(); - virtual ~BezierCurveSegment(); + BezierCurveSegment(); + virtual ~BezierCurveSegment(); + + void AddControlPoint(const Vec2d& iPoint); + void Build(); + + inline int size() const + { + return _ControlPolygon.size(); + } - void AddControlPoint(const Vec2d& iPoint); - void Build(); - inline int size() const {return _ControlPolygon.size();} - inline std::vector<Vec2d>& vertices() {return _Vertices;} + inline std::vector<Vec2d>& vertices() + { + return _Vertices; + } }; class LIB_GEOMETRY_EXPORT BezierCurve { private: - std::vector<Vec2d> _ControlPolygon; - std::vector<BezierCurveSegment*> _Segments; - BezierCurveSegment *_currentSegment; + std::vector<Vec2d> _ControlPolygon; + std::vector<BezierCurveSegment*> _Segments; + BezierCurveSegment *_currentSegment; public: - BezierCurve(); - BezierCurve(std::vector<Vec2d>& iPoints, double error=4.0); - virtual ~BezierCurve(); + BezierCurve(); + BezierCurve(std::vector<Vec2d>& iPoints, double error=4.0); + virtual ~BezierCurve(); + + void AddControlPoint(const Vec2d& iPoint); + + std::vector<Vec2d>& controlPolygon() + { + return _ControlPolygon; + } - void AddControlPoint(const Vec2d& iPoint); - std::vector<Vec2d>& controlPolygon() {return _ControlPolygon;} - std::vector<BezierCurveSegment*>& segments() {return _Segments;} + std::vector<BezierCurveSegment*>& segments() + { + return _Segments; + } }; -#endif // BEZIER_H +#endif // __BEZIER_H__ |