Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-06-17 18:05:14 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-06-17 18:05:14 +0300
commit410880552bfaf32f91eaad56bdf2c93c67cbd5c8 (patch)
tree6eca72d583c71160d9a9a44443728d5bb463ad67 /source/blender/freestyle/intern/geometry
parente74bd46ede9a957c03821e36b80ad2d2f378bf73 (diff)
Cleanup: trailing space for freestyle
Diffstat (limited to 'source/blender/freestyle/intern/geometry')
-rw-r--r--source/blender/freestyle/intern/geometry/FastGrid.h2
-rw-r--r--source/blender/freestyle/intern/geometry/FitCurve.cpp4
-rw-r--r--source/blender/freestyle/intern/geometry/FitCurve.h2
-rw-r--r--source/blender/freestyle/intern/geometry/GeomUtils.h4
-rw-r--r--source/blender/freestyle/intern/geometry/Grid.cpp2
-rw-r--r--source/blender/freestyle/intern/geometry/GridHelpers.h2
-rw-r--r--source/blender/freestyle/intern/geometry/SweepLine.h4
-rw-r--r--source/blender/freestyle/intern/geometry/VecMat.h14
-rw-r--r--source/blender/freestyle/intern/geometry/matrix_util.cpp4
9 files changed, 19 insertions, 19 deletions
diff --git a/source/blender/freestyle/intern/geometry/FastGrid.h b/source/blender/freestyle/intern/geometry/FastGrid.h
index 355a6e53399..75624bb9d9c 100644
--- a/source/blender/freestyle/intern/geometry/FastGrid.h
+++ b/source/blender/freestyle/intern/geometry/FastGrid.h
@@ -32,7 +32,7 @@
namespace Freestyle {
-/*! Class to define a regular grid used for ray casting computations
+/*! Class to define a regular grid used for ray casting computations
* We don't use a hashtable here. The grid is explicitly stored for faster computations.
* However, this might result in significant increase in memory usage (compared to the regular grid)
*/
diff --git a/source/blender/freestyle/intern/geometry/FitCurve.cpp b/source/blender/freestyle/intern/geometry/FitCurve.cpp
index fbfa5b331e6..fd7d63bbd28 100644
--- a/source/blender/freestyle/intern/geometry/FitCurve.cpp
+++ b/source/blender/freestyle/intern/geometry/FitCurve.cpp
@@ -61,7 +61,7 @@ static double V2SquaredLength(Vector2 *a)
}
/* returns length of input vector */
-static double V2Length(Vector2 *a)
+static double V2Length(Vector2 *a)
{
return (sqrt(V2SquaredLength(a)));
}
@@ -96,7 +96,7 @@ static Vector2 *V2Add(Vector2 *a, Vector2 *b, Vector2 *c)
(*c)[0] = (*a)[0] + (*b)[0];
(*c)[1] = (*a)[1] + (*b)[1];
return c;
-}
+}
/* normalizes the input vector and returns it */
static Vector2 *V2Normalize(Vector2 *v)
diff --git a/source/blender/freestyle/intern/geometry/FitCurve.h b/source/blender/freestyle/intern/geometry/FitCurve.h
index 2268f6be1b7..c402f431c27 100644
--- a/source/blender/freestyle/intern/geometry/FitCurve.h
+++ b/source/blender/freestyle/intern/geometry/FitCurve.h
@@ -90,7 +90,7 @@ public:
* Control points of the sets of bezier curve segments.
* Each segment is made of 4 points (polynomial degree of curve = 3)
* error
- * max error tolerance between resulting curve and input data
+ * max error tolerance between resulting curve and input data
*/
void FitCurve(std::vector<Vec2d>& data, std::vector<Vec2d>& oCurve, double error);
diff --git a/source/blender/freestyle/intern/geometry/GeomUtils.h b/source/blender/freestyle/intern/geometry/GeomUtils.h
index 8f3abf451c9..9e7c629191f 100644
--- a/source/blender/freestyle/intern/geometry/GeomUtils.h
+++ b/source/blender/freestyle/intern/geometry/GeomUtils.h
@@ -174,7 +174,7 @@ void fromWorldToImage(const Vec3r& p, Vec3r& q, const real model_view_matrix[4][
*/
void fromWorldToImage(const Vec3r& p, Vec3r& q, const real transform[4][4], const int viewport[4]);
-/*! Projects from world coordinates to camera coordinates
+/*! Projects from world coordinates to camera coordinates
* Returns the point's coordinates expressed in the camera's
* coordinates system.
* p
@@ -220,7 +220,7 @@ void fromRetinaToImage(const Vec3r& p, Vec3r& q, const int viewport[4]);
*/
void fromImageToRetina(const Vec3r& p, Vec3r& q, const int viewport[4]);
-/*! computes the coordinates of q in the camera coordinates system,
+/*! computes the coordinates of q in the camera coordinates system,
* using the known z coordinates of the 3D point.
* That means that this method does not inverse any matrices,
* it only computes X and Y from x,y and Z)
diff --git a/source/blender/freestyle/intern/geometry/Grid.cpp b/source/blender/freestyle/intern/geometry/Grid.cpp
index 371c63318de..61cf70a0aa3 100644
--- a/source/blender/freestyle/intern/geometry/Grid.cpp
+++ b/source/blender/freestyle/intern/geometry/Grid.cpp
@@ -242,7 +242,7 @@ bool Grid::nextRayCell(Vec3u& current_cell, Vec3u& next_cell)
real t_min, t;
unsigned i;
- t_min = FLT_MAX; // init tmin with handle of the case where one or 2 _u[i] = 0.
+ t_min = FLT_MAX; // init tmin with handle of the case where one or 2 _u[i] = 0.
unsigned coord = 0; // predominant coord(0=x, 1=y, 2=z)
diff --git a/source/blender/freestyle/intern/geometry/GridHelpers.h b/source/blender/freestyle/intern/geometry/GridHelpers.h
index 22efdcf1d11..4dd345e9b07 100644
--- a/source/blender/freestyle/intern/geometry/GridHelpers.h
+++ b/source/blender/freestyle/intern/geometry/GridHelpers.h
@@ -73,7 +73,7 @@ T closestPointToSegment(const T& P, const T& A, const T& B, real& distance)
distance = PPb.norm();
return Pb; // closest point lies on AB
-}
+}
inline Vec3r closestPointOnPolygon(const Vec3r& point, const Polygon3r& poly)
{
diff --git a/source/blender/freestyle/intern/geometry/SweepLine.h b/source/blender/freestyle/intern/geometry/SweepLine.h
index 039ecd7ebf4..98e860862bb 100644
--- a/source/blender/freestyle/intern/geometry/SweepLine.h
+++ b/source/blender/freestyle/intern/geometry/SweepLine.h
@@ -216,7 +216,7 @@ struct binary_rule
template<class T, class Point>
-class SweepLine
+class SweepLine
{
public:
SweepLine() {}
@@ -231,7 +231,7 @@ public:
}
}
- inline void process(Point& p, vector<Segment<T, Point>*>& segments,
+ inline void process(Point& p, vector<Segment<T, Point>*>& segments,
#if 0
binary_rule<Segment<T, Point>,Segment<T, Point> >& binrule = \
binary_rule<Segment<T, Point>, Segment<T, Point> >(),
diff --git a/source/blender/freestyle/intern/geometry/VecMat.h b/source/blender/freestyle/intern/geometry/VecMat.h
index 3c3d40875d0..e7a44e00b1b 100644
--- a/source/blender/freestyle/intern/geometry/VecMat.h
+++ b/source/blender/freestyle/intern/geometry/VecMat.h
@@ -150,21 +150,21 @@ public:
Vec<T, N> res(v);
res += *this;
return res;
- }
+ }
inline Vec<T, N> operator-(const Vec<T, N>& v) const
{
Vec<T, N> res(*this);
res -= v;
return res;
- }
+ }
inline Vec<T, N> operator*(const typename Vec<T, N>::value_type r) const
{
Vec<T, N> res(*this);
res *= r;
return res;
- }
+ }
inline Vec<T, N> operator/(const typename Vec<T, N>::value_type r) const
{
@@ -172,7 +172,7 @@ public:
if (r)
res /= r;
return res;
- }
+ }
// dot product
inline value_type operator*(const Vec<T, N>& v) const
@@ -181,7 +181,7 @@ public:
for (unsigned int i = 0; i < N; i++)
sum += (*this)[i] * v[i];
return sum;
- }
+ }
template <class U>
inline Vec<T, N>& operator=(const Vec<U, N>& v)
@@ -255,7 +255,7 @@ public:
if (this->_coord[i] == v[i])
continue;
}
- return false;
+ return false;
}
inline bool operator>(const Vec<T, N>& v) const
@@ -268,7 +268,7 @@ public:
if (this->_coord[i] == v[i])
continue;
}
- return false;
+ return false;
}
protected:
diff --git a/source/blender/freestyle/intern/geometry/matrix_util.cpp b/source/blender/freestyle/intern/geometry/matrix_util.cpp
index 5e585497516..40195361fe0 100644
--- a/source/blender/freestyle/intern/geometry/matrix_util.cpp
+++ b/source/blender/freestyle/intern/geometry/matrix_util.cpp
@@ -95,7 +95,7 @@ namespace MatrixUtil {
// Ugly Fortran-porting trick: indices for v are between 1 and n
v--;
- // Step 3 : compute the weight of the non diagonal terms
+ // Step 3 : compute the weight of the non diagonal terms
ij = 1;
a_norm = 0.0;
for (i = 1; i <= n; i++) {
@@ -240,7 +240,7 @@ namespace MatrixUtil {
index[i] = jj;
}
- // Step 7: save the eigen vectors
+ // Step 7: save the eigen vectors
// back from Fortran to to C++
v++;