Revision: 53278
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53278
Author: kjym3
Date: 2012-12-22 18:25:01 +0000 (Sat, 22 Dec 2012)
Log Message:
-----------
Another "insanely" big code clean-up patch by Bastien Montagne, many thanks!
Modified Paths:
--------------
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/BBox.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/Bezier.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/Bezier.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/FastGrid.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/FastGrid.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/FitCurve.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/FitCurve.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/Geom.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/GeomCleaner.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/GeomCleaner.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/GeomUtils.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/GeomUtils.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/Grid.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/Grid.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/GridHelpers.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/GridHelpers.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/HashGrid.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/HashGrid.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/Noise.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/Noise.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/Polygon.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/SweepLine.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/VecMat.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/matrix_util.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/matrix_util.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/normal_cycle.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/normal_cycle.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/image/GaussianFilter.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/image/GaussianFilter.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/image/Image.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/image/ImagePyramid.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/image/ImagePyramid.h
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/BBox.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/BBox.h
2012-12-22 17:32:56 UTC (rev 53277)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/BBox.h
2012-12-22 18:25:01 UTC (rev 53278)
@@ -1,141 +1,154 @@
-//
-// Filename : BBox.h
-// Author(s) : Stephane Grabli
-// Purpose : A class to hold a bounding box
-// Date of creation : 22/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 __BBOX_H__
+#define __BBOX_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/geometry/BBox.h
+ * \ingroup freestyle
+ * \brief A class to hold a bounding box
+ * \author Stephane Grabli
+ * \date 22/05/2003
+ */
-#ifndef BBOX_H
-# define BBOX_H
-
template <class Point>
class BBox
{
- public:
+public:
+ inline BBox()
+ {
+ _empty = true;
+ }
- inline BBox() {
- _empty = true;
- }
+ template <class T>
+ inline BBox(const T& min_in, const T& max_in) : _min(min_in),
_max(max_in)
+ {
+ _empty = false;
+ }
- template <class T>
- inline BBox(const T& min_in, const T& max_in) : _min(min_in), _max(max_in) {
- _empty = false;
- }
+ template <class T>
+ inline BBox(const BBox<T>& b) : _min(b.getMin()), _max(b.getMax())
+ {
+ _empty = false;
+ }
- template <class T>
- inline BBox(const BBox<T>& b) : _min(b.getMin()), _max(b.getMax()) {
- _empty = false;
- }
+ template <class T>
+ inline void extendToContain(const T& p)
+ {
+ if (_empty) {
+ _min = p;
+ _max = p;
+ _empty = false;
+ return;
+ }
+ for (unsigned int i = 0; i < Point::dim(); i++) {
+ if (p[i] < _min[i])
+ _min[i] = p[i];
+ else if (p[i] > _max[i])
+ _max[i] = p[i];
+ }
+ _empty = false;
+ }
- template <class T>
- inline void extendToContain(const T& p) {
- if (_empty) {
- _min = p;
- _max = p;
- _empty = false;
- return;
- }
- for (unsigned i = 0; i < Point::dim(); i++) {
- if (p[i] < _min[i])
- _min[i] = p[i];
- else if (p[i] > _max[i])
- _max[i] = p[i];
- }
- _empty = false;
- }
+ inline void clear()
+ {
+ _empty = true;
+ }
- inline void clear() {
- _empty = true;
- }
+ inline bool empty() const
+ {
+ return _empty;
+ }
- inline bool empty() const {
- return _empty;
- }
+ inline const Point& getMin() const
+ {
+ return _min;
+ }
- inline const Point& getMin() const {
- return _min;
- }
+ inline const Point& getMax() const
+ {
+ return _max;
+ }
- inline const Point& getMax() const {
- return _max;
- }
+ inline BBox<Point>& operator=(const BBox<Point>& b)
+ {
+ _min = b.getMin();
+ _max = b.getMax();
+ _empty = false;
+ return *this;
+ }
- inline BBox<Point>& operator=(const BBox<Point>& b) {
- _min = b.getMin();
- _max = b.getMax();
- _empty = false;
- return *this;
- }
+ inline BBox<Point>& operator+=(const BBox<Point>& b)
+ {
+ if (_empty) {
+ _min = b.getMin();
+ _max = b.getMax();
+ _empty = false;
+ }
+ else {
+ for (unsigned int i = 0; i < Point::dim(); i++) {
+ if (b.getMin()[i] < _min[i])
+ _min[i] = b.getMin()[i];
+ if (b.getMax()[i] > _max[i])
+ _max[i] = b.getMax()[i];
+ }
+ }
+ return *this;
+ }
- inline BBox<Point>& operator+=(const BBox<Point>& b) {
- if (_empty) {
- _min = b.getMin();
- _max = b.getMax();
- _empty = false;
- }
- else {
- for (unsigned i = 0; i < Point::dim(); i++) {
- if (b.getMin()[i] < _min[i])
- _min[i] = b.getMin()[i];
- if (b.getMax()[i] > _max[i])
- _max[i] = b.getMax()[i];
- }
- }
- return *this;
- }
+ inline bool inside(const Point& p)
+ {
+ if (empty())
+ return false;
+ for (unsigned int i = 0; i < Point::dim(); i++) {
+ if ((_min[i]>p[i]) || (_max[i]<p[i]))
+ return false;
+ }
+ return true;
+ }
- inline bool inside(const Point& p){
- if(empty())
- return false;
- for (unsigned i = 0; i < Point::dim(); i++) {
- if((_min[i]>p[i]) || (_max[i]<p[i]))
- return false;
- }
- return true;
-
- }
-
private:
-
- Point _min;
- Point _max;
- bool _empty;
+ Point _min;
+ Point _max;
+ bool _empty;
};
template <class Point>
BBox<Point>& operator+(const BBox<Point> &b1, const BBox<Point> &b2)
{
- Point new_min;
- Point new_max;
+ Point new_min;
+ Point new_max;
- for (unsigned i = 0; i < Point::dim(); i++) {
- new_min[i] = b1.getMin()[i] < b2.getMin()[i] ? b1.getMin()[i] :
b2.getMin()[i];
- new_max[i] = b1.getMax()[i] > b2.getMax()[i] ? b1.getMax()[i] :
b2.getMax()[i];
- }
+ for (unsigned int i = 0; i < Point::dim(); i++) {
+ new_min[i] = b1.getMin()[i] < b2.getMin()[i] ? b1.getMin()[i] :
b2.getMin()[i];
+ new_max[i] = b1.getMax()[i] > b2.getMax()[i] ? b1.getMax()[i] :
b2.getMax()[i];
+ }
- return BBox<Point>(new_min, new_max);
+ return BBox<Point>(new_min, new_max);
}
-#endif // BBOX_H
+#endif // __BBOX_H__
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/Bezier.cpp
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/Bezier.cpp
2012-12-22 17:32:56 UTC (rev 53277)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/Bezier.cpp
2012-12-22 18:25:01 UTC (rev 53278)
@@ -1,23 +1,36 @@
+/*
+ * ***** 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 *****
+ */
-//
-// 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/geometry/Bezier.cpp
+ * \ingroup freestyle
+ * \brief Class to define a Bezier curve of order 4.
+ * \author Stephane Grabli
+ * \date 04/06/2003
+ */
#include "Bezier.h"
#include "FitCurve.h"
@@ -34,85 +47,81 @@
void BezierCurveSegment::AddControlPoint(const Vec2d& iPoint)
{
- _ControlPolygon.push_back(iPoint);
- if(_ControlPolygon.size() == 4)
- Build();
+ _ControlPolygon.push_back(iPoint);
+ if (_ControlPolygon.size() == 4)
+ Build();
}
void BezierCurveSegment::Build()
{
- if(_ControlPolygon.size() != 4)
- return;
+ if (_ControlPolygon.size() != 4)
+ return;
- // Compute the rightmost part of the matrix:
- vector<Vec2d>::const_iterator p0,p1,p2,p3;
- p0 = _ControlPolygon.begin();
- p1 = p0;++p1;
- p2 = p1;++p2;
- p3 = p2;++p3;
- float x[4], y[4];
-
- x[0] = -p0->x()+3*p1->x()-3*p2->x()+p3->x();
- x[1] = 3*p0->x()-6*p1->x()+3*p2->x();
- x[2] = -3*p0->x()+3*p1->x();
- x[3] = p0->x();
+ // Compute the rightmost part of the matrix:
+ vector<Vec2d>::const_iterator p0,p1,p2,p3;
+ p0 = _ControlPolygon.begin();
+ p1 = p0;
+ ++p1;
+ p2 = p1;
+ ++p2;
+ p3 = p2;
+ ++p3;
+ float x[4], y[4];
- y[0] = -p0->y()+3*p1->y()-3*p2->y()+p3->y();
- y[1] = 3*p0->y()-6*p1->y()+3*p2->y();
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
